diff --git a/ProGen/progen.properties b/ProGen/progen.properties
index bc9c3cde5..e0bc030a6 100644
--- a/ProGen/progen.properties
+++ b/ProGen/progen.properties
@@ -37,5 +37,11 @@ progen.postprocess.upgrade2008to2013.deleteOriginalFile = true
 progen.postprocess.upgrade2008to2013.deleteFiles = Backup;_UpgradeReport_Files;UpgradeLog.XML;UpgradeLog.htm
 progen.postprocess.upgrade2008to2013.fix2013ProjectFile = true
 
+progen.postprocess.upgrade2008to2015.tool = ${system.env.VS140COMNTOOLS}\\..\\IDE\\DevEnv.exe
+progen.postprocess.upgrade2008to2015.args = %;/Upgrade
+progen.postprocess.upgrade2008to2015.deleteOriginalFile = true
+progen.postprocess.upgrade2008to2015.deleteFiles = Backup;_UpgradeReport_Files;UpgradeLog.XML;UpgradeLog.htm
+progen.postprocess.upgrade2008to2015.fix2015ProjectFile = true
+
 progen.backupProjectFile = false
 progen.solution.applicationGUID = 8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942
diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp
index 9c115e1a0..2cf326b19 100644
--- a/ProGen/src/ProGen.cpp
+++ b/ProGen/src/ProGen.cpp
@@ -153,10 +153,10 @@ protected:
 		helpFormatter.setHeader(
 			"\n"
 			"The POCO C++ Libraries Visual Studio Project File Generator.\n"
-			"Copyright (c) 2010 by Applied Informatics Software Engineering GmbH.\n"
+			"Copyright (c) 2010-2015 by Applied Informatics Software Engineering GmbH.\n"
 			"All rights reserved.\n\n"
 			"This program generates project and solution files "
-			"for Visual Studio .NET 2003, 2005, 2008 and 2010 from "
+			"for Visual Studio .NET 2003, 2005, 2008 and 2010, 2012, 2013 and 2015 from "
 			"global project templates and project-specific property files."
 		);
 		helpFormatter.setFooter(
@@ -330,6 +330,11 @@ protected:
 			solutionStream << "Microsoft Visual Studio Solution File, Format Version 12.00\r\n# Visual Studio 2013\r\n";
 			generateSolution80(solutionStream, solutionPath, solutionGUID, projectConfig, templateProps, platform, tool);
 		}
+		else if (tool == "vs140")
+		{
+			solutionStream << "Microsoft Visual Studio Solution File, Format Version 14.00\r\n# Visual Studio 2015\r\n";
+			generateSolution80(solutionStream, solutionPath, solutionGUID, projectConfig, templateProps, platform, tool);
+		}
 	}
 	
 	void generateSolution71(std::ostream& solutionStream, const Poco::Path& solutionPath, const std::string& solutionGUID, const Poco::Util::AbstractConfiguration& projectConfig, const Poco::Util::AbstractConfiguration& templateProps, const std::string& platform, const std::string& tool)
@@ -593,6 +598,18 @@ protected:
 		}
 	}
 
+	void fix2015Project(Poco::AutoPtr<Poco::XML::Document> pProjectDoc, const std::set<std::string>& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps)
+	{
+		fix2010Project(pProjectDoc, configSet, platform, projectProps, templateProps);
+		Poco::AutoPtr<Poco::XML::NodeList> pConfigurationTypeList = pProjectDoc->getElementsByTagName("ConfigurationType");
+		for (unsigned long i = 0; i < pConfigurationTypeList->length(); i++)
+		{
+			Poco::XML::Element* pConfigurationTypeElem = static_cast<Poco::XML::Element*>(pConfigurationTypeList->item(i));
+			removeElement(pConfigurationTypeElem->parentNode(), "PlatformToolset");
+			appendElement(pConfigurationTypeElem->parentNode(), "PlatformToolset", "v140");
+		}
+	}
+
 	void appendElement(Poco::XML::Node* pParentNode, const std::string& elemName, const std::string& text)
 	{
 		Poco::AutoPtr<Poco::XML::Element> pElement = pParentNode->ownerDocument()->createElement(elemName);
@@ -825,6 +842,16 @@ protected:
 								writeProject(pProjectDoc, vcxprojPath.toString());
 							}
 						}
