Updating C++ projects to work with Visual Studio 2017

SeleniumHQ · Aug 15, 2017 · 0498835 · 0498835
1 parent 4351727
commit 0498835
Show file tree

Hide file tree

Showing 10 changed files with 287 additions and 264 deletions.
diff --git a/cpp/IEDriverServer.sln b/cpp/IEDriverServer.sln
@@ -1,17 +1,17 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.26430.16
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19517B2F-334D-4F39-BEA7-E5D044AD78AF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "civetweb", "..\third_party\cpp\civetweb\civetweb.vcxproj", "{19417464-5B84-45FE-BE6B-7A01D4B8D412}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "json-cpp", "..\third_party\cpp\json-cpp\json-cpp.vcxproj", "{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{4E509D48-78BF-44FE-84D4-117AFDCD3788}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "webdriver-server", "webdriver-server\webdriver-server.vcxproj", "{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriver", "iedriver\IEDriver.vcxproj", "{0B34D228-8584-4589-B4BF-96182E86638D}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "IEDriverServer\IEDriverServer.vcxproj", "{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IEDriverServer", "iedriverserver\IEDriverServer.vcxproj", "{D419FE07-1F4C-457C-952C-9492854F7C36}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -21,46 +21,46 @@ Global
 		Release|x86 = Release|x86
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.ActiveCfg = Debug|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x64.Build.0 = Debug|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.ActiveCfg = Debug|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Debug|x86.Build.0 = Debug|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.ActiveCfg = Release|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x64.Build.0 = Release|x64
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.ActiveCfg = Release|Win32
-		{19517B2F-334D-4F39-BEA7-E5D044AD78AF}.Release|x86.Build.0 = Release|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.ActiveCfg = Debug|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x64.Build.0 = Debug|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.ActiveCfg = Debug|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Debug|x86.Build.0 = Debug|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.ActiveCfg = Release|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x64.Build.0 = Release|x64
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.ActiveCfg = Release|Win32
-		{64EDF9A1-3C2C-489D-AC94-DAD0E55ECA88}.Release|x86.Build.0 = Release|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.ActiveCfg = Debug|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x64.Build.0 = Debug|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.ActiveCfg = Debug|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Debug|x86.Build.0 = Debug|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.ActiveCfg = Release|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x64.Build.0 = Release|x64
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.ActiveCfg = Release|Win32
-		{4E509D48-78BF-44FE-84D4-117AFDCD3788}.Release|x86.Build.0 = Release|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.ActiveCfg = Debug|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x64.Build.0 = Debug|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.ActiveCfg = Debug|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Debug|x86.Build.0 = Debug|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.ActiveCfg = Release|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x64.Build.0 = Release|x64
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.ActiveCfg = Release|Win32
-		{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}.Release|x86.Build.0 = Release|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.ActiveCfg = Debug|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x64.Build.0 = Debug|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.ActiveCfg = Debug|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Debug|x86.Build.0 = Debug|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.ActiveCfg = Release|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x64.Build.0 = Release|x64
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.ActiveCfg = Release|Win32
-		{5EB3DD9C-9E97-4A4F-A91E-9DED46506E53}.Release|x86.Build.0 = Release|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.ActiveCfg = Debug|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x64.Build.0 = Debug|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.ActiveCfg = Debug|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Debug|x86.Build.0 = Debug|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.ActiveCfg = Release|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x64.Build.0 = Release|x64
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.ActiveCfg = Release|Win32
+		{19417464-5B84-45FE-BE6B-7A01D4B8D412}.Release|x86.Build.0 = Release|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.ActiveCfg = Debug|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x64.Build.0 = Debug|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.ActiveCfg = Debug|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Debug|x86.Build.0 = Debug|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.ActiveCfg = Release|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x64.Build.0 = Release|x64
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.ActiveCfg = Release|Win32
+		{E526FAB4-5CB3-4737-89D2-6CC88AA83B5B}.Release|x86.Build.0 = Release|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.ActiveCfg = Debug|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x64.Build.0 = Debug|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.ActiveCfg = Debug|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Debug|x86.Build.0 = Debug|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.ActiveCfg = Release|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x64.Build.0 = Release|x64
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.ActiveCfg = Release|Win32
+		{D1B7E5B4-2CAF-4C55-89E0-2634038C8472}.Release|x86.Build.0 = Release|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.ActiveCfg = Debug|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x64.Build.0 = Debug|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.ActiveCfg = Debug|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Debug|x86.Build.0 = Debug|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.ActiveCfg = Release|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x64.Build.0 = Release|x64
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.ActiveCfg = Release|Win32
+		{0B34D228-8584-4589-B4BF-96182E86638D}.Release|x86.Build.0 = Release|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.ActiveCfg = Debug|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x64.Build.0 = Debug|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.ActiveCfg = Debug|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Debug|x86.Build.0 = Debug|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.ActiveCfg = Release|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x64.Build.0 = Release|x64
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.ActiveCfg = Release|Win32
+		{D419FE07-1F4C-457C-952C-9492854F7C36}.Release|x86.Build.0 = Release|Win32
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/cpp/iedriver/IEDriver.vcxproj b/cpp/iedriver/IEDriver.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>
@@ -19,34 +19,35 @@
     </ProjectConfiguration>
   </ItemGroup>
   <PropertyGroup Label="Globals">
-    <ProjectGuid>{B6A4F828-E503-4C94-9EBD-0B1E9246E18D}</ProjectGuid>
+    <VCProjectVersion>15.0</VCProjectVersion>
+    <ProjectGuid>{0B34D228-8584-4589-B4BF-96182E86638D}</ProjectGuid>
     <RootNamespace>IEDriver</RootNamespace>
-    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>7.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v140_xp</PlatformToolset>
+    <PlatformToolset>v141_xp</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
@@ -90,11 +91,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -108,11 +109,11 @@
       <Optimization>Disabled</Optimization>
       <SDLCheck>false</SDLCheck>
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
       <MinimalRebuild>false</MinimalRebuild>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
     </ClCompile>
     <Link>
       <AdditionalDependencies>ws2_32.lib;Rpcrt4.lib;version.lib;iepmapi.lib;psapi.lib;oleacc.lib;comsuppw.lib;wininet.lib;urlmon.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -127,11 +128,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -148,11 +149,11 @@
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
       <SDLCheck>true</SDLCheck>
+      <PrecompiledHeader>Use</PrecompiledHeader>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;IEDRIVER_EXPORTS;_USING_V110_SDK71_;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
       <ForcedIncludeFiles>stdafx.h</ForcedIncludeFiles>
       <AdditionalIncludeDirectories>$(ProjectDir)..\webdriver-server;$(ProjectDir)..\..\third_party\cpp\json-cpp\include\json;$(ProjectDir)..\..\third_party\cpp\iewebdriverheader;$(ProjectDir)..\..\third_party\cpp\civetweb</AdditionalIncludeDirectories>
-      <PrecompiledHeader>Use</PrecompiledHeader>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
     </ClCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
@@ -344,7 +345,7 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\webdriver-server\webdriver-server.vcxproj">
-      <Project>{4e509d48-78bf-44fe-84d4-117afdcd3788}</Project>
+      <Project>{d1b7e5b4-2caf-4c55-89e0-2634038c8472}</Project>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />