From b8b13ad9e9d7d0e5c55635e85e0d4bb4db38a660 Mon Sep 17 00:00:00 2001
From: Jay Satiro <raysatiro@yahoo.com>
Date: Wed, 1 Apr 2015 02:05:15 -0400
Subject: [PATCH] build: Revert using MSBuild property files to auto-detect
 platform toolset

Prior to this change I had added a .props file for each .vcxproj to
use MSBuild's $(DefaultPlatformToolset) as the the default for
$(PlatformToolset). Typically that configuration allows for the
appropriate toolset to be used no matter which version of VS2010+
the wolfssl64.sln and project files are opened in. Problem is when an
MSBuild was used from the command line to build the solution it got the
$(DefaultPlatformToolset) from a property file based on the solution
header (currently "Format Version 12.00" which maps to Visual Studio
2012) instead. Another side effect was it set the VisualStudioVersion
to 11.0 (n - 1; n in this case 12.0) which was incorrect.

To remedy the above this change reverts back to the old PlatformToolset
method where the v110 toolset (Visual Studio 2012) is specified in every
configuration in every vcxproj. The user will have to specify explicitly
a different toolset to override it (either via command line or the GUI)
if they are not using VS2012.

VS2010 example:
msbuild -p:Configuration="Debug" wolfssl64.sln -p:PlatformToolset=v100
---
 examples/client/client.vcxproj               |  9 +++-
 examples/client/client.vcxproj.props         | 44 --------------------
 examples/echoclient/echoclient.vcxproj       |  9 +++-
 examples/echoclient/echoclient.vcxproj.props | 44 --------------------
 examples/echoserver/echoserver.vcxproj       |  9 +++-
 examples/echoserver/echoserver.vcxproj.props | 44 --------------------
 examples/server/server.vcxproj               |  9 +++-
 examples/server/server.vcxproj.props         | 44 --------------------
 sslSniffer/sslSniffer.vcxproj                |  5 ++-
 sslSniffer/sslSniffer.vcxproj.props          | 44 --------------------
 testsuite/testsuite.vcxproj                  |  9 +++-
 testsuite/testsuite.vcxproj.props            | 44 --------------------
 wolfssl.vcxproj                              |  9 +++-
 wolfssl.vcxproj.props                        | 44 --------------------
 14 files changed, 52 insertions(+), 315 deletions(-)
 delete mode 100644 examples/client/client.vcxproj.props
 delete mode 100644 examples/echoclient/echoclient.vcxproj.props
 delete mode 100644 examples/echoserver/echoserver.vcxproj.props
 delete mode 100644 examples/server/server.vcxproj.props
 delete mode 100644 sslSniffer/sslSniffer.vcxproj.props
 delete mode 100644 testsuite/testsuite.vcxproj.props
 delete mode 100644 wolfssl.vcxproj.props

diff --git a/examples/client/client.vcxproj b/examples/client/client.vcxproj
index eed2b0f81..dec191d7a 100644
--- a/examples/client/client.vcxproj
+++ b/examples/client/client.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="client.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/examples/client/client.vcxproj.props b/examples/client/client.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/examples/client/client.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/examples/echoclient/echoclient.vcxproj b/examples/echoclient/echoclient.vcxproj
index 5ca5d43ad..a3a60545a 100644
--- a/examples/echoclient/echoclient.vcxproj
+++ b/examples/echoclient/echoclient.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="echoclient.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/examples/echoclient/echoclient.vcxproj.props b/examples/echoclient/echoclient.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/examples/echoclient/echoclient.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/examples/echoserver/echoserver.vcxproj b/examples/echoserver/echoserver.vcxproj
index 09381a8f6..096ba75c6 100644
--- a/examples/echoserver/echoserver.vcxproj
+++ b/examples/echoserver/echoserver.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="echoserver.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/examples/echoserver/echoserver.vcxproj.props b/examples/echoserver/echoserver.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/examples/echoserver/echoserver.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/examples/server/server.vcxproj b/examples/server/server.vcxproj
index 6581aece5..f6b53fc57 100644
--- a/examples/server/server.vcxproj
+++ b/examples/server/server.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="server.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/examples/server/server.vcxproj.props b/examples/server/server.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/examples/server/server.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/sslSniffer/sslSniffer.vcxproj b/sslSniffer/sslSniffer.vcxproj
index f00bf8e4b..56404e997 100644
--- a/sslSniffer/sslSniffer.vcxproj
+++ b/sslSniffer/sslSniffer.vcxproj
@@ -24,23 +24,26 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="sslSniffer.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/sslSniffer/sslSniffer.vcxproj.props b/sslSniffer/sslSniffer.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/sslSniffer/sslSniffer.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/testsuite/testsuite.vcxproj b/testsuite/testsuite.vcxproj
index a8c748918..484a87584 100644
--- a/testsuite/testsuite.vcxproj
+++ b/testsuite/testsuite.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="testsuite.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/testsuite/testsuite.vcxproj.props b/testsuite/testsuite.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/testsuite/testsuite.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>
diff --git a/wolfssl.vcxproj b/wolfssl.vcxproj
index c4b6840a3..8a95297e1 100644
--- a/wolfssl.vcxproj
+++ b/wolfssl.vcxproj
@@ -40,41 +40,48 @@
     <Keyword>Win32Proj</Keyword>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="wolfssl.vcxproj.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>StaticLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='DLL Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
+    <PlatformToolset>v110</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
diff --git a/wolfssl.vcxproj.props b/wolfssl.vcxproj.props
deleted file mode 100644
index 97cb4c2ec..000000000
--- a/wolfssl.vcxproj.props
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-****************************************************************************************************
-Property file for specifying PlatformToolset.
-
-WARNING:  DO NOT MODIFY this file unless you are knowledgeable about MSBuild and have
-          created a backup copy.  Incorrect changes to this file will make it
-          impossible to load or build your projects from the command-line or the IDE.
-
-This file should be included immediately after Microsoft.Cpp.Default.props in every vcxproj.
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <Import Project="project-name.vcxproj.props" />
-
-Copyright (C) 2014 Jay Satiro <raysatiro@yahoo.com>. All rights reserved. https://github.com/jay
-****************************************************************************************************
--->
-
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-<!--
-VS2010 specific: 'DefaultPlatformToolset' isn't an inherited MS property so it must be defined here.
--->
-    <DefaultPlatformToolset Condition="'$(DefaultPlatformToolset)' == '' and '$(VisualStudioVersion)' == '10.0'">v100</DefaultPlatformToolset>
-<!--
-In Visual Studio what is referred to in the documentation as the default platform toolset is
-whatever is in the inherited MS property 'PlatformToolset' and _not_ 'DefaultPlatformToolset'. That
-means in Visual Studio 2010, 2012 and 2013 the default platform toolset is v100 (VS2010 compiler).
-
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.110).aspx
-http://msdn.microsoft.com/en-us/library/8x480de8(v=vs.120).aspx
-
-The default platform toolset for my projects should be the toolset included with whatever version of
-Visual Studio is being used. That can be found in 'DefaultPlatformToolset', eg:
-
-Visual Studio 2010 $(DefaultPlatformToolset): v100
-Visual Studio 2012 $(DefaultPlatformToolset): v110
-Visual Studio 2013 $(DefaultPlatformToolset): v120
-
-This way the projects will be built properly using the appropriate toolset no matter which version
-of Visual Studio (>= 2010) the project files are opened in (eg Visual Studio 2012 should compile
-project using its 2012 compiler) and without any project upgrade notices.
--->
-    <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
-  </PropertyGroup>
-</Project>