Update cURL version to 7.61.0 and migrate to Visual Studio 2017.

.gitignore

@@ -0,0 +1,11 @@
+.vs/*
+Win32/*
+x64/*
+out/*
+curl-7.*
+curl-7.*/
+openssl-1.*
+openssl-1.*/
+zlib-1.*
+zlib-1.*/
+7za*.exe

README.txt

@@ -0,0 +1 @@
+Please note that we use Visual Studio 2017 (not 2015) to build curl since curl version 7.61.0

build.cmd

@@ -1,6 +1,8 @@
-set MSBuildToolsPath="C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild"
+set toolsversion=v141
+REM set MSBuildToolsPath="C:\Program Files (x86)\MSBuild\14.0\Bin\msbuild"
+set MSBuildToolsPath="C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\MSBuild\15.0\Bin\msbuild"
 echo %MSBuildToolsPath%
-cmd /C %MSBuildToolsPath% curl.2015.sln /p:Configuration=Debug /p:Platform=Win32 /t:Build /p:PlatformToolset=v140
-cmd /C %MSBuildToolsPath% curl.2015.sln /p:Configuration=Debug /p:Platform=x64 /t:Build /p:PlatformToolset=v140
-cmd /C %MSBuildToolsPath% curl.2015.sln /p:Configuration=Release /p:Platform=Win32 /t:Build /p:PlatformToolset=v140
-cmd /C %MSBuildToolsPath% curl.2015.sln /p:Configuration=Release /p:Platform=x64 /t:Build /p:PlatformToolset=v140
+cmd /C %MSBuildToolsPath% curl.2017.sln /p:Configuration=Debug /p:Platform=Win32 /t:Build /p:PlatformToolset=%toolsversion%
+cmd /C %MSBuildToolsPath% curl.2017.sln /p:Configuration=Debug /p:Platform=x64 /t:Build /p:PlatformToolset=%toolsversion%
+cmd /C %MSBuildToolsPath% curl.2017.sln /p:Configuration=Release /p:Platform=Win32 /t:Build /p:PlatformToolset=%toolsversion%
+cmd /C %MSBuildToolsPath% curl.2017.sln /p:Configuration=Release /p:Platform=x64 /t:Build /p:PlatformToolset=%toolsversion%

curl-version.props

@@ -5,7 +5,7 @@
     <Import Project="basedir.props" Condition=" '$(BaseDirImported)' == ''"/>
   </ImportGroup>
   <PropertyGroup Label="UserMacros">
-    <curlVersion>7.59.0</curlVersion>
+    <curlVersion>7.61.0</curlVersion>
     <curlLibDir>$(BaseDir)curl-$(curlVersion)</curlLibDir>
   </PropertyGroup>
   <PropertyGroup>

curl.2015.sln → curl.2017.sln

@@ -1,28 +1,31 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2042
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.2015.vcxproj", "{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "curl", "curl.2017.vcxproj", "{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|x64 = Debug|x64
 		Debug|Win32 = Debug|Win32
-		Release|x64 = Release|x64
+		Debug|x64 = Debug|x64
 		Release|Win32 = Release|Win32
+		Release|x64 = Release|x64
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|x64.ActiveCfg = Debug|x64
-		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|x64.Build.0 = Debug|x64
 		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|Win32.ActiveCfg = Debug|Win32
 		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|Win32.Build.0 = Debug|Win32
-		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|x64.ActiveCfg = Release|x64
-		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|x64.Build.0 = Release|x64
+		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|x64.ActiveCfg = Debug|x64
+		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Debug|x64.Build.0 = Debug|x64
 		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|Win32.ActiveCfg = Release|Win32
 		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|Win32.Build.0 = Release|Win32
+		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|x64.ActiveCfg = Release|x64
+		{82A21DDA-9AAB-443A-BF7C-EDE07D1105AE}.Release|x64.Build.0 = Release|x64
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {AC77C0D0-394B-461C-946A-FF411B02719A}
+	EndGlobalSection
 EndGlobal

curl.2015.vcxproj → curl.2017.vcxproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -29,25 +29,25 @@
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
     <CharacterSet>MultiByte</CharacterSet>
-    <PlatformToolset>v140</PlatformToolset>
+    <PlatformToolset>v141</PlatformToolset>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="openssl-version.props" />