diff --git a/ProGen/progen.properties b/ProGen/progen.properties
index 833289906..569b37a04 100644
--- a/ProGen/progen.properties
+++ b/ProGen/progen.properties
@@ -6,10 +6,15 @@ progen.libsuffix.release_shared = .lib
 progen.libsuffix.release_static_md = md.lib
 progen.libsuffix.release_static_mt = mt.lib
 progen.project.guidFromName.namespaceUUID = F4193868-E4EB-4090-9A01-344E7233004B
-progen.postprocess.upgrade2008to2010.tool =  C:\\Program Files (x86)\\Microsoft Visual Studio 10.0\\Common7\\IDE\\DevEnv.exe
+progen.postprocess.upgrade2008to2010.tool =  C:\\Program Files\\Microsoft Visual Studio 10.0\\Common7\\IDE\\DevEnv.exe
 progen.postprocess.upgrade2008to2010.args = %;/Upgrade
 progen.postprocess.upgrade2008to2010.deleteOriginalFile = true
 progen.postprocess.upgrade2008to2010.deleteFiles = Backup;_UpgradeReport_Files;UpgradeLog.XML
 progen.postprocess.upgrade2008to2010.fix2010ProjectFile = true
+progen.postprocess.upgrade2008to2012.tool =  C:\\Program Files\\Microsoft Visual Studio 10.0\\Common7\\IDE\\DevEnv.exe
+progen.postprocess.upgrade2008to2012.args = %;/Upgrade
+progen.postprocess.upgrade2008to2012.deleteOriginalFile = true
+progen.postprocess.upgrade2008to2012.deleteFiles = Backup;_UpgradeReport_Files;UpgradeLog.XML
+progen.postprocess.upgrade2008to2012.fix2012ProjectFile = 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 c51240b9a..1b277f1c4 100644
--- a/ProGen/src/ProGen.cpp
+++ b/ProGen/src/ProGen.cpp
@@ -1,7 +1,7 @@
 //
 // ProGen.cpp
 //
-// $Id: //poco/1.4/ProGen/src/ProGen.cpp#4 $
+// $Id: //poco/1.4/ProGen/src/ProGen.cpp#5 $
 //
 // Visual Studio project file generator.
 //
@@ -262,8 +262,6 @@ protected:
 		for (int fileIndex = 0; fileIndex < pFileElems->length(); fileIndex++)
 		{
 			Poco::XML::Element* pFileElem = static_cast<Poco::XML::Element*>(pFileElems->item(fileIndex));
-			Poco::Path relativePath(pFileElem->getAttribute("RelativePath"));
-			bool isResource = relativePath.getExtension() == "rc";
 			Poco::XML::Element* pFileConfigElem = pFileElem->getChildElement("FileConfiguration");
 			if (pFileConfigElem)
 			{
@@ -278,13 +276,6 @@ protected:
 				{
 					Poco::AutoPtr<Poco::XML::Element> pNewFileConfigElem = static_cast<Poco::XML::Element*>(pPrototypeFileConfigElem->cloneNode(true));
 					pNewFileConfigElem->setAttribute("Name", *it + "|" + platform);
-					if (isResource)
-					{
-						if (it->find("static") != std::string::npos)
-							pNewFileConfigElem->setAttribute("ExcludedFromBuild", "true");
-						else
-							pNewFileConfigElem->removeAttribute("ExcludedFromBuild");
-					}
 					pFileElem->appendChild(pNewFileConfigElem);
 				}
 			}
@@ -344,6 +335,11 @@ protected:
 			solutionStream << "Microsoft Visual Studio Solution File, Format Version 11.00\r\n# Visual Studio 2010\r\n";
 			generateSolution80(solutionStream, solutionPath, solutionGUID, projectConfig, templateProps, platform, tool);
 		}
+		else if (tool == "vs110")
+		{
+			solutionStream << "Microsoft Visual Studio Solution File, Format Version 12.00\r\n# Visual Studio 2012\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)
@@ -543,6 +539,30 @@ protected:
 		}
 	}
 	