+						if (config().getBool("progen.postprocess." + postprocess + ".fix2015ProjectFile", false))
+						{
+							if (projectFile.exists())
+							{
+								logger().information("Fixing Visual Studio 2015 project file: " + vcxprojPath.toString());
+								Poco::AutoPtr<Poco::XML::Document> pProjectDoc = domParser.parse(vcxprojPath.toString());
+								fix2015Project(pProjectDoc, configSet, pTemplateProps->getString("project.platform", platform), *pProps, *pTemplateProps);
+								writeProject(pProjectDoc, vcxprojPath.toString());
+							}
+						}
 						if (config().getBool("progen.postprocess." + postprocess + ".deleteOriginalFile", false))
 						{
 							Poco::File projectFile(vcprojPath.toString());
diff --git a/ProGen/templates/vs140/Win32/executable/debug_shared.template b/ProGen/templates/vs140/Win32/executable/debug_shared.template
new file mode 100644
index 000000000..124db40cd
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="bin\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/executable/debug_static_md.template b/ProGen/templates/vs140/Win32/executable/debug_static_md.template
new file mode 100644
index 000000000..cbe2c0b10
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/debug_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_md\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/executable/debug_static_mt.template b/ProGen/templates/vs140/Win32/executable/debug_static_mt.template
new file mode 100644
index 000000000..4c020cce5
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/executable/project.properties b/ProGen/templates/vs140/Win32/executable/project.properties
new file mode 100644
index 000000000..ad51419b7
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/project.properties
@@ -0,0 +1,9 @@
+project.suffix = _vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.targetSuffix.debug_static_md = d
+project.targetSuffix.release_static_md = 
+project.targetSuffix.debug_static_mt = d
+project.targetSuffix.release_static_mt = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _vs140.vcxproj
diff --git a/ProGen/templates/vs140/Win32/executable/project.template b/ProGen/templates/vs140/Win32/executable/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/Win32/executable/release_shared.template b/ProGen/templates/vs140/Win32/executable/release_shared.template
new file mode 100644
index 000000000..6a8dccbbd
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="bin\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/executable/release_static_md.template b/ProGen/templates/vs140/Win32/executable/release_static_md.template
new file mode 100644
index 000000000..d9dd10406
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/release_static_md.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/executable/release_static_mt.template b/ProGen/templates/vs140/Win32/executable/release_static_mt.template
new file mode 100644
index 000000000..5477c2b8c
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/executable/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/debug_shared.template b/ProGen/templates/vs140/Win32/library/debug_shared.template
new file mode 100644
index 000000000..141cf34b2
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/debug_shared.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin\${project.target}d.dll"
+		LinkIncremental="2"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="${project.outdir}\bin\${project.target}d.pdb"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SubSystem="1"
+		ImportLibrary="${project.outdir}\lib\${project.target}d.lib"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/debug_static_md.template b/ProGen/templates/vs140/Win32/library/debug_static_md.template
new file mode 100644
index 000000000..4ecfe38ce
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/debug_static_md.template
@@ -0,0 +1,73 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		ProgramDataBaseFileName="${project.outdir}\lib\${project.target}mdd.pdb"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib\${project.target}mdd.lib"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/debug_static_mt.template b/ProGen/templates/vs140/Win32/library/debug_static_mt.template
new file mode 100644
index 000000000..fa7f3bd3c
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/debug_static_mt.template
@@ -0,0 +1,73 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		ProgramDataBaseFileName="${project.outdir}\lib\${project.target}mtd.pdb"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib\${project.target}mtd.lib"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/project.properties b/ProGen/templates/vs140/Win32/library/project.properties
new file mode 100644
index 000000000..af6cfb622
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/project.properties
@@ -0,0 +1,9 @@
+project.suffix = _vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.targetSuffix.debug_static_md = mdd
+project.targetSuffix.release_static_md = md
+project.targetSuffix.debug_static_mt = mtd
+project.targetSuffix.release_static_mt = mt
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _vs140.vcxproj
diff --git a/ProGen/templates/vs140/Win32/library/project.template b/ProGen/templates/vs140/Win32/library/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/Win32/library/release_shared.template b/ProGen/templates/vs140/Win32/library/release_shared.template
new file mode 100644
index 000000000..51211d8e5
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/release_shared.template
@@ -0,0 +1,91 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin\${project.target}.dll"
+		LinkIncremental="1"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="false"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		ImportLibrary="${project.outdir}\lib\${project.target}.lib"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/release_static_md.template b/ProGen/templates/vs140/Win32/library/release_static_md.template
new file mode 100644
index 000000000..59c197fe0
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/release_static_md.template
@@ -0,0 +1,76 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		ProgramDataBaseFileName="${project.outdir}\lib\${project.target}md.pdb"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\lib\${project.target}md.lib"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/library/release_static_mt.template b/ProGen/templates/vs140/Win32/library/release_static_mt.template
new file mode 100644
index 000000000..bc35acb96
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/library/release_static_mt.template
@@ -0,0 +1,74 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib\${project.target}mt.lib"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/plugin/debug_shared.template b/ProGen/templates/vs140/Win32/plugin/debug_shared.template
new file mode 100644
index 000000000..7a4ce3fd2
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/plugin/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin\${project.target}d.dll"
+		LinkIncremental="2"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="${project.outdir}\bin\${project.target}d.pdb"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/plugin/project.properties b/ProGen/templates/vs140/Win32/plugin/project.properties
new file mode 100644
index 000000000..35ffcd7cc
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/plugin/project.properties
@@ -0,0 +1,5 @@
+project.suffix = _vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _vs140.vcxproj
diff --git a/ProGen/templates/vs140/Win32/plugin/project.template b/ProGen/templates/vs140/Win32/plugin/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/plugin/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/Win32/plugin/release_shared.template b/ProGen/templates/vs140/Win32/plugin/release_shared.template
new file mode 100644
index 000000000..862c9c6af
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/plugin/release_shared.template
@@ -0,0 +1,90 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin\${project.target}.dll"
+		LinkIncremental="1"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="false"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_shared.template b/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
new file mode 100644
index 000000000..7defc61d9
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
new file mode 100644
index 000000000..1093125a2
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_md\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
new file mode 100644
index 000000000..4745902ef
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/project.properties b/ProGen/templates/vs140/Win32/testsuite/project.properties
new file mode 100644
index 000000000..cd1f4086a
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.targetSuffix.debug_static_md = d
+project.targetSuffix.release_static_md = 
+project.targetSuffix.debug_static_mt = d
+project.targetSuffix.release_static_mt = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _vs140.vcxproj
+project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp
diff --git a/ProGen/templates/vs140/Win32/testsuite/project.template b/ProGen/templates/vs140/Win32/testsuite/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="Win32"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_shared.template b/ProGen/templates/vs140/Win32/testsuite/release_shared.template
new file mode 100644
index 000000000..443b63aec
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_static_md.template b/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
new file mode 100644
index 000000000..78326c39d
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_md.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
new file mode 100644
index 000000000..0f04ee906
--- /dev/null
+++ b/ProGen/templates/vs140/Win32/testsuite/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/debug_shared.template b/ProGen/templates/vs140/x64/executable/debug_shared.template
new file mode 100644
index 000000000..cc3939d71
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="bin64\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/debug_static_md.template b/ProGen/templates/vs140/x64/executable/debug_static_md.template
new file mode 100644
index 000000000..e38a47edc
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/debug_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_md\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/debug_static_mt.template b/ProGen/templates/vs140/x64/executable/debug_static_mt.template
new file mode 100644
index 000000000..95790d638
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/project.properties b/ProGen/templates/vs140/x64/executable/project.properties
new file mode 100644
index 000000000..4f2733251
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _x64_vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.targetSuffix.debug_static_md = d
+project.targetSuffix.release_static_md = 
+project.targetSuffix.debug_static_mt = d
+project.targetSuffix.release_static_mt = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _x64_vs140.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs140/x64/executable/project.template b/ProGen/templates/vs140/x64/executable/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/x64/executable/release_shared.template b/ProGen/templates/vs140/x64/executable/release_shared.template
new file mode 100644
index 000000000..369c69169
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="bin64\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/release_static_md.template b/ProGen/templates/vs140/x64/executable/release_static_md.template
new file mode 100644
index 000000000..5992c40cf
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/release_static_md.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/executable/release_static_mt.template b/ProGen/templates/vs140/x64/executable/release_static_mt.template
new file mode 100644
index 000000000..f04f3a998
--- /dev/null
+++ b/ProGen/templates/vs140/x64/executable/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64;${configuration.linker.libraries}"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/debug_shared.template b/ProGen/templates/vs140/x64/library/debug_shared.template
new file mode 100644
index 000000000..69308d3cc
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/debug_shared.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin64\${project.target}64d.dll"
+		LinkIncremental="2"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="${project.outdir}\bin64\${project.target}64d.pdb"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SubSystem="1"
+		ImportLibrary="${project.outdir}\lib64\${project.target}d.lib"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/debug_static_md.template b/ProGen/templates/vs140/x64/library/debug_static_md.template
new file mode 100644
index 000000000..196774eb1
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/debug_static_md.template
@@ -0,0 +1,74 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		ProgramDataBaseFileName="${project.outdir}\lib64\${project.target}mdd.pdb"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib64\${project.target}mdd.lib"
+		TargetMachine="17"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/debug_static_mt.template b/ProGen/templates/vs140/x64/library/debug_static_mt.template
new file mode 100644
index 000000000..e04f4aeeb
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/debug_static_mt.template
@@ -0,0 +1,74 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		ProgramDataBaseFileName="${project.outdir}\lib64\${project.target}mtd.pdb"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib64\${project.target}mtd.lib"
+		TargetMachine="17"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/project.properties b/ProGen/templates/vs140/x64/library/project.properties
new file mode 100644
index 000000000..e5f6ad501
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _x64_vs140.vcproj
+project.targetSuffix.debug_shared = 64d
+project.targetSuffix.release_shared = 64
+project.targetSuffix.debug_static_md = mdd
+project.targetSuffix.release_static_md = md
+project.targetSuffix.debug_static_mt = mtd
+project.targetSuffix.release_static_mt = mt
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _x64_vs140.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs140/x64/library/project.template b/ProGen/templates/vs140/x64/library/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/x64/library/release_shared.template b/ProGen/templates/vs140/x64/library/release_shared.template
new file mode 100644
index 000000000..598a27939
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/release_shared.template
@@ -0,0 +1,92 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin64\${project.target}64.dll"
+		LinkIncremental="1"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="false"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		OptimizeForWindows98="0"
+		ImportLibrary="${project.outdir}\lib64\${project.target}.lib"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/release_static_md.template b/ProGen/templates/vs140/x64/library/release_static_md.template
new file mode 100644
index 000000000..dbc15deec
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/release_static_md.template
@@ -0,0 +1,75 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib64\${project.target}md.lib"
+		TargetMachine="17"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/library/release_static_mt.template b/ProGen/templates/vs140/x64/library/release_static_mt.template
new file mode 100644
index 000000000..acebfc406
--- /dev/null
+++ b/ProGen/templates/vs140/x64/library/release_static_mt.template
@@ -0,0 +1,75 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLibrarianTool"
+		OutputFile="${project.outdir}\lib64\${project.target}mt.lib"
+		TargetMachine="17"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/plugin/debug_shared.template b/ProGen/templates/vs140/x64/plugin/debug_shared.template
new file mode 100644
index 000000000..3390a15db
--- /dev/null
+++ b/ProGen/templates/vs140/x64/plugin/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin64\${project.target}d.dll"
+		LinkIncremental="2"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="${project.outdir}\bin64\${project.target}d.pdb"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/plugin/project.properties b/ProGen/templates/vs140/x64/plugin/project.properties
new file mode 100644
index 000000000..e38ab5817
--- /dev/null
+++ b/ProGen/templates/vs140/x64/plugin/project.properties
@@ -0,0 +1,6 @@
+project.suffix = _x64_vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _x64_vs140.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs140/x64/plugin/project.template b/ProGen/templates/vs140/x64/plugin/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs140/x64/plugin/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/x64/plugin/release_shared.template b/ProGen/templates/vs140/x64/plugin/release_shared.template
new file mode 100644
index 000000000..65d659177
--- /dev/null
+++ b/ProGen/templates/vs140/x64/plugin/release_shared.template
@@ -0,0 +1,91 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories=".\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;_USRDLL;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="${configuration.linker.dependencies}"
+		OutputFile="${project.outdir}\bin64\${project.target}.dll"
+		LinkIncremental="1"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="false"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		OptimizeForWindows98="0"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_shared.template b/ProGen/templates/vs140/x64/testsuite/debug_shared.template
new file mode 100644
index 000000000..94c39f852
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/debug_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="0"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitd.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_static_md.template b/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
new file mode 100644
index 000000000..49a37233e
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="3"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmdd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_md\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
new file mode 100644
index 000000000..1cfaf5d15
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		MinimalRebuild="true"
+		BasicRuntimeChecks="3"
+		RuntimeLibrary="1"
+		BufferSecurityCheck="true"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="3"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmtd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/project.properties b/ProGen/templates/vs140/x64/testsuite/project.properties
new file mode 100644
index 000000000..9339d0ae7
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/project.properties
@@ -0,0 +1,11 @@
+project.suffix = _x64_vs140.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.targetSuffix.debug_static_md = d
+project.targetSuffix.release_static_md = 
+project.targetSuffix.debug_static_mt = d
+project.targetSuffix.release_static_mt = 
+project.postprocess = upgrade2008to2015
+project.finalSuffix = _x64_vs140.vcxproj
+project.targetArchitecture = AMD64
+project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\Driver.cpp
diff --git a/ProGen/templates/vs140/x64/testsuite/project.template b/ProGen/templates/vs140/x64/testsuite/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/project.template
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="Windows-1252"?>
+<VisualStudioProject
+	ProjectType="Visual C++"
+	Version="9.00"
+	Name="${project.name}"
+	ProjectGUID="{${project.guid}}"
+	RootNamespace="${project.name}"
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
+	<Platforms>
+		<Platform
+			Name="x64"
+		/>
+	</Platforms>
+	<ToolFiles>
+	</ToolFiles>
+	<Configurations>
+	</Configurations>
+	<References>
+	</References>
+	<Files>
+	</Files>
+	<Globals>
+	</Globals>
+</VisualStudioProject>
diff --git a/ProGen/templates/vs140/x64/testsuite/release_shared.template b/ProGen/templates/vs140/x64/testsuite/release_shared.template
new file mode 100644
index 000000000..4ccc00393
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnit.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/release_static_md.template b/ProGen/templates/vs140/x64/testsuite/release_static_md.template
new file mode 100644
index 000000000..5aff313e9
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_md.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="2"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmd.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>
diff --git a/ProGen/templates/vs140/x64/testsuite/release_static_mt.template b/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
new file mode 100644
index 000000000..82292b690
--- /dev/null
+++ b/ProGen/templates/vs140/x64/testsuite/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)"
+	ConfigurationType="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="2"
+		InlineFunctionExpansion="1"
+		EnableIntrinsicFunctions="true"
+		FavorSizeOrSpeed="1"
+		OmitFramePointers="true"
+		AdditionalIncludeDirectories="..\include;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\include;${configuration.compiler.includes}"
+		PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;${configuration.compiler.defines}"
+		StringPooling="true"
+		RuntimeLibrary="0"
+		BufferSecurityCheck="false"
+		TreatWChar_tAsBuiltInType="true"
+		ForceConformanceInForLoopScope="true"
+		RuntimeTypeInfo="true"
+		UsePrecompiledHeader="0"
+		WarningLevel="3"
+		Detect64BitPortabilityProblems="false"
+		DebugInformationFormat="0"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+		AdditionalOptions="${configuration.compiler.additionalOptions}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmt.lib iphlpapi.lib winmm.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+		AdditionalOptions="${configuration.linker.additionalOptions}"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>