+	void fix2012Project(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));
+			Poco::XML::Node* pPropertyGroupElem = pConfigurationTypeElem->parentNode();
+			Poco::AutoPtr<Poco::XML::Element> pPlatformToolsetElem = pProjectDoc->createElement("PlatformToolset");
+			Poco::AutoPtr<Poco::XML::Text> pText = pProjectDoc->createTextNode("v110");
+			pPlatformToolsetElem->appendChild(pText);
+			pPropertyGroupElem->appendChild(pPlatformToolsetElem);
+		}
+	}
+	
+	void writeProject(Poco::AutoPtr<Poco::XML::Document> pProjectDoc, const std::string& path)
+	{
+		Poco::XML::DOMWriter writer;
+		writer.setOptions(Poco::XML::XMLWriter::PRETTY_PRINT | Poco::XML::XMLWriter::WRITE_XML_DECLARATION);
+		writer.setNewLine(Poco::XML::XMLWriter::NEWLINE_CRLF);
+		writer.setIndent("  ");
+		writer.writeNode(path, pProjectDoc);
+	}
+	
 	void generateProject(const Poco::Util::AbstractConfiguration& projectConfig, const Poco::Path& projectPath, const Poco::Path& templatePath, const std::string& platform, const std::string& tool)
 	{
 		Poco::File templateDir(templatePath);
@@ -712,11 +732,17 @@ protected:
 								logger().information("Fixing Visual Studio 2010 project file: " + vcxprojPath.toString());
 								Poco::AutoPtr<Poco::XML::Document> pProjectDoc = domParser.parse(vcxprojPath.toString());
 								fix2010Project(pProjectDoc, configSet, pTemplateProps->getString("project.platform", platform), *pProps, *pTemplateProps);
-								Poco::XML::DOMWriter writer;
-								writer.setOptions(Poco::XML::XMLWriter::PRETTY_PRINT | Poco::XML::XMLWriter::WRITE_XML_DECLARATION);
-								writer.setNewLine(Poco::XML::XMLWriter::NEWLINE_CRLF);
-								writer.setIndent("  ");
-								writer.writeNode(vcxprojPath.toString(), pProjectDoc);
+								writeProject(pProjectDoc, vcxprojPath.toString());
+							}
+						}
+						if (config().getBool("progen.postprocess." + postprocess + ".fix2012ProjectFile", false))
+						{
+							if (projectFile.exists())
+							{
+								logger().information("Fixing Visual Studio 2012 project file: " + vcxprojPath.toString());
+								Poco::AutoPtr<Poco::XML::Document> pProjectDoc = domParser.parse(vcxprojPath.toString());
+								fix2012Project(pProjectDoc, configSet, pTemplateProps->getString("project.platform", platform), *pProps, *pTemplateProps);
+								writeProject(pProjectDoc, vcxprojPath.toString());
 							}
 						}
 						if (config().getBool("progen.postprocess." + postprocess + ".deleteOriginalFile", false))
diff --git a/ProGen/templates/vs110/Win32/executable/debug_shared.template b/ProGen/templates/vs110/Win32/executable/debug_shared.template
new file mode 100644
index 000000000..d50a22883
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/debug_shared.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/executable/debug_static_md.template b/ProGen/templates/vs110/Win32/executable/debug_static_md.template
new file mode 100644
index 000000000..e517a4014
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/debug_static_md.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/executable/debug_static_mt.template b/ProGen/templates/vs110/Win32/executable/debug_static_mt.template
new file mode 100644
index 000000000..cc72fb872
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/debug_static_mt.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/executable/project.properties b/ProGen/templates/vs110/Win32/executable/project.properties
new file mode 100644
index 000000000..318460fae
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/project.properties
@@ -0,0 +1,9 @@
+project.suffix = _vs110.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 = upgrade2008to2012
+project.finalSuffix = _vs110.vcxproj
diff --git a/ProGen/templates/vs110/Win32/executable/project.template b/ProGen/templates/vs110/Win32/executable/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/Win32/executable/release_shared.template b/ProGen/templates/vs110/Win32/executable/release_shared.template
new file mode 100644
index 000000000..ba3a503ea
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/release_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/executable/release_static_md.template b/ProGen/templates/vs110/Win32/executable/release_static_md.template
new file mode 100644
index 000000000..e66ad96c7
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/release_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/executable/release_static_mt.template b/ProGen/templates/vs110/Win32/executable/release_static_mt.template
new file mode 100644
index 000000000..25e890cf2
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/executable/release_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/library/debug_shared.template b/ProGen/templates/vs110/Win32/library/debug_shared.template
new file mode 100644
index 000000000..6d159fac3
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/debug_shared.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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"
+	/>
+	<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/vs110/Win32/library/debug_static_md.template b/ProGen/templates/vs110/Win32/library/debug_static_md.template
new file mode 100644
index 000000000..854409c68
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/debug_static_md.template
@@ -0,0 +1,72 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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/vs110/Win32/library/debug_static_mt.template b/ProGen/templates/vs110/Win32/library/debug_static_mt.template
new file mode 100644
index 000000000..ed40dc57e
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/debug_static_mt.template
@@ -0,0 +1,72 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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/vs110/Win32/library/project.properties b/ProGen/templates/vs110/Win32/library/project.properties
new file mode 100644
index 000000000..28db0839e
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/project.properties
@@ -0,0 +1,9 @@
+project.suffix = _vs110.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 = upgrade2008to2012
+project.finalSuffix = _vs110.vcxproj
diff --git a/ProGen/templates/vs110/Win32/library/project.template b/ProGen/templates/vs110/Win32/library/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/Win32/library/release_shared.template b/ProGen/templates/vs110/Win32/library/release_shared.template
new file mode 100644
index 000000000..d92f14f1b
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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"
+	/>
+	<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/vs110/Win32/library/release_static_md.template b/ProGen/templates/vs110/Win32/library/release_static_md.template
new file mode 100644
index 000000000..5e07c0bac
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/release_static_md.template
@@ -0,0 +1,75 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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/vs110/Win32/library/release_static_mt.template b/ProGen/templates/vs110/Win32/library/release_static_mt.template
new file mode 100644
index 000000000..73cb1392e
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/library/release_static_mt.template
@@ -0,0 +1,73 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="${project.outdir}\lib\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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/vs110/Win32/plugin/debug_shared.template b/ProGen/templates/vs110/Win32/plugin/debug_shared.template
new file mode 100644
index 000000000..d108a757e
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/plugin/debug_shared.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\$(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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<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"
+	/>
+	<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/vs110/Win32/plugin/project.properties b/ProGen/templates/vs110/Win32/plugin/project.properties
new file mode 100644
index 000000000..3d5e4a610
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/plugin/project.properties
@@ -0,0 +1,5 @@
+project.suffix = _vs110.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.postprocess = upgrade2008to2012
+project.finalSuffix = _vs110.vcxproj
diff --git a/ProGen/templates/vs110/Win32/plugin/project.template b/ProGen/templates/vs110/Win32/plugin/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/Win32/plugin/release_shared.template b/ProGen/templates/vs110/Win32/plugin/release_shared.template
new file mode 100644
index 000000000..62bd2604f
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/plugin/release_shared.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="${project.outdir}\bin\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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"
+	/>
+	<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/vs110/Win32/testsuite/debug_shared.template b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
new file mode 100644
index 000000000..a1ab9799a
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_shared.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="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;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.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="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
new file mode 100644
index 000000000..8792393ce
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	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=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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${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="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
new file mode 100644
index 000000000..9563d830d
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="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=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="4"
+		CompileAs="0"
+		DisableSpecificWarnings="${configuration.compiler.disableWarnings}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb"
+		SubSystem="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/testsuite/project.properties b/ProGen/templates/vs110/Win32/testsuite/project.properties
new file mode 100644
index 000000000..318460fae
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/project.properties
@@ -0,0 +1,9 @@
+project.suffix = _vs110.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 = upgrade2008to2012
+project.finalSuffix = _vs110.vcxproj
diff --git a/ProGen/templates/vs110/Win32/testsuite/project.template b/ProGen/templates/vs110/Win32/testsuite/project.template
new file mode 100644
index 000000000..6c9d8b9cb
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/Win32/testsuite/release_shared.template b/ProGen/templates/vs110/Win32/testsuite/release_shared.template
new file mode 100644
index 000000000..28cf332bb
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/release_shared.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="release_shared|Win32"
+	OutputDirectory="bin\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		OutputFile="bin\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/testsuite/release_static_md.template b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
new file mode 100644
index 000000000..dc846e391
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_md.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="release_static_md|Win32"
+	OutputDirectory="bin\static_md\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
new file mode 100644
index 000000000..108b8d903
--- /dev/null
+++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|Win32"
+	OutputDirectory="bin\static_mt\"
+	IntermediateDirectory="obj\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib"
+		IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="1"
+	/>
+	<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/vs110/x64/executable/debug_shared.template b/ProGen/templates/vs110/x64/executable/debug_shared.template
new file mode 100644
index 000000000..767fd36b3
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/debug_shared.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/executable/debug_static_md.template b/ProGen/templates/vs110/x64/executable/debug_static_md.template
new file mode 100644
index 000000000..e96859ca9
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/debug_static_md.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_md\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/executable/debug_static_mt.template b/ProGen/templates/vs110/x64/executable/debug_static_mt.template
new file mode 100644
index 000000000..57f60b247
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/debug_static_mt.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
+		SubSystem="1"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/executable/project.properties b/ProGen/templates/vs110/x64/executable/project.properties
new file mode 100644
index 000000000..1acbe5241
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _x64_vs110.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 = upgrade2008to2012
+project.finalSuffix = _x64_vs110.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs110/x64/executable/project.template b/ProGen/templates/vs110/x64/executable/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/x64/executable/release_shared.template b/ProGen/templates/vs110/x64/executable/release_shared.template
new file mode 100644
index 000000000..79ec2e3f4
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/release_shared.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/executable/release_static_md.template b/ProGen/templates/vs110/x64/executable/release_static_md.template
new file mode 100644
index 000000000..a61d0fff7
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/release_static_md.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/executable/release_static_mt.template b/ProGen/templates/vs110/x64/executable/release_static_mt.template
new file mode 100644
index 000000000..05269d661
--- /dev/null
+++ b/ProGen/templates/vs110/x64/executable/release_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\$(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"
+		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}"
+	/>
+	<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"
+		GenerateDebugInformation="false"
+		SubSystem="1"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/library/debug_shared.template b/ProGen/templates/vs110/x64/library/debug_shared.template
new file mode 100644
index 000000000..b64f94c66
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/debug_shared.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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"
+	/>
+	<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/vs110/x64/library/debug_static_md.template b/ProGen/templates/vs110/x64/library/debug_static_md.template
new file mode 100644
index 000000000..ab4eb5cd5
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/debug_static_md.template
@@ -0,0 +1,73 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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/vs110/x64/library/debug_static_mt.template b/ProGen/templates/vs110/x64/library/debug_static_mt.template
new file mode 100644
index 000000000..6c8be090f
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/debug_static_mt.template
@@ -0,0 +1,73 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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/vs110/x64/library/project.properties b/ProGen/templates/vs110/x64/library/project.properties
new file mode 100644
index 000000000..e502afaf5
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _x64_vs110.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 = upgrade2008to2012
+project.finalSuffix = _x64_vs110.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs110/x64/library/project.template b/ProGen/templates/vs110/x64/library/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/x64/library/release_shared.template b/ProGen/templates/vs110/x64/library/release_shared.template
new file mode 100644
index 000000000..50897a277
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/release_shared.template
@@ -0,0 +1,90 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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"
+	/>
+	<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/vs110/x64/library/release_static_md.template b/ProGen/templates/vs110/x64/library/release_static_md.template
new file mode 100644
index 000000000..d22d10ac2
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/release_static_md.template
@@ -0,0 +1,74 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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/vs110/x64/library/release_static_mt.template b/ProGen/templates/vs110/x64/library/release_static_mt.template
new file mode 100644
index 000000000..c577be29f
--- /dev/null
+++ b/ProGen/templates/vs110/x64/library/release_static_mt.template
@@ -0,0 +1,74 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="${project.outdir}\lib64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="4"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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/vs110/x64/plugin/debug_shared.template b/ProGen/templates/vs110/x64/plugin/debug_shared.template
new file mode 100644
index 000000000..bfcd25e36
--- /dev/null
+++ b/ProGen/templates/vs110/x64/plugin/debug_shared.template
@@ -0,0 +1,85 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\$(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}"
+	/>
+	<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"
+	/>
+	<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/vs110/x64/plugin/project.properties b/ProGen/templates/vs110/x64/plugin/project.properties
new file mode 100644
index 000000000..fd3b49741
--- /dev/null
+++ b/ProGen/templates/vs110/x64/plugin/project.properties
@@ -0,0 +1,6 @@
+project.suffix = _x64_vs110.vcproj
+project.targetSuffix.debug_shared = d
+project.targetSuffix.release_shared = 
+project.postprocess = upgrade2008to2012
+project.finalSuffix = _x64_vs110.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs110/x64/plugin/project.template b/ProGen/templates/vs110/x64/plugin/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/x64/plugin/release_shared.template b/ProGen/templates/vs110/x64/plugin/release_shared.template
new file mode 100644
index 000000000..923a11c16
--- /dev/null
+++ b/ProGen/templates/vs110/x64/plugin/release_shared.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="${project.outdir}\bin64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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}"
+	/>
+	<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"
+	/>
+	<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/vs110/x64/testsuite/debug_shared.template b/ProGen/templates/vs110/x64/testsuite/debug_shared.template
new file mode 100644
index 000000000..caa3253c3
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/debug_shared.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="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;${project.pocobase}\CppUnit\include;${project.pocobase}\CppUnit\WinTestRunner\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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitd.lib WinTestRunnerd.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="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/testsuite/debug_static_md.template b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
new file mode 100644
index 000000000..2cee6d3c4
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template
@@ -0,0 +1,86 @@
+<Configuration
+	Name="debug_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmdd.lib WinTestRunnermdd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${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="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
new file mode 100644
index 000000000..b4bd4bea6
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template
@@ -0,0 +1,87 @@
+<Configuration
+	Name="debug_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmtd.lib WinTestRunnermtd.lib iphlpapi.lib winmm.lib nafxcwd.lib libcmtd.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}d.exe"
+		LinkIncremental="2"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib"
+		SuppressStartupBanner="true"
+		GenerateDebugInformation="true"
+		ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb"
+		SubSystem="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/testsuite/project.properties b/ProGen/templates/vs110/x64/testsuite/project.properties
new file mode 100644
index 000000000..1acbe5241
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/project.properties
@@ -0,0 +1,10 @@
+project.suffix = _x64_vs110.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 = upgrade2008to2012
+project.finalSuffix = _x64_vs110.vcxproj
+project.targetArchitecture = AMD64
diff --git a/ProGen/templates/vs110/x64/testsuite/project.template b/ProGen/templates/vs110/x64/testsuite/project.template
new file mode 100644
index 000000000..65e92894c
--- /dev/null
+++ b/ProGen/templates/vs110/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/vs110/x64/testsuite/release_shared.template b/ProGen/templates/vs110/x64/testsuite/release_shared.template
new file mode 100644
index 000000000..c9d08ad98
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/release_shared.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="release_shared|x64"
+	OutputDirectory="bin64\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnit.lib WinTestRunner.lib ${configuration.linker.dependencies}"
+		OutputFile="bin64\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/testsuite/release_static_md.template b/ProGen/templates/vs110/x64/testsuite/release_static_md.template
new file mode 100644
index 000000000..9afafa132
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_md.template
@@ -0,0 +1,88 @@
+<Configuration
+	Name="release_static_md|x64"
+	OutputDirectory="bin64\static_md\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="2"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmd.lib WinTestRunnermd.lib iphlpapi.lib winmm.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_md\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<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/vs110/x64/testsuite/release_static_mt.template b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
new file mode 100644
index 000000000..7446da7c0
--- /dev/null
+++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template
@@ -0,0 +1,89 @@
+<Configuration
+	Name="release_static_mt|x64"
+	OutputDirectory="bin64\static_mt\"
+	IntermediateDirectory="obj64\$(ConfigurationName)"
+	ConfigurationType="1"
+	UseOfMFC="1"
+	CharacterSet="2"
+	>
+	<Tool
+		Name="VCPreBuildEventTool"
+	/>
+	<Tool
+		Name="VCCustomBuildTool"
+	/>
+	<Tool
+		Name="VCXMLDataGeneratorTool"
+	/>
+	<Tool
+		Name="VCWebServiceProxyGeneratorTool"
+	/>
+	<Tool
+		Name="VCMIDLTool"
+	/>
+	<Tool
+		Name="VCCLCompilerTool"
+		Optimization="4"
+		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=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}"
+	/>
+	<Tool
+		Name="VCManagedResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCResourceCompilerTool"
+	/>
+	<Tool
+		Name="VCPreLinkEventTool"
+	/>
+	<Tool
+		Name="VCLinkerTool"
+		AdditionalDependencies="CppUnitmt.lib WinTestRunnermt.lib iphlpapi.lib winmm.lib nafxcw.lib libcmt.lib WinTestRunner.res ${configuration.linker.dependencies}"
+		OutputFile="bin64\static_mt\${project.target}.exe"
+		LinkIncremental="1"
+		AdditionalLibraryDirectories="${project.pocobase}\lib64"
+		IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib"
+		GenerateDebugInformation="false"
+		SubSystem="2"
+		OptimizeReferences="2"
+		EnableCOMDATFolding="2"
+		TargetMachine="17"
+	/>
+	<Tool
+		Name="VCALinkTool"
+	/>
+	<Tool
+		Name="VCManifestTool"
+	/>
+	<Tool
+		Name="VCXDCMakeTool"
+	/>
+	<Tool
+		Name="VCBscMakeTool"
+	/>
+	<Tool
+		Name="VCFxCopTool"
+	/>
+	<Tool
+		Name="VCAppVerifierTool"
+	/>
+	<Tool
+		Name="VCPostBuildEventTool"
+	/>
+</Configuration>