Regenerating VisualStudio projects

CppParser/CppParser_CE_vs90.vcproj

@@ -196,7 +196,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParsermtd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParserMTd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -211,7 +211,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppParsermtd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppParserMTd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -276,7 +276,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppParsermt.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppParserMT.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -325,7 +325,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParsermdd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParserMDd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -340,7 +340,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppParsermdd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppParserMDd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -405,7 +405,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppParsermd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppParserMD.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool

CppParser/CppParser_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\CppParser\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppParser</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
@@ -192,7 +192,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppParserMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -218,7 +219,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppParserMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -235,7 +237,7 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -243,7 +245,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppParserMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -271,7 +274,7 @@
     </ClCompile>
     <Lib>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_vs100.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{0eb97c38-4dbf-45af-9442-7b8278de256b}</UniqueIdentifier>
+      <UniqueIdentifier>{e9db8561-fe54-4f9c-8471-d0f38709c9d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{949bb527-b465-411b-aa5a-d1a013a0bc6b}</UniqueIdentifier>
+      <UniqueIdentifier>{5b4617eb-06c6-491f-ad73-70e4b6e26a47}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{b210495a-be06-4b02-bbd9-83b2bdb8bc2b}</UniqueIdentifier>
+      <UniqueIdentifier>{d7b3b50c-a788-4a83-8730-0150a7d40be5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{a991fd89-4895-4187-bc24-b02f46db425f}</UniqueIdentifier>
+      <UniqueIdentifier>{7c7aef02-dd72-45de-85bd-0891afb2fe6c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{a07dff1a-3cca-447f-b569-075990fbe249}</UniqueIdentifier>
+      <UniqueIdentifier>{aad8ff69-599d-41ac-967f-4c21ea7287b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{9e713466-c18a-4cee-8dbd-9fc88c9039aa}</UniqueIdentifier>
+      <UniqueIdentifier>{733b9a29-8a73-469f-8246-72a64de0fdc8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{f549edba-353e-4ff7-8864-185c7cd62838}</UniqueIdentifier>
+      <UniqueIdentifier>{80e89104-e8fb-4ae1-b80a-da7645597f68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{14935db5-dc75-4472-87a2-df05a258e3b7}</UniqueIdentifier>
+      <UniqueIdentifier>{7bab415b-348b-492c-9fd3-a0299e3b50ee}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{40a88f96-ed97-4650-8884-e6eea55757fa}</UniqueIdentifier>
+      <UniqueIdentifier>{0f0752ce-6782-4658-adad-6786b5a112a0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppParser</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_vs110.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{78a27494-64ed-47f9-a691-1bda07c9dd94}</UniqueIdentifier>
+      <UniqueIdentifier>{3e411f2b-5599-497b-a06c-18388e9a1a44}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{5db5a208-dd5a-41f8-b50e-7342cd4d70e1}</UniqueIdentifier>
+      <UniqueIdentifier>{7a1162eb-6e5f-4e84-bd15-d9c0662d3639}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{ae7e8b17-3d54-4fb8-a862-c423b5abfe63}</UniqueIdentifier>
+      <UniqueIdentifier>{e0c3bc59-a73f-43fd-b2d5-91c1a37932de}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{bb5e1fad-f6df-4f1e-9273-45d2e2f619cb}</UniqueIdentifier>
+      <UniqueIdentifier>{967cf829-5e0f-4bed-8882-eb90f527fabc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{7ccf016f-c8e1-40aa-8779-6216cbf8e6e1}</UniqueIdentifier>
+      <UniqueIdentifier>{a947392b-4c50-4a44-abfd-1c491999c517}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{2924fcf1-e290-406c-b954-072fa33a45ac}</UniqueIdentifier>
+      <UniqueIdentifier>{f798e677-9e17-485c-b3ee-af72c663f085}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{ab97c710-df13-4ec3-aa5a-76eec940ad54}</UniqueIdentifier>
+      <UniqueIdentifier>{44e616a3-6c0e-423b-ad42-110b66b47ebf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{16412b8e-83bd-4ea6-a15b-3a3400046c7a}</UniqueIdentifier>
+      <UniqueIdentifier>{a4793c73-35c9-4de2-9bc1-19e7e75ae01a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{b35137ca-29f0-4409-ae85-ebd098dce99e}</UniqueIdentifier>
+      <UniqueIdentifier>{5cda45f3-ed34-4d76-8d42-78a1641c53e0}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_vs120.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppParser</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_vs120.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{9b60e8e0-d465-4411-982c-bcaa524afdc3}</UniqueIdentifier>
+      <UniqueIdentifier>{c30d21f3-6e5d-489f-b5c1-248aaef0a33f}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{43bb19cc-e598-4965-9153-0cca28299b72}</UniqueIdentifier>
+      <UniqueIdentifier>{e6ea3d57-17c0-48fc-b5a7-b851835feca8}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{c8b11ad1-e653-4482-adf2-a3e218780c98}</UniqueIdentifier>
+      <UniqueIdentifier>{dabc95b9-f3de-457f-b097-39b5f1074d55}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{d74ed20e-3de5-4b9f-b2d6-adfff5f3b723}</UniqueIdentifier>
+      <UniqueIdentifier>{97ad2f6d-102d-47fb-aec1-0d45094f417f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{203dd30f-0f27-4e23-97ff-5c3fdc243e7f}</UniqueIdentifier>
+      <UniqueIdentifier>{2489705d-2e0a-4f43-8638-35d57f9dde12}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{8ce7aac3-184b-4416-a08d-dd084e35b004}</UniqueIdentifier>
+      <UniqueIdentifier>{b6b05436-f262-4782-8beb-f119704e5772}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{41fa7ce8-411d-4095-a876-bfa85d49aa58}</UniqueIdentifier>
+      <UniqueIdentifier>{a325e88d-d91b-4869-8254-3ad3b9d681d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{03ad2a9f-e4da-4567-95e6-e0d41111c549}</UniqueIdentifier>
+      <UniqueIdentifier>{38a63d48-0c74-4cce-aac4-cac078e8ab40}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{156241b8-f780-43be-a5b5-ace7932fc9ac}</UniqueIdentifier>
+      <UniqueIdentifier>{228f7417-0e14-4860-8b28-413e1dad045e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_vs140.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppParser</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_vs140.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{9c1f2752-16b7-40e5-afa1-b73079f8fcd5}</UniqueIdentifier>
+      <UniqueIdentifier>{744224af-ba95-4e13-b72f-882bfe19a8a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{a46a53b6-ca33-4819-958a-b662fb7bb577}</UniqueIdentifier>
+      <UniqueIdentifier>{80ea9a99-2786-45f1-82ab-704b1a2973b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{cc7e10e3-33cb-4b78-83d1-e24c2960f537}</UniqueIdentifier>
+      <UniqueIdentifier>{3752753e-88f9-4973-8e17-37f480d8c0ca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{8def99f7-23bd-4fa3-bf1b-b39187386f55}</UniqueIdentifier>
+      <UniqueIdentifier>{541927ca-63d6-4303-ad58-008d96ca5ea8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{d554025a-a7d0-4413-b184-addcf68d6c05}</UniqueIdentifier>
+      <UniqueIdentifier>{a14c2e0d-34aa-4f4a-bc72-4b6a299a6de0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{6e9bb1e7-4d83-454f-89e2-b5dec1ac74fc}</UniqueIdentifier>
+      <UniqueIdentifier>{46522e3e-79f0-47ae-8162-a81331adc456}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{b9887352-55d3-42e7-94c8-dcbf58092651}</UniqueIdentifier>
+      <UniqueIdentifier>{04f270cd-5515-46ec-a795-c8dce2691caf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{43a1f1a5-c08e-4bff-b055-9b65c8b1f0fd}</UniqueIdentifier>
+      <UniqueIdentifier>{607d47ac-73b7-4967-b97c-f5de7f5ac809}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{ebe03907-717b-4270-b9cb-f150cc137032}</UniqueIdentifier>
+      <UniqueIdentifier>{13c12d14-3e64-4604-83b0-535dd88ccd00}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_vs150.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppParser</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppParserMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_vs150.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{78eacddc-f529-454b-acdb-b801bd3aedbd}</UniqueIdentifier>
+      <UniqueIdentifier>{bd817bc1-b938-4b25-a4bd-c4a26a4dbeda}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{d941d576-14f6-4843-a4c9-59a517d77cce}</UniqueIdentifier>
+      <UniqueIdentifier>{e8917ece-34a8-45cf-9357-a666ed0d66a0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{339e073d-4572-4152-808e-b13e60cd406d}</UniqueIdentifier>
+      <UniqueIdentifier>{ad2825f5-f318-4425-b922-696d7e5d617c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{2351d6b9-dea8-4605-818f-bad799794faa}</UniqueIdentifier>
+      <UniqueIdentifier>{bbc5f3c6-d8b5-4289-a9ad-142fba2e8d48}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{b1e9e71d-f8ac-4a75-b879-423d9e18aecc}</UniqueIdentifier>
+      <UniqueIdentifier>{97cd4b96-3fdd-463a-8c37-e9225b57b3d1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{c28b6fe0-e217-440f-8d33-072fcac04f88}</UniqueIdentifier>
+      <UniqueIdentifier>{32db35e5-e8f6-485e-ab17-4251a3713ac6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{ca54d561-99db-4061-b1bf-6995713f9e1e}</UniqueIdentifier>
+      <UniqueIdentifier>{79e468cb-7fd8-4b6e-ae06-70591f1eb857}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{ee137253-2409-48ca-971b-9170ffc38e05}</UniqueIdentifier>
+      <UniqueIdentifier>{89bc6bd1-e6f7-4320-a8f0-cb6f2164e890}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{5d50efde-7aa8-4c88-89c6-cc12e82af293}</UniqueIdentifier>
+      <UniqueIdentifier>{8634ec3b-09c0-4241-b033-8744386ddd20}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin\PocoCppParserd.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -128,7 +128,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin\PocoCppParser.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -185,7 +185,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCppParsermtd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCppParserMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -200,7 +200,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppParsermtd.lib"/>
+				OutputFile="..\lib\PocoCppParserMTd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -258,7 +258,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppParsermt.lib"/>
+				OutputFile="..\lib\PocoCppParserMT.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -300,7 +300,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCppParsermdd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCppParserMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -315,7 +315,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppParsermdd.lib"/>
+				OutputFile="..\lib\PocoCppParserMDd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -373,7 +373,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppParsermd.lib"/>
+				OutputFile="..\lib\PocoCppParserMD.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool

CppParser/CppParser_x64_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\CppParser\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppParser64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppParser64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
@@ -192,7 +192,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppParserMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -218,7 +220,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppParserMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -235,7 +239,7 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -243,7 +247,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppParserMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -269,7 +275,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppParserMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs100.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{a006d611-c65e-4b56-bca3-80868363d6a4}</UniqueIdentifier>
+      <UniqueIdentifier>{869d674d-68df-4337-90f0-b8989834a4c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{81fd3102-97fd-41f0-a379-c673c2c5e960}</UniqueIdentifier>
+      <UniqueIdentifier>{0845a4fc-3045-4ed0-9333-8b7b8d495556}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{6b5636fa-a89d-47b2-a7a0-1daf40db9f88}</UniqueIdentifier>
+      <UniqueIdentifier>{9e9d3c2e-e5c1-4df7-87e8-a7c20b8b54d1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{588efe86-0fe0-4e32-a98c-16ece36e592e}</UniqueIdentifier>
+      <UniqueIdentifier>{d95c345c-e99b-4179-8aeb-d28a06c706dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{bfe38019-4410-44ad-9d4f-bece79bf39f6}</UniqueIdentifier>
+      <UniqueIdentifier>{e86ddce5-2874-4051-8acc-73dfe683170c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{b6002fb0-f25a-4632-840a-1593d508b557}</UniqueIdentifier>
+      <UniqueIdentifier>{ff69552c-977c-4be8-b96c-8bdab1dc3f39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{fac5a3e1-f114-4d29-b16c-0cca9f9e3abc}</UniqueIdentifier>
+      <UniqueIdentifier>{06f78127-fa4d-4b44-9c5c-233e6e9f5c6b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{38c96733-8fd8-41ab-83a2-b92e73ad0c66}</UniqueIdentifier>
+      <UniqueIdentifier>{3cc41636-99fb-4824-893c-d52c33f02e76}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{c733d58f-d7d1-4810-8622-46f3b6c038f5}</UniqueIdentifier>
+      <UniqueIdentifier>{97d94cd3-6a06-4d5b-8a9c-8f0d5504dd4e}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppParser64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppParser64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs110.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{b67970ae-88cb-42d3-9a29-86ddae5af3f9}</UniqueIdentifier>
+      <UniqueIdentifier>{99032cfe-bd54-4382-ab22-f327faaa17e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{81016236-b836-43f5-a1e3-91e2660d3458}</UniqueIdentifier>
+      <UniqueIdentifier>{7fcb4b8a-04e2-445e-b070-204a3264b390}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{23ea0ac5-a548-4a79-a226-d087c0e12b58}</UniqueIdentifier>
+      <UniqueIdentifier>{51a87067-3de6-4d03-b20a-24bfa8f8d385}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{753f0972-dd37-419e-811a-66f09e90624d}</UniqueIdentifier>
+      <UniqueIdentifier>{796f4535-a8cc-49e1-9faf-a9617f41a998}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{6581798a-bb6f-42b8-b742-5e698cccae22}</UniqueIdentifier>
+      <UniqueIdentifier>{b98c7146-f42c-4ee6-875a-d2d462b24f02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{173b74f2-e786-424b-ba34-e1708d49c7da}</UniqueIdentifier>
+      <UniqueIdentifier>{8e2f61f5-b66f-4985-9096-d0d7af4cd5b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{c6e08665-af75-4f20-a81b-3a10ce8fc6ad}</UniqueIdentifier>
+      <UniqueIdentifier>{3fe06e47-3383-442f-9665-423aa840b393}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{9534bd03-3b81-4ca9-bb4d-5c11a9f2d2cc}</UniqueIdentifier>
+      <UniqueIdentifier>{4687af42-19f2-4957-85a8-b0fd34cdac4c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{e2086eea-21f7-4b6f-b2e8-227847fd8fbd}</UniqueIdentifier>
+      <UniqueIdentifier>{4de97361-5484-48ca-bf6e-bf8097e8173a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs120.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppParser64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppParser64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs120.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{cf39614f-e54c-4665-8403-fd1c818700a9}</UniqueIdentifier>
+      <UniqueIdentifier>{12aabadb-667b-4634-8c88-f78d44003326}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{7fa40b2b-2660-4da8-b71c-4ed9d8b0c931}</UniqueIdentifier>
+      <UniqueIdentifier>{7188c321-f04b-4db8-989d-a177559360c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{88c21f24-b449-41af-8693-f571bb2b9f60}</UniqueIdentifier>
+      <UniqueIdentifier>{7abe2283-33d1-4789-920e-73aac8dda204}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{cf25fd71-a42c-4e5e-a5d0-82445b676db4}</UniqueIdentifier>
+      <UniqueIdentifier>{9723bb13-ec3f-4125-927b-3d90d107890e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{a59d6ded-69aa-4e56-abbb-e9cdb4f96a20}</UniqueIdentifier>
+      <UniqueIdentifier>{9efe6f35-5824-4584-b21a-3fa70382375b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{1733c477-4c54-4991-8282-074671acac72}</UniqueIdentifier>
+      <UniqueIdentifier>{0caca9e0-74db-4b03-a969-7ccbac5dbfec}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{a853a432-0de4-4de3-bdc3-f2649f0e9d07}</UniqueIdentifier>
+      <UniqueIdentifier>{2928d071-5053-4bf7-a4a1-8899c7321c0a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{396ea917-131a-4ceb-a1c4-68c8ec24bf7e}</UniqueIdentifier>
+      <UniqueIdentifier>{dd1f52d6-0034-427a-9834-e7bb70d30c43}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{399c47eb-66b6-4bbf-9047-c0d111eff5ec}</UniqueIdentifier>
+      <UniqueIdentifier>{cee8424c-a032-4977-92b3-667b86d4f590}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs140.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppParser64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppParser64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs140.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{ba7a771e-76c6-4f3f-b809-99a2bc4dd4c2}</UniqueIdentifier>
+      <UniqueIdentifier>{674841c3-01eb-46cf-a831-51e16fcf4647}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{d91ffdcb-400f-4a0c-aeb6-3586afeeb30e}</UniqueIdentifier>
+      <UniqueIdentifier>{38f3c8fa-623f-460e-8c17-f99bb5e5aec5}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{3130d802-06fc-437e-afe4-dd7827e70528}</UniqueIdentifier>
+      <UniqueIdentifier>{60f35884-8f9f-4385-9a92-12418ff24aab}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{5f8a6985-c457-418f-a3b4-47e6e0586b0e}</UniqueIdentifier>
+      <UniqueIdentifier>{3e4afad2-51f9-4195-b60f-5550ab43dc93}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{02bf932c-57a8-4321-8346-e0789f568488}</UniqueIdentifier>
+      <UniqueIdentifier>{166ba5f5-7261-4f7a-905b-0ac912eff1ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{cf20ad15-775d-4f0e-aef3-059cb8f2c192}</UniqueIdentifier>
+      <UniqueIdentifier>{69744f7c-05d6-4161-9555-2406dfe3f6b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{fc23fc43-f0c0-4671-89be-14fb737b18a3}</UniqueIdentifier>
+      <UniqueIdentifier>{84704d22-8cee-4382-a624-8c872be6f722}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{bf5c728e-c0e9-44e2-89ab-0321d5762469}</UniqueIdentifier>
+      <UniqueIdentifier>{57bc489d-17b2-4041-85ab-d3de6e87a9cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{df4401f3-4a2e-4aed-8dec-88b8ce75a488}</UniqueIdentifier>
+      <UniqueIdentifier>{85e3f4c8-cfea-4b09-b112-0700588e8220}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs150.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppParser64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParsermdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParsermtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppParserMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppParserMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppParser64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParsermd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParsermt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppParserMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppParserMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppParserMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppParsermd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppParserMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs150.vcxproj.filters

@@ -2,31 +2,31 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{78c28e04-25f8-4ab4-971b-92f2a32fa68f}</UniqueIdentifier>
+      <UniqueIdentifier>{b606ce17-75a8-44f3-8edb-98142c57885a}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{187fb0ba-6650-4656-b0b8-994801914bbb}</UniqueIdentifier>
+      <UniqueIdentifier>{61afe1d4-6305-4e47-b8d8-f2e4dcbe0fbb}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{712a514f-4d45-440a-b3dc-ec39a23fc967}</UniqueIdentifier>
+      <UniqueIdentifier>{ba9bc589-da0d-4844-bdc0-f37ca486eb72}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table">
-      <UniqueIdentifier>{40349073-db77-4396-98ad-4dfb275c62b9}</UniqueIdentifier>
+      <UniqueIdentifier>{3ac7fc5f-845f-419a-98d8-3bdd73734ef8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Header Files">
-      <UniqueIdentifier>{226ef096-8e48-4cab-be75-690cabfed8e6}</UniqueIdentifier>
+      <UniqueIdentifier>{7156c4dc-8d07-4e17-98a8-32bb16066b97}</UniqueIdentifier>
     </Filter>
     <Filter Include="Symbol Table\Source Files">
-      <UniqueIdentifier>{7a61c8d0-1001-420f-9623-dd6a153703d5}</UniqueIdentifier>
+      <UniqueIdentifier>{9abf52c6-8372-474b-8efb-2f2ddb74ff9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{f036e4c3-3f08-491a-b79a-03e1454cb2db}</UniqueIdentifier>
+      <UniqueIdentifier>{c372fd80-5d3d-4245-b71c-6f38c8c0b859}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{1cb4f22e-9342-4a0f-8275-235e2b8b82c5}</UniqueIdentifier>
+      <UniqueIdentifier>{ce1aa0e3-0a33-47e4-8296-7d63bb7bdfce}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{063b864d-f218-46b8-a270-127ab690d8d4}</UniqueIdentifier>
+      <UniqueIdentifier>{0b3cc089-4096-4d4b-804c-5cca415be49d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/CppParser_x64_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoCppParser64d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -128,7 +128,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoCppParser64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -186,7 +186,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCppParsermtd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCppParserMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -201,7 +201,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppParsermtd.lib"
+				OutputFile="..\lib64\PocoCppParserMTd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -260,7 +260,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppParsermt.lib"
+				OutputFile="..\lib64\PocoCppParserMT.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -303,7 +303,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCppParsermdd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCppParserMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -318,7 +318,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppParsermdd.lib"
+				OutputFile="..\lib64\PocoCppParserMDd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -377,7 +377,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppParsermd.lib"
+				OutputFile="..\lib64\PocoCppParserMD.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>

CppParser/testsuite/TestSuite.progen

@@ -7,6 +7,4 @@ vc.project.platforms = Win32, x64
 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md
 vc.project.prototype = TestSuite_vs90.vcproj
 vc.project.compiler.include = ..\\..\\Foundation\\include
-vc.project.linker.dependencies.Win32 = 
-vc.project.linker.dependencies.x64 = 
-vc.project.linker.dependencies.WinCE = 
+vc.project.linker.dependencies = iphlpapi.lib

CppParser/testsuite/TestSuite_vs100.vcxproj

@@ -132,7 +132,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -166,7 +166,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -198,10 +198,10 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -233,10 +233,10 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -266,7 +266,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -300,7 +300,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_vs100.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{12525684-4e3b-4f46-af7b-08935724f322}</UniqueIdentifier>
+      <UniqueIdentifier>{1782c871-e5b6-4fd8-9293-42091213331c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{dfa870e9-8223-430a-b2da-fb6c18fbcf00}</UniqueIdentifier>
+      <UniqueIdentifier>{5cf3374f-b6e2-4700-8214-017b1892977c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{49de42d9-0b63-45af-b123-01179fa05ba4}</UniqueIdentifier>
+      <UniqueIdentifier>{08e44046-5545-48a9-88f6-5f59d4ea002c}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{7bc41ad3-9d4f-45b1-a0db-a28f11ec9614}</UniqueIdentifier>
+      <UniqueIdentifier>{234d873d-b47e-4861-a4b7-5500041ba602}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{98afe064-74cb-49fe-aa8f-5862c7e39c16}</UniqueIdentifier>
+      <UniqueIdentifier>{cc871da5-9d62-4608-81ff-ced166953721}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a4cc9f15-a263-4315-89eb-4791d94b2a3a}</UniqueIdentifier>
+      <UniqueIdentifier>{c349b66a-b788-44bb-948f-d68663e46305}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{626eac99-adb6-4912-aca7-f5b65054745d}</UniqueIdentifier>
+      <UniqueIdentifier>{ebb75f5a-5b7d-41d6-a725-d38dba7ed695}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{c0deff20-ecc8-438a-9991-582541a73a28}</UniqueIdentifier>
+      <UniqueIdentifier>{861fe710-1401-4378-84af-1431758204f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{c8f7a51d-3179-4c21-8983-56a300b9932c}</UniqueIdentifier>
+      <UniqueIdentifier>{5c6ad2a6-534f-4f28-a5ff-5a2e77518b0f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{4a8249b4-3b5c-4e9e-9549-bb9b5c573aee}</UniqueIdentifier>
+      <UniqueIdentifier>{ab14b0ad-5dd7-4062-b076-fce1653806b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{7e063fe3-0f77-4ae6-b04e-697f4eecd9d2}</UniqueIdentifier>
+      <UniqueIdentifier>{462ad2f3-cd1e-48d6-9c69-ce3ab89b8d04}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_vs110.vcxproj

@@ -148,6 +148,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -178,6 +179,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -206,9 +208,10 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -237,9 +240,10 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -266,6 +270,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -296,6 +301,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_vs110.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{31204117-5493-45fd-9845-fa8c470d0047}</UniqueIdentifier>
+      <UniqueIdentifier>{0f03e69c-4e9f-4a80-bb52-bb0b2c6ba358}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{27658e81-5c18-4ec3-9fde-1ededdff34e1}</UniqueIdentifier>
+      <UniqueIdentifier>{b3cb89fb-225a-4b5d-b098-31759deef20c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{d426c76a-c133-46f8-8275-158a652fb98a}</UniqueIdentifier>
+      <UniqueIdentifier>{7c9bfed9-26cc-45f2-88d6-8ebdadf73e35}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{f97caf6d-40c1-4e73-a817-090789cc90fe}</UniqueIdentifier>
+      <UniqueIdentifier>{f6354db9-0e8c-4fd1-b694-1c7840ebec34}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{3776a08e-ab13-46f8-bd94-d28eb38dd884}</UniqueIdentifier>
+      <UniqueIdentifier>{ad7ceb63-06fb-4f05-ad46-22205c0450c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{2736152c-29d7-4526-8cda-27d9cc9fec9f}</UniqueIdentifier>
+      <UniqueIdentifier>{c2739198-5971-4198-b6f9-4603533be677}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{13ae5a5b-0173-41d0-89f4-98081b39e300}</UniqueIdentifier>
+      <UniqueIdentifier>{7ce63a58-1ef0-4cbd-8f8b-c0aabdf7543a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{3a75fcad-c9b6-4d68-80bb-3b586c883fe8}</UniqueIdentifier>
+      <UniqueIdentifier>{6d92de72-1cbf-48a4-af60-9df7cbdef43b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{6cd323ee-f31e-494f-ba07-a5182d945e91}</UniqueIdentifier>
+      <UniqueIdentifier>{ebbfcdd9-0ec4-4f70-84bc-69e6617de716}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{90b38fb2-6b13-4462-b235-2c7a42958ee7}</UniqueIdentifier>
+      <UniqueIdentifier>{1c304e95-d4a9-4e55-9da9-ab11aa4752d9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{dd73cc9d-f3cd-4508-87f5-6373c2abdde3}</UniqueIdentifier>
+      <UniqueIdentifier>{5ed749e5-5603-4885-ada8-39e91758c3eb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_vs120.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_vs120.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{fa030816-76c1-4cba-82ab-02de8a24ca2c}</UniqueIdentifier>
+      <UniqueIdentifier>{af615c04-0c8b-48dc-99db-6834e2dc7117}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{3a928e5e-8709-4272-aecf-28c74a91a766}</UniqueIdentifier>
+      <UniqueIdentifier>{4d25bdaf-0474-4e1f-83b8-d81065399c74}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{5f73425d-aebe-4616-8dfe-a0a891abab32}</UniqueIdentifier>
+      <UniqueIdentifier>{7f3b613c-dfef-420e-b6e2-7dc9c3b2be7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{5247bd7c-eee1-42ed-97be-2c9801ee8758}</UniqueIdentifier>
+      <UniqueIdentifier>{673d8d23-1f23-49da-ad65-f5930428d0d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{f818596a-5858-4d27-88e8-6295ce9f4a85}</UniqueIdentifier>
+      <UniqueIdentifier>{bac7cff8-985b-440b-a435-8b0c5f1ca521}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{57f15327-55c0-4d6a-8191-1cc6d15e6fcb}</UniqueIdentifier>
+      <UniqueIdentifier>{8269a955-5a82-4b1f-a37c-6278b89de8c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{532d9c91-5465-4740-abea-e4cd3c1de246}</UniqueIdentifier>
+      <UniqueIdentifier>{0b78c544-151d-494b-92d2-9dad432d6aac}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{b396d7eb-4389-44b0-a2ee-1853582e18cf}</UniqueIdentifier>
+      <UniqueIdentifier>{d76c5b10-346d-4216-a6c0-b69de3ae9076}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{572c427d-02de-42f6-9ab4-81f850667829}</UniqueIdentifier>
+      <UniqueIdentifier>{71a345de-02ef-4a36-aae7-275452f1894c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{7821b69c-a7bb-47c2-82f3-7262e3e9ae8c}</UniqueIdentifier>
+      <UniqueIdentifier>{7dad95f7-1654-4d62-89f4-c6fc6a939c7c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{3a5b95a6-7271-44c0-8cf6-34ebe0be04cc}</UniqueIdentifier>
+      <UniqueIdentifier>{e69c45c7-4a22-4941-9e1f-2bc8260c9bef}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_vs140.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_vs140.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{cf45e2eb-4521-4be4-a5ec-b0e433cb577f}</UniqueIdentifier>
+      <UniqueIdentifier>{63c84ca3-8743-4329-96b0-4efcabbb6427}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{94e5bd07-914e-46c2-82df-ee5abccc7074}</UniqueIdentifier>
+      <UniqueIdentifier>{7c55d3a1-0f1d-4bc0-8679-f26999ebb6af}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{0bf7a40d-187a-47fa-b58e-4b5bdf73b527}</UniqueIdentifier>
+      <UniqueIdentifier>{8759c402-6fa4-4c50-b5f0-3713944ec316}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{479fe752-9ed2-4514-ac00-9cce1f5f3991}</UniqueIdentifier>
+      <UniqueIdentifier>{7363be96-1dba-40d5-9327-c7fd8ff8761a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{7bf60f5c-57d4-42bc-aeb2-1e0c2aa8fee5}</UniqueIdentifier>
+      <UniqueIdentifier>{ca0ea26d-76b5-4f16-bcfd-f7be2eb7ac59}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{aa937c24-c553-415b-b78a-c9f32e9e8140}</UniqueIdentifier>
+      <UniqueIdentifier>{4aaf3d40-c139-43b8-b79e-925a5f247a56}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{1fa9e911-a7a0-45a0-809a-1a4bd8b789d6}</UniqueIdentifier>
+      <UniqueIdentifier>{3e2a47e8-33f8-4634-90f4-0f8a7bd7c42f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{8b13c9b8-bcad-4100-8661-c5dc78a60ae6}</UniqueIdentifier>
+      <UniqueIdentifier>{b58c3048-6e6d-4d4d-801d-b9adacc2068e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{f0673a6f-919d-42ef-80c9-3588daf07ee2}</UniqueIdentifier>
+      <UniqueIdentifier>{e9da6066-589f-46e9-9016-fb2182f2981e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{afd810cd-5ccf-46a3-b6f8-7cd169d47796}</UniqueIdentifier>
+      <UniqueIdentifier>{7f56ee04-dff4-4566-b4b5-1f2ff1516ca7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{18f749fd-c462-418b-a5ff-550e95026bd9}</UniqueIdentifier>
+      <UniqueIdentifier>{ce09733e-8ead-4f60-9d52-1c4622d26a23}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_vs150.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_vs150.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{bd9026ce-be93-4974-9d7e-9f94cfd91884}</UniqueIdentifier>
+      <UniqueIdentifier>{bb0003d9-221b-4fd2-b429-49544150cc19}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{a17b3dad-a785-488f-a79c-6d1d8e4befb6}</UniqueIdentifier>
+      <UniqueIdentifier>{8150dc67-9d1b-44a6-9b18-c63633f17fa4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{a5052ae4-90e9-4b39-b9b7-b7d205533939}</UniqueIdentifier>
+      <UniqueIdentifier>{c73c9879-7ed8-4925-96c0-d3222ca4dd96}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{a390ba4f-12e5-49bb-8109-af6c77cf6ee4}</UniqueIdentifier>
+      <UniqueIdentifier>{c7497bda-44ff-4110-9415-e4407a586c87}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ea9daa19-202f-4e72-815f-c0ea12fb8276}</UniqueIdentifier>
+      <UniqueIdentifier>{747b805f-f6c5-4718-824d-6395ec23be46}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{da6604d5-94b8-4087-99f6-2875533bc122}</UniqueIdentifier>
+      <UniqueIdentifier>{a735c143-9235-49d3-ac7b-040bf2783f6f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{25a94f4f-e0d5-45ae-843c-067eefa64de3}</UniqueIdentifier>
+      <UniqueIdentifier>{9cd62d52-2126-4e91-ae7b-53e194c19fa3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{3c67425f-f9d5-482f-b2f4-377d80114515}</UniqueIdentifier>
+      <UniqueIdentifier>{c0e6047d-71c4-42b6-96a2-6196c94eee20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{cbae641e-67a9-4070-847d-7f643076375b}</UniqueIdentifier>
+      <UniqueIdentifier>{0a7aa098-d7e0-43d2-8685-d67da1933b20}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{68d29e25-6f90-487a-9cfa-56220e1ee925}</UniqueIdentifier>
+      <UniqueIdentifier>{1550e5b3-0ca3-4546-a6e5-36744e43e232}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{5a705ccd-a18e-4004-9588-303c83b0c0d9}</UniqueIdentifier>
+      <UniqueIdentifier>{9d3a481e-19a6-4a75-aa86-f9e2c4cee51a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_vs90.vcproj

@@ -57,7 +57,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -129,7 +129,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -199,7 +199,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_mt\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -272,7 +272,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_mt\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -343,7 +343,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_md\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib"
@@ -415,7 +415,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin\static_md\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib"

CppParser/testsuite/TestSuite_x64_vs100.vcxproj

@@ -132,7 +132,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -166,7 +166,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -198,10 +198,10 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -233,10 +233,10 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -266,7 +266,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -300,7 +300,7 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Link>
-      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{317cef4e-52a4-45ba-b01d-21aa85dbf662}</UniqueIdentifier>
+      <UniqueIdentifier>{c27808e8-1892-4f46-8260-d0caf498e454}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{0dcd625b-d1ac-4b15-a7e4-6e22a4fc0728}</UniqueIdentifier>
+      <UniqueIdentifier>{904bb92b-5bc5-4188-a69c-6a8c9a1b4e5c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{7c6dd3ed-e2ce-494e-8f5c-f50bbe52bf37}</UniqueIdentifier>
+      <UniqueIdentifier>{510eed1f-b00c-464f-b5c9-4102113d7883}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{a1007277-9c86-402d-a434-29f56c5de503}</UniqueIdentifier>
+      <UniqueIdentifier>{560df6fe-f34d-4ab6-a237-cd7c7afdf7c7}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{eec64439-a2bd-49a2-8d56-f006c9ee12ba}</UniqueIdentifier>
+      <UniqueIdentifier>{50748501-a19c-4845-8abf-fce2a0372139}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{1fc7cb63-9594-40df-a64f-fb76fc670438}</UniqueIdentifier>
+      <UniqueIdentifier>{1d981131-f5e9-45aa-b4f4-030cef0ec359}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{af131a8b-2543-49bd-9049-8aaedb8f056e}</UniqueIdentifier>
+      <UniqueIdentifier>{17845e29-6c17-47c1-96c0-1130b5847021}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{e33249e6-bcfa-4896-bcb4-62c321b78b4c}</UniqueIdentifier>
+      <UniqueIdentifier>{95f8db13-6247-4778-ba04-cc3fcd765d74}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{76e27865-a1a8-4038-8f0a-51ca00aca43a}</UniqueIdentifier>
+      <UniqueIdentifier>{17fbf9b7-42bb-4c0f-820f-3ed2688219ce}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{198d4414-402d-4dcd-8e66-8a78ce046001}</UniqueIdentifier>
+      <UniqueIdentifier>{e9f731e0-3511-49dc-afe6-c67f4743b7e2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{c7ba0d9a-6b08-488a-a09a-c64b6d9b7e06}</UniqueIdentifier>
+      <UniqueIdentifier>{67b6a22c-f122-4765-a1c0-869e88644d71}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_x64_vs110.vcxproj

@@ -148,6 +148,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -178,6 +179,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -206,9 +208,10 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
@@ -237,9 +240,10 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
       <GenerateDebugInformation>false</GenerateDebugInformation>
       <SubSystem>Console</SubSystem>
       <OptimizeReferences>true</OptimizeReferences>
@@ -266,6 +270,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -296,6 +301,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{ae20d8de-c0ba-4878-baf6-8046bcd1a984}</UniqueIdentifier>
+      <UniqueIdentifier>{36dab7f1-4f9e-4704-987d-02232d0f3587}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{ba1a9ffc-2327-4368-9af2-a73a5a93b111}</UniqueIdentifier>
+      <UniqueIdentifier>{9ab19acc-b7d3-44cb-8646-e753d2c72c73}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{47c73566-518b-4ae7-a566-e881267edc2b}</UniqueIdentifier>
+      <UniqueIdentifier>{df2746ef-d232-4433-8e8d-af1b4aa3ccee}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{283921fb-392d-4da8-82db-76589f379246}</UniqueIdentifier>
+      <UniqueIdentifier>{ad0bf026-58c2-4c74-a5d7-0216ce206345}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{edc3296b-0f2a-4871-ae40-c085cf0c4dc4}</UniqueIdentifier>
+      <UniqueIdentifier>{3618e0c8-e438-4430-aed4-2c1161965472}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{efe991f8-30f9-4029-9f7b-6056eca4d2cb}</UniqueIdentifier>
+      <UniqueIdentifier>{d4c7ce05-7514-4fd2-8f49-2470a963bdf3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{6006fef9-c607-4d0d-9e9c-afda48861bea}</UniqueIdentifier>
+      <UniqueIdentifier>{de615dde-5020-4438-a6c5-d51d97bfb797}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{85af86e3-5ece-44bf-99c5-47bf8de34baf}</UniqueIdentifier>
+      <UniqueIdentifier>{360a3e44-1cc7-4c31-a29a-57667d0b58c5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{1ce69f68-b503-4c4c-85fc-66693b1f1060}</UniqueIdentifier>
+      <UniqueIdentifier>{0225ed89-63f2-4089-b324-4a429486f76f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{9687d5d6-4ce9-4914-ba47-c732b5f1989b}</UniqueIdentifier>
+      <UniqueIdentifier>{e0ea0985-1513-420a-b63e-72f3cd67da73}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{75274cc8-35e7-4530-b2e0-944f838196a8}</UniqueIdentifier>
+      <UniqueIdentifier>{a5bb8e0b-e41c-45d4-82a6-a6fd8ddc1de2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_x64_vs120.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{d10dae84-f59f-4849-9969-4bef048d95b0}</UniqueIdentifier>
+      <UniqueIdentifier>{c3fbf3ec-29f1-4e6e-b87f-1ff263a8fe5e}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{1692ebb1-1648-4fb5-af36-aecec6ead337}</UniqueIdentifier>
+      <UniqueIdentifier>{68849bde-e630-4f44-bbb1-be9e80cc3593}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{ad5f7657-0408-4610-a9aa-8f3eb8a6117c}</UniqueIdentifier>
+      <UniqueIdentifier>{92aea1f2-8717-41ff-a1c8-c5484a006bc3}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{9aadd6f1-b1fa-4ca1-a23f-9511ab4049a7}</UniqueIdentifier>
+      <UniqueIdentifier>{e88479d6-87c3-4a3a-80db-39f3c2d2a0c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{8af6ade5-2c51-4a28-902a-a0b6ada9d60a}</UniqueIdentifier>
+      <UniqueIdentifier>{a7689e7a-7a04-4a44-aac6-1b9dc00f0cdf}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{674b1f23-d356-412c-9d3c-7f576f0c8094}</UniqueIdentifier>
+      <UniqueIdentifier>{aea03994-2aa7-4291-9ded-617c495dd321}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{9297bb9c-e75f-4334-b3d7-cd8dd0d5b2f3}</UniqueIdentifier>
+      <UniqueIdentifier>{7d1752be-10fc-445b-8686-868743949d1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{cd5a025d-8bc4-424f-9e5e-fcf9860ecf1f}</UniqueIdentifier>
+      <UniqueIdentifier>{9b5d3686-1669-4c30-aeb8-c66a265a9422}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{292bb15e-2afe-4a2b-b7e8-065daca05e78}</UniqueIdentifier>
+      <UniqueIdentifier>{cc12ed94-fd26-413d-b698-9ad447396620}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{ff59f28a-0e74-464b-a5ae-5bc1bbd09cd8}</UniqueIdentifier>
+      <UniqueIdentifier>{3304ab0e-d05a-4066-be23-775297cdacf1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{b0c16590-2be9-4270-8c08-74d144dff493}</UniqueIdentifier>
+      <UniqueIdentifier>{7fdac0e8-9ea6-455b-b20a-6bc1654e3a70}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_x64_vs140.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{ec486185-12dd-4cdc-a393-7e61032f8d7e}</UniqueIdentifier>
+      <UniqueIdentifier>{17824569-c1a8-4720-b96a-aea3f19b5212}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{4f7c8842-74b8-495f-aa31-b0b8ba576b37}</UniqueIdentifier>
+      <UniqueIdentifier>{21047e93-4f95-4ab1-81d3-81eecdb97a51}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{7552bb24-7f6a-407d-ac98-2cec0df4894f}</UniqueIdentifier>
+      <UniqueIdentifier>{03dacc3b-ecd6-413d-87de-a160dbdc9226}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{ede5dccf-6c1f-4f30-a938-49fcd1a492ac}</UniqueIdentifier>
+      <UniqueIdentifier>{ae13e7ba-5008-43ff-9d0c-c756b29bad96}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{0fb7fc50-4bd5-4cc9-ab46-fdc84b88080f}</UniqueIdentifier>
+      <UniqueIdentifier>{d20e920e-5a1e-4bb5-a9c5-c27b65e3a49a}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a28a0f56-77bf-4eb5-af7d-bf8a5469c166}</UniqueIdentifier>
+      <UniqueIdentifier>{cd690ac9-c94d-4bec-bd6a-257b022a5f9e}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{403a9f20-ae3a-47ac-a73f-25545a343670}</UniqueIdentifier>
+      <UniqueIdentifier>{a9ae879a-7af2-43d7-b7bd-b903826be4e4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{82bb008c-40b7-4f85-889f-66a00335d85a}</UniqueIdentifier>
+      <UniqueIdentifier>{7ec72b2f-ebe7-49e4-a796-3447fdf9ffff}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{dbb04a6e-3817-4b95-8da3-e1f448e2f57e}</UniqueIdentifier>
+      <UniqueIdentifier>{ca4e970b-de38-4381-a7f0-66907e93b881}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{41f605b8-a256-4d9b-875c-c3e473afecf6}</UniqueIdentifier>
+      <UniqueIdentifier>{699b4096-c416-44af-877a-14e0abe176fe}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{9e7c6fb7-847d-436e-9e29-3e408efdb6b5}</UniqueIdentifier>
+      <UniqueIdentifier>{96457c2c-8d15-4290-b59f-3f762f94904a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_x64_vs150.vcxproj

@@ -142,6 +142,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -172,6 +173,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -200,6 +202,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -230,6 +233,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_mt\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>
@@ -258,6 +262,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuited.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -288,6 +293,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Link>
+      <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OutputFile>bin64\static_md\TestSuite.exe</OutputFile>
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
       <GenerateDebugInformation>false</GenerateDebugInformation>

CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters

@@ -2,37 +2,37 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="CppParser">
-      <UniqueIdentifier>{0f88bcde-5b08-45a4-8f5e-20c74793c04c}</UniqueIdentifier>
+      <UniqueIdentifier>{067aca2f-20c6-410e-bccc-29585188fbc2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Header Files">
-      <UniqueIdentifier>{95a00fea-8391-4808-8bbc-b8ebc7656950}</UniqueIdentifier>
+      <UniqueIdentifier>{9e6c244d-a76e-49b8-988a-095eb92a2198}</UniqueIdentifier>
     </Filter>
     <Filter Include="CppParser\Source Files">
-      <UniqueIdentifier>{fbcb37da-495e-49bc-a21d-b6988346feaa}</UniqueIdentifier>
+      <UniqueIdentifier>{cd2c8078-4e88-40af-9c8b-a2840d43ecac}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite">
-      <UniqueIdentifier>{ef0109d9-f0bb-493f-b6f8-bd12cd8c774f}</UniqueIdentifier>
+      <UniqueIdentifier>{78790d77-dc94-40f4-85c0-1a909d2cb388}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{baedb689-2f84-477f-901f-a72fc40aaa4c}</UniqueIdentifier>
+      <UniqueIdentifier>{4d393927-bfde-4868-a44b-34a374f822c4}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{62b91e00-bd26-4e4c-bebf-4ad5618089e2}</UniqueIdentifier>
+      <UniqueIdentifier>{361e6608-0cb4-4b4e-90c1-651ea2f09401}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver">
-      <UniqueIdentifier>{f16982c1-6832-4dc9-ba25-174b9b894f1c}</UniqueIdentifier>
+      <UniqueIdentifier>{c733ead4-072f-4779-b371-671b7a1f1b49}</UniqueIdentifier>
     </Filter>
     <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{7bf3a84d-3848-4d6c-a07e-038efdec63ea}</UniqueIdentifier>
+      <UniqueIdentifier>{284cd35e-346a-4625-8661-06cc0928745b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes">
-      <UniqueIdentifier>{a05fcc7a-6275-43f2-a25e-c7ef7bcb5b43}</UniqueIdentifier>
+      <UniqueIdentifier>{0a707802-f7b2-4911-9471-87567f1857a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Header Files">
-      <UniqueIdentifier>{f4be8a8e-93a4-48e0-809a-73da57b44a20}</UniqueIdentifier>
+      <UniqueIdentifier>{2a0c7ccf-a158-410e-a149-417d6fb60a9d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Attributes\Source Files">
-      <UniqueIdentifier>{0af612cc-a7b6-4df7-85c4-623cdc49d142}</UniqueIdentifier>
+      <UniqueIdentifier>{14123e95-49c9-44a9-a249-0a1f69b7b14f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

CppParser/testsuite/TestSuite_x64_vs90.vcproj

@@ -57,7 +57,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib64"
@@ -129,7 +129,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib64"
@@ -199,7 +199,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_mt\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib64"
@@ -272,7 +272,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_mt\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib64"
@@ -343,7 +343,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_md\TestSuited.exe"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\..\lib64"
@@ -415,7 +415,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="bin64\static_md\TestSuite.exe"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\..\lib64"

CppUnit/CppUnit_CE_vs90.vcproj

@@ -56,7 +56,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin\$(PlatformName)\PocoCppUnitd.dll"
 				LinkIncremental="2"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
@@ -136,7 +136,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalOptions="/FORCE:MULTIPLE "
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin\$(PlatformName)\PocoCppUnit.dll"
 				LinkIncremental="1"
 				AdditionalLibraryDirectories="..\lib\$(PlatformName)"
@@ -198,7 +198,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppUnitmtd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppUnitMTd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -214,7 +214,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppUnitmtd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppUnitMTd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -280,7 +280,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppUnitmt.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppUnitMT.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -329,7 +329,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppUnitmdd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppUnitMDd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -345,7 +345,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppUnitmdd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppUnitMDd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -411,7 +411,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCppUnitmd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCppUnitMD.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool

CppUnit/CppUnit_WEC2013_vs110.vcxproj

@@ -26,11 +26,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup/>
   <ItemGroup>

CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{5068bf7a-e3f9-4b5b-81a6-bf6c73715c19}</UniqueIdentifier>
+      <UniqueIdentifier>{08afbb4d-aed2-4396-b5a2-fa89e561035f}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{bdf568a1-2f3b-4ee0-ba60-f453c50a1977}</UniqueIdentifier>
+      <UniqueIdentifier>{5bbe914e-d4a9-4a61-9d15-dd4d7a5ec314}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_WEC2013_vs120.vcxproj

@@ -26,11 +26,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup/>
   <ItemGroup>

CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{7ff65f52-aacb-41be-a14f-08e3abe42247}</UniqueIdentifier>
+      <UniqueIdentifier>{ec490e01-dc0a-4e7e-aa6c-6c8d3ffa9868}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{402d14bd-2120-42c2-bcdd-1f2e1d3e77cd}</UniqueIdentifier>
+      <UniqueIdentifier>{813d33b0-17fd-414c-be83-2de23d4d8c7b}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\CppUnit\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <ClCompile>
@@ -192,7 +192,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmtd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -218,7 +219,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmt.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -235,7 +237,7 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -243,7 +245,8 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmdd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -271,7 +274,7 @@
     </ClCompile>
     <Lib>
       <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_vs100.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{c1387c65-ac26-4385-bc07-a168aceff7dd}</UniqueIdentifier>
+      <UniqueIdentifier>{77b1dd2b-23d6-43d3-bd4d-dacc38f051f4}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{e9bba7e5-dbf4-476e-9045-ec955d7fd638}</UniqueIdentifier>
+      <UniqueIdentifier>{c0e48999-5726-406a-a695-42b127573db0}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_vs110.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{dc6bdd9f-52ec-4d7a-b5ac-3e937dc94b79}</UniqueIdentifier>
+      <UniqueIdentifier>{c131efed-ff99-4edf-970c-6168c03d21e7}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{01ac17bd-90ef-4154-a30a-968ae65c19fe}</UniqueIdentifier>
+      <UniqueIdentifier>{7867e234-8c4c-42b6-a1da-71be15b3314b}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs120.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_vs120.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{9bedd994-f514-4478-a961-61d76b24983d}</UniqueIdentifier>
+      <UniqueIdentifier>{7de7449c-558b-4c8f-84df-22f3c123e5b4}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{4df2bafe-a87c-46c6-9b2b-fbedbb52a416}</UniqueIdentifier>
+      <UniqueIdentifier>{09162ecb-b60d-474a-a3fe-ff12ff95e381}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs140.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_vs140.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{5e0763e0-80b2-4c07-99ca-adb783b8ef87}</UniqueIdentifier>
+      <UniqueIdentifier>{7346a666-f2f4-444f-9e22-2a39eeed86d1}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{4ca676c2-95bb-4610-87a7-559295f0c313}</UniqueIdentifier>
+      <UniqueIdentifier>{090d05e8-258d-413f-813e-1e701cddbbe5}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs150.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppUnitd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCppUnit</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -200,7 +200,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -224,7 +224,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -241,13 +241,13 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -272,7 +272,7 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCppUnitMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_vs150.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{ea13b8c9-03c8-4651-8d7b-f5ac04f481cf}</UniqueIdentifier>
+      <UniqueIdentifier>{158a00d5-a3e3-4bdf-acad-a12c3f1f49eb}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{3bb62e45-30ce-4ff7-ab69-684fe0460244}</UniqueIdentifier>
+      <UniqueIdentifier>{86da2e9d-0458-4d58-b1b9-b5a30830ef3a}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_vs90.vcproj

@@ -1,35 +1,46 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	Name="CppUnit"
-	Version="9.00"
 	ProjectType="Visual C++"
+	Version="9.00"
+	Name="CppUnit"
 	ProjectGUID="{138BB448-808A-4FE5-A66D-78D1F8770F59}"
 	RootNamespace="CppUnit"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
-	<ToolFiles/>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="0"
 				AdditionalIncludeDirectories=".\include;..\Foundation\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;POCO_NO_AUTOMATIC_LIBS;CppUnit_EXPORTS"
@@ -47,59 +58,77 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalOptions=""
+				AdditionalDependencies=""
 				OutputFile="..\bin\PocoCppUnitd.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\bin\PocoCppUnitd.pdb"
-				AdditionalLibraryDirectories="..\lib"
 				SubSystem="1"
 				ImportLibrary="..\lib\PocoCppUnitd.lib"
 				TargetMachine="1"
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCManifestTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="release_shared|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="2"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="4"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
@@ -119,60 +148,78 @@
 				DebugInformationFormat="0"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalOptions=""
+				AdditionalDependencies=""
 				OutputFile="..\bin\PocoCppUnit.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				GenerateDebugInformation="false"
 				AdditionalLibraryDirectories="..\lib"
+				GenerateDebugInformation="false"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="..\lib\PocoCppUnit.lib"
 				TargetMachine="1"
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCManifestTool"/>
+				Name="VCManifestTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCAppVerifierTool"/>
+				Name="VCAppVerifierTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="debug_static_mt|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="0"
 				AdditionalIncludeDirectories=".\include;..\Foundation\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS"
@@ -185,51 +232,67 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCppUnitmtd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCppUnitMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppUnitmtd.lib"/>
+				OutputFile="..\lib\PocoCppUnitMTd.lib"
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="release_static_mt|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="4"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
@@ -249,45 +312,61 @@
 				DebugInformationFormat="0"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppUnitmt.lib"/>
+				OutputFile="..\lib\PocoCppUnitMT.lib"
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="debug_static_md|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="0"
 				AdditionalIncludeDirectories=".\include;..\Foundation\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;POCO_NO_AUTOMATIC_LIBS"
@@ -300,51 +379,67 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCppUnitmdd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCppUnitMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppUnitmdd.lib"/>
+				OutputFile="..\lib\PocoCppUnitMDd.lib"
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 		<Configuration
 			Name="release_static_md|Win32"
 			OutputDirectory="obj\$(ConfigurationName)"
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="4"
-			CharacterSet="2">
+			CharacterSet="2"
+			>
 			<Tool
-				Name="VCPreBuildEventTool"/>
+				Name="VCPreBuildEventTool"
+			/>
 			<Tool
-				Name="VCCustomBuildTool"/>
+				Name="VCCustomBuildTool"
+			/>
 			<Tool
-				Name="VCXMLDataGeneratorTool"/>
+				Name="VCXMLDataGeneratorTool"
+			/>
 			<Tool
-				Name="VCWebServiceProxyGeneratorTool"/>
+				Name="VCWebServiceProxyGeneratorTool"
+			/>
 			<Tool
-				Name="VCMIDLTool"/>
+				Name="VCMIDLTool"
+			/>
 			<Tool
 				Name="VCCLCompilerTool"
+				AdditionalOptions=""
 				Optimization="4"
 				InlineFunctionExpansion="1"
 				EnableIntrinsicFunctions="true"
@@ -364,86 +459,147 @@
 				DebugInformationFormat="0"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-				AdditionalOptions=""/>
+			/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"/>
+				Name="VCManagedResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCResourceCompilerTool"/>
+				Name="VCResourceCompilerTool"
+			/>
 			<Tool
-				Name="VCPreLinkEventTool"/>
+				Name="VCPreLinkEventTool"
+			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCppUnitmd.lib"/>
+				OutputFile="..\lib\PocoCppUnitMD.lib"
+			/>
 			<Tool
-				Name="VCALinkTool"/>
+				Name="VCALinkTool"
+			/>
 			<Tool
-				Name="VCXDCMakeTool"/>
+				Name="VCXDCMakeTool"
+			/>
 			<Tool
-				Name="VCBscMakeTool"/>
+				Name="VCBscMakeTool"
+			/>
 			<Tool
-				Name="VCFxCopTool"/>
+				Name="VCFxCopTool"
+			/>
 			<Tool
-				Name="VCPostBuildEventTool"/>
+				Name="VCPostBuildEventTool"
+			/>
 		</Configuration>
 	</Configurations>
-	<References/>
+	<References>
+	</References>
 	<Files>
 		<Filter
 			Name="Source Files"
-			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
+			Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat"
+			>
 			<File
-				RelativePath=".\src\CppUnitException.cpp"/>
+				RelativePath=".\src\CppUnitException.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TestCase.cpp"/>
+				RelativePath="src\TestCase.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TestDecorator.cpp"/>
+				RelativePath="src\TestDecorator.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TestFailure.cpp"/>
+				RelativePath="src\TestFailure.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TestResult.cpp"/>
+				RelativePath="src\TestResult.cpp"
+				>
+			</File>
 			<File
-				RelativePath=".\src\TestRunner.cpp"/>
+				RelativePath=".\src\TestRunner.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TestSuite.cpp"/>
+				RelativePath="src\TestSuite.cpp"
+				>
+			</File>
 			<File
-				RelativePath="src\TextTestResult.cpp"/>
+				RelativePath="src\TextTestResult.cpp"
+				>
+			</File>
 		</Filter>
 		<Filter
 			Name="Include Files"
-			Filter="*.h">
+			Filter="*.h"
+			>
 			<File
-				RelativePath=".\include\CppUnit\CppUnit.h"/>
+				RelativePath=".\include\CppUnit\CppUnit.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\CppUnitException.h"/>
+				RelativePath=".\include\CppUnit\CppUnitException.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\estring.h"/>
+				RelativePath=".\include\CppUnit\estring.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\Guards.h"/>
+				RelativePath=".\include\CppUnit\Guards.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\Orthodox.h"/>
+				RelativePath=".\include\CppUnit\Orthodox.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\RepeatedTest.h"/>
+				RelativePath=".\include\CppUnit\RepeatedTest.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\Test.h"/>
+				RelativePath=".\include\CppUnit\Test.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestCaller.h"/>
+				RelativePath=".\include\CppUnit\TestCaller.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestCase.h"/>
+				RelativePath=".\include\CppUnit\TestCase.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestDecorator.h"/>
+				RelativePath=".\include\CppUnit\TestDecorator.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestFailure.h"/>
+				RelativePath=".\include\CppUnit\TestFailure.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestResult.h"/>
+				RelativePath=".\include\CppUnit\TestResult.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestRunner.h"/>
+				RelativePath=".\include\CppUnit\TestRunner.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestSetup.h"/>
+				RelativePath=".\include\CppUnit\TestSetup.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TestSuite.h"/>
+				RelativePath=".\include\CppUnit\TestSuite.h"
+				>
+			</File>
 			<File
-				RelativePath=".\include\CppUnit\TextTestResult.h"/>
+				RelativePath=".\include\CppUnit\TextTestResult.h"
+				>
+			</File>
 		</Filter>
 	</Files>
-	<Globals/>
+	<Globals>
+	</Globals>
 </VisualStudioProject>

CppUnit/CppUnit_x64_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\CppUnit\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <ClCompile>
@@ -192,7 +192,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmtd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppUnitMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -218,7 +220,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmt.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppUnitMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -235,7 +239,7 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -243,7 +247,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmdd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppUnitMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -269,7 +275,9 @@
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmd.lib</OutputFile>
+      <AdditionalDependencies>%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCppUnitMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_x64_vs100.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{b27f67de-af6f-4c4e-b126-877d373bc66b}</UniqueIdentifier>
+      <UniqueIdentifier>{e741377c-4d05-4576-a1ef-10445a3e501f}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{2dcafb5d-0650-44a9-aaee-b4b717d80180}</UniqueIdentifier>
+      <UniqueIdentifier>{11b1e717-1573-4092-9f67-63d6d9dacb1a}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_x64_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_x64_vs110.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{f848470e-6c13-4424-a4bd-64c8235ac88a}</UniqueIdentifier>
+      <UniqueIdentifier>{75fc7ff0-9a33-47e6-92b1-8be7059a5646}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{4edfde9d-f960-4343-9c8c-78334d60fab2}</UniqueIdentifier>
+      <UniqueIdentifier>{eb0853ab-e67f-404b-adf2-327a90a33506}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_x64_vs120.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_x64_vs120.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{f05a4ed2-2720-4c63-b6e2-0e0fc1c9547b}</UniqueIdentifier>
+      <UniqueIdentifier>{e9dfc58a-9503-4e32-a448-285ef17b1b54}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{5c594ed2-ab6c-41b1-8def-b77591e54dfa}</UniqueIdentifier>
+      <UniqueIdentifier>{0995ca0c-cd55-43e4-b440-df648b0e689f}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_x64_vs140.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_x64_vs140.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{38b4f1a7-f6c4-456a-ba2b-669fcb2d8c1e}</UniqueIdentifier>
+      <UniqueIdentifier>{2541f91f-819e-43d0-9a34-9c342aab7cf9}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{44179780-6c7b-40ce-9087-348dcb717cad}</UniqueIdentifier>
+      <UniqueIdentifier>{bd494a04-d57a-45f7-9db1-743970cc7be1}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_x64_vs150.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCppUnit64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitmdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitmtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCppUnitMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCppUnitMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCppUnit64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitmd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitmt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCppUnitMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCppUnitMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -200,7 +200,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -224,7 +225,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -241,13 +243,14 @@
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCppUnitMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -271,7 +274,8 @@
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCppUnitmd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCppUnitMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

CppUnit/CppUnit_x64_vs150.vcxproj.filters

@@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{02e6adf3-c6ba-40fa-ab87-b1c0d2cf0710}</UniqueIdentifier>
+      <UniqueIdentifier>{27c95e03-1d9b-4e68-8eb3-e3dcd7751aea}</UniqueIdentifier>
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
     </Filter>
     <Filter Include="Include Files">
-      <UniqueIdentifier>{970a5156-f1e4-4bb7-91b1-01a85cde02f3}</UniqueIdentifier>
+      <UniqueIdentifier>{4186157c-c891-4997-8c07-1db9c572793c}</UniqueIdentifier>
       <Extensions>*.h</Extensions>
     </Filter>
   </ItemGroup>

CppUnit/CppUnit_x64_vs90.vcproj

@@ -56,7 +56,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoCppUnit64d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
@@ -128,7 +128,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalDependencies="Iphlpapi.lib"
+				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoCppUnit64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
@@ -186,7 +186,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCppUnitmtd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCppUnitMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -201,7 +201,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppUnitmtd.lib"
+				OutputFile="..\lib64\PocoCppUnitMTd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -260,7 +260,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppUnitmt.lib"
+				OutputFile="..\lib64\PocoCppUnitMT.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -303,7 +303,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCppUnitmdd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCppUnitMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -318,7 +318,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppUnitmdd.lib"
+				OutputFile="..\lib64\PocoCppUnitMDd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -377,7 +377,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCppUnitmd.lib"
+				OutputFile="..\lib64\PocoCppUnitMD.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>

Crypto/Crypto_CE_VS90.vcproj

@@ -201,7 +201,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptomtd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptoMTd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -217,7 +217,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCryptomtd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCryptoMTd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -284,7 +284,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCryptomt.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCryptoMT.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -334,7 +334,7 @@
 				BufferSecurityCheck="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptomdd.pdb"
+				ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptoMDd.pdb"
 				WarningLevel="3"
 				DebugInformationFormat="3"
 				CompileAs="0"
@@ -350,7 +350,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCryptomdd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCryptoMDd.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool
@@ -417,7 +417,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\$(PlatformName)\PocoCryptomd.lib"/>
+				OutputFile="..\lib\$(PlatformName)\PocoCryptoMD.lib"/>
 			<Tool
 				Name="VCALinkTool"/>
 			<Tool

Crypto/Crypto_VS90.vcproj

@@ -235,7 +235,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCryptomtd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCryptoMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -253,7 +253,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCryptomtd.lib"
+				OutputFile="..\lib\PocoCryptoMTd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -328,7 +328,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCryptomt.lib"
+				OutputFile="..\lib\PocoCryptoMT.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -384,7 +384,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib\PocoCryptomdd.pdb"
+				ProgramDataBaseFileName="..\lib\PocoCryptoMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -402,7 +402,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCryptomdd.lib"
+				OutputFile="..\lib\PocoCryptoMDd.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"
@@ -477,7 +477,7 @@
 			/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib\PocoCryptomd.lib"
+				OutputFile="..\lib\PocoCryptoMD.lib"
 			/>
 			<Tool
 				Name="VCALinkTool"

Crypto/Crypto_WEC2013_vs110.vcxproj

@@ -41,11 +41,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V300'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V300'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V300'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V300'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup/>
   <ItemGroup>

Crypto/Crypto_WEC2013_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{52bb1c07-0123-4d4b-a865-972edee36722}</UniqueIdentifier>
+      <UniqueIdentifier>{bd2595ba-dad3-4d2c-83b6-d4ca776dc006}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{31e969ac-36b0-418a-bd14-accd7e08ed11}</UniqueIdentifier>
+      <UniqueIdentifier>{90679fee-968a-4e5b-b9b8-c7cf1ce12eba}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{27741481-3aaf-4c1b-aabc-c1a2d32d7cf1}</UniqueIdentifier>
+      <UniqueIdentifier>{7308f9da-8f1f-4c23-a962-3d7ad12ee789}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{32596489-b14d-452c-a7eb-75e61e185a64}</UniqueIdentifier>
+      <UniqueIdentifier>{fea1f359-cceb-4ce1-b26d-98525e7b903a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{c1481ba9-ef59-405a-a98f-886317fe5add}</UniqueIdentifier>
+      <UniqueIdentifier>{070ff7f5-97e8-4fdf-8fed-417d565a5eec}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{a0382ae9-023c-4255-9ddb-c68ef7d10b76}</UniqueIdentifier>
+      <UniqueIdentifier>{c03ae187-78bf-4f57-91d7-e6e455df1b3b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{d5e3f158-b1df-4f77-8c1e-28f3de00a5ec}</UniqueIdentifier>
+      <UniqueIdentifier>{eb7f57af-d6ba-4a87-af1d-79c16af4a004}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{31d45802-cfba-41ea-b431-259ee2b2670c}</UniqueIdentifier>
+      <UniqueIdentifier>{01c5a56f-455c-4d7e-b57b-1f3a97cf14e3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{59aec99a-3482-4837-8e27-5c54472b532e}</UniqueIdentifier>
+      <UniqueIdentifier>{cd426bb5-8034-4e52-896f-3878557107e5}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{bb2b0746-80fe-4ec8-9ae1-549ac7858c12}</UniqueIdentifier>
+      <UniqueIdentifier>{4360a4a8-0114-4f40-aab1-c50149bcb8a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{0183a41c-99b5-405b-95ed-34088095ed92}</UniqueIdentifier>
+      <UniqueIdentifier>{f8fc0ac0-b495-4953-b05c-63373fd0e5f6}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{04d9f7ea-b8cc-40a6-89e4-1e3ffbc042bb}</UniqueIdentifier>
+      <UniqueIdentifier>{2ad97b79-3fe7-4096-86cc-206c42965b89}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{4446f563-5337-4b3c-9c5c-1d0111a78726}</UniqueIdentifier>
+      <UniqueIdentifier>{835af9cc-0a52-4112-8400-4f23a42d9629}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{93b6e2fd-6373-4cea-a477-9a2221b055f8}</UniqueIdentifier>
+      <UniqueIdentifier>{67518be8-5575-4310-a8dc-2abe3ff90c02}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{ae040b15-9d99-4bde-9603-47888c692bf1}</UniqueIdentifier>
+      <UniqueIdentifier>{ceef7475-0614-47a7-b2d1-d1351f64958d}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{d3c021db-071f-47fd-aa29-6ecc60314d96}</UniqueIdentifier>
+      <UniqueIdentifier>{9cf01597-9ef5-466c-a65d-4e1d2c935c2c}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{f5df0fa6-8945-48f2-ad4b-b5d491c6926a}</UniqueIdentifier>
+      <UniqueIdentifier>{2a7a2512-1135-42f2-9a12-0270e2fde076}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{157f6fca-8ffe-4dbd-8e93-ea0edc418d7b}</UniqueIdentifier>
+      <UniqueIdentifier>{411086fb-01bc-429d-aad2-4a7dce8234c2}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_WEC2013_vs120.vcxproj

@@ -6,24 +6,24 @@
     <ClInclude Include="include\Poco\Crypto\CipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKey.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
+    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoStream.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoTransform.h"/>
+    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
+    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\RSACipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\RSADigestEngine.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKey.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKeyImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\X509Certificate.h"/>
-    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
-    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
-    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
-    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectName>Crypto</ProjectName>
@@ -39,13 +39,13 @@
   <ImportGroup Label="ExtensionSettings"/>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|SDK_AM335X_SK_WEC2013_V310'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|SDK_AM335X_SK_WEC2013_V310'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|SDK_AM335X_SK_WEC2013_V310'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|SDK_AM335X_SK_WEC2013_V310'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup/>
   <ItemGroup>
@@ -54,23 +54,23 @@
     <ClCompile Include="src\CipherImpl.cpp"/>
     <ClCompile Include="src\CipherKey.cpp"/>
     <ClCompile Include="src\CipherKeyImpl.cpp"/>
+    <ClCompile Include="src\CryptoException.cpp"/>
     <ClCompile Include="src\CryptoStream.cpp"/>
     <ClCompile Include="src\CryptoTransform.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
+    <ClCompile Include="src\ECKey.cpp"/>
+    <ClCompile Include="src\ECKeyImpl.cpp"/>
+    <ClCompile Include="src\EVPPKey.cpp"/>
+    <ClCompile Include="src\KeyPair.cpp"/>
+    <ClCompile Include="src\KeyPairImpl.cpp"/>
+    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
+    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\RSACipherImpl.cpp"/>
     <ClCompile Include="src\RSADigestEngine.cpp"/>
     <ClCompile Include="src\RSAKey.cpp"/>
     <ClCompile Include="src\RSAKeyImpl.cpp"/>
-    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\X509Certificate.cpp"/>
-    <ClCompile Include="src\CryptoException.cpp"/>
-    <ClCompile Include="src\EVPPKey.cpp"/>
-    <ClCompile Include="src\KeyPair.cpp"/>
-    <ClCompile Include="src\KeyPairImpl.cpp"/>
-    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
-    <ClCompile Include="src\DigestEngine.cpp"/>
-    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
-    <ClCompile Include="src\ECKey.cpp"/>
-    <ClCompile Include="src\ECKeyImpl.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc"/>

Crypto/Crypto_WEC2013_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{e45ec053-cca3-4a79-8175-33f573c34cea}</UniqueIdentifier>
+      <UniqueIdentifier>{6669ffe8-45fa-471f-b372-26c35af9113a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{1ee823f3-ec90-4f2b-b716-fd77409e31e6}</UniqueIdentifier>
+      <UniqueIdentifier>{5c50ef69-7554-4875-8383-e2deaa4a9d89}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{3cd5a7b7-18a2-4bb9-a142-4f9e1bb7974d}</UniqueIdentifier>
+      <UniqueIdentifier>{98791313-af05-49be-9b54-6c3755cf8af5}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{eaa74ab9-2fef-49bb-bbc0-445d2a535ba1}</UniqueIdentifier>
+      <UniqueIdentifier>{7b896f47-d630-4469-aaeb-d168b981d33b}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{6738ec6f-45d0-4601-9ee8-d6afb75b1b50}</UniqueIdentifier>
+      <UniqueIdentifier>{7e4e8388-f396-4630-acc6-535e2d80ca49}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{9a55b152-e285-465f-a49c-0ebcbf0fc259}</UniqueIdentifier>
+      <UniqueIdentifier>{c978a415-f72e-4dac-ad60-157fb89cadb3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{62e7c920-2331-4bce-8577-5baaf4869ca4}</UniqueIdentifier>
+      <UniqueIdentifier>{ef269604-df1c-457a-bdeb-39eab19d0a3e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{d0990178-9b62-432b-b1b0-52e00aad4eed}</UniqueIdentifier>
+      <UniqueIdentifier>{6cf10b0f-8ca0-4cf6-84ef-a7e068939344}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{5afde061-0635-4ee5-bb37-49373abb8047}</UniqueIdentifier>
+      <UniqueIdentifier>{775fa246-f00e-49ab-aac9-eb2ea19bb320}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{7dd2ac5e-077e-4d46-9ed6-9e027e249177}</UniqueIdentifier>
+      <UniqueIdentifier>{dba93d19-3c18-4692-9773-23a7afda9461}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{0e5bb8da-d3ad-466d-9401-ecbbfc368736}</UniqueIdentifier>
+      <UniqueIdentifier>{27a1bbce-16b1-4c77-9d9d-21e42b65ea2b}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{f0a0d9e9-a7a9-405b-9d5d-bc9e8dc20c88}</UniqueIdentifier>
+      <UniqueIdentifier>{ace36cc6-db13-4555-93e0-a17dbd7ee689}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{0fb3924f-abaf-4684-861a-2ac829f6a4eb}</UniqueIdentifier>
+      <UniqueIdentifier>{4f97a4ef-9c18-4815-9948-d6f0c3519390}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{662bd85d-7bc0-4b25-886a-5871a40c86a1}</UniqueIdentifier>
+      <UniqueIdentifier>{78eb4565-ff99-4dc4-b1ef-bb787625319d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{be859ee4-5319-447d-be53-649a16f1efec}</UniqueIdentifier>
+      <UniqueIdentifier>{cf1b0935-5ba9-404b-bc45-a766af1f668e}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{ec747982-0297-414a-a843-306e09dbffd8}</UniqueIdentifier>
+      <UniqueIdentifier>{7a0150b0-5cf3-406b-b0d6-4e3d8a3e756c}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{b7ba2bdd-d975-48f6-9a3d-322d9d8ef6d2}</UniqueIdentifier>
+      <UniqueIdentifier>{cfe6c8b6-d883-42f3-9bd4-061d5718ffba}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{68842c89-396c-434f-b488-3843884e3c2d}</UniqueIdentifier>
+      <UniqueIdentifier>{a87a956c-8b72-4ef1-a6c7-6c3524b7ebe4}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">..\lib\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\Crypto\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <PreBuildEvent>
@@ -208,7 +208,8 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCryptoMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -238,7 +239,8 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCryptoMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -261,7 +263,7 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -269,7 +271,8 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib\PocoCryptoMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -302,7 +305,7 @@ exit 0</Command>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{a977af9e-1bac-4b93-bf5c-c4ec4336c136}</UniqueIdentifier>
+      <UniqueIdentifier>{6dd81731-f0b6-41d2-aeac-b14efc941c32}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{fab3ca62-e839-4b6c-aa0f-c4b3f427598e}</UniqueIdentifier>
+      <UniqueIdentifier>{919476d3-1a26-4da5-b74b-926762c6f4d4}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{86cb5ae4-5b64-466e-9764-bcd6f8c94973}</UniqueIdentifier>
+      <UniqueIdentifier>{0dabc76b-f8fb-48c1-9cd2-3599f17fb6d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{f962d40a-4a1d-4fee-910e-a55e6fb07d04}</UniqueIdentifier>
+      <UniqueIdentifier>{903714b9-414e-44a7-a620-cb6b32ad7ed3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{77a658e6-c5e9-43a8-a712-7711465d0e6e}</UniqueIdentifier>
+      <UniqueIdentifier>{5fc10cb2-e486-4e0e-9802-d34d3fa49880}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{92be13a7-e1cd-441a-af3f-2213de352df9}</UniqueIdentifier>
+      <UniqueIdentifier>{75819d8a-22fa-47ec-8500-4f09874293ef}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{2f013d91-b647-47c0-9b16-166f34d6e07e}</UniqueIdentifier>
+      <UniqueIdentifier>{59af2894-edf3-4b61-8849-8dc469beca58}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{1ab44f5d-3842-4534-bba5-e99c03ec8b31}</UniqueIdentifier>
+      <UniqueIdentifier>{3fec5ec6-4c78-4f6f-add5-045b0cd7691a}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{d7a265f0-8e93-48ca-9077-62e306cefa03}</UniqueIdentifier>
+      <UniqueIdentifier>{f01655c0-8778-44f8-b7a8-d0b487c1b6cc}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{97818cfb-3c5a-404e-b3cf-946ff4a42fc5}</UniqueIdentifier>
+      <UniqueIdentifier>{f4bef4ec-3ead-44ac-942e-aa3cc16a49ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{cbf07881-058d-430d-a131-b82bad353d6d}</UniqueIdentifier>
+      <UniqueIdentifier>{eaf229a5-ea4a-4557-bc36-641f3c50d395}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{8b6d93ad-d49c-4967-a3e8-904ff2ffcd5f}</UniqueIdentifier>
+      <UniqueIdentifier>{1aa37bcc-3a3a-4063-b530-5c3e0eaa9852}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{c4673106-d048-4fea-9f0a-3e5d9046f7b8}</UniqueIdentifier>
+      <UniqueIdentifier>{ae05cb0f-a978-41ce-b64a-500f74247bae}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{b84c5c96-499f-42b7-93c2-6aaccdd6b41d}</UniqueIdentifier>
+      <UniqueIdentifier>{da23243b-d6a7-407e-b314-ad316b6c8b74}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{d71d4744-074c-43d4-9285-98d5b8cc8f33}</UniqueIdentifier>
+      <UniqueIdentifier>{2a3dab90-0528-4749-816f-409dfe0a1d6a}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{a23bc548-a67b-4bbe-8d0d-a874fe85e556}</UniqueIdentifier>
+      <UniqueIdentifier>{0893fce9-adf8-4452-b55b-37c239798e45}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{18d042a9-4ff8-46a4-8c7f-78ec4a2aeaef}</UniqueIdentifier>
+      <UniqueIdentifier>{32d0126a-593a-42b7-b207-28a2a0bdc36a}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{98146d05-6b2b-4e70-a58d-5a3cb0612b0a}</UniqueIdentifier>
+      <UniqueIdentifier>{ad1aedcc-32d5-4091-b87e-b47c5729e53a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -218,7 +218,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -246,7 +246,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -269,13 +269,13 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -306,7 +306,7 @@ exit 0</Command>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{0707f04b-926c-40e9-bb29-7c375b19f825}</UniqueIdentifier>
+      <UniqueIdentifier>{1f3b32fe-06b3-42f1-b862-2f7e93bb2008}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{cabd421d-fb63-4995-bfad-1431a4c74a10}</UniqueIdentifier>
+      <UniqueIdentifier>{c21e7b9d-6bec-4ff2-b11d-787062233953}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{69b0240e-fa49-4236-9ba1-9531cd8f4a90}</UniqueIdentifier>
+      <UniqueIdentifier>{a9732f8a-5898-451f-903e-12e990d1f818}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{0fd96c3b-6595-4969-8d49-397e0c7229f7}</UniqueIdentifier>
+      <UniqueIdentifier>{1c604635-a4fd-4e6b-b8d8-44e770d76bd5}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{e4235854-697b-4de0-8f88-f1b87b820cc4}</UniqueIdentifier>
+      <UniqueIdentifier>{bd6a84db-f15d-4019-a010-6da5aed7424a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{663012ce-b771-4112-a74c-356594d52bce}</UniqueIdentifier>
+      <UniqueIdentifier>{399e3401-5d51-41af-af01-ef400ff552f5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{c58ffd91-543d-4086-8cd9-3fe51da9c2f8}</UniqueIdentifier>
+      <UniqueIdentifier>{8fa9be54-03d8-4bd3-b455-f363698c1d38}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{b33cd251-ff70-43e4-b12d-a6d1966e4f6f}</UniqueIdentifier>
+      <UniqueIdentifier>{2cfecbac-4388-4460-9c3f-db096dcc6b32}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{9ec6eced-eab2-412b-8cbf-82235b8718f4}</UniqueIdentifier>
+      <UniqueIdentifier>{6ba56e2c-fb5e-4000-b8ee-e278559f3f7b}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{0570468f-f298-4bf4-a031-c10f06e52995}</UniqueIdentifier>
+      <UniqueIdentifier>{53f9adbc-ed7c-4e35-b070-18e0692e265f}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{fca6f3f2-7afb-433c-afc7-a20690ff50f9}</UniqueIdentifier>
+      <UniqueIdentifier>{5f79920e-1c5f-4ef4-a48c-80a8a144afd9}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{a818f0fd-24f9-4ba2-bea5-1edb0a6b6d4e}</UniqueIdentifier>
+      <UniqueIdentifier>{20693de3-adec-4500-8ee7-d9f508694bb1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{7d9e0ed8-e804-4b3c-a810-06b8d4fe56ad}</UniqueIdentifier>
+      <UniqueIdentifier>{98132ebd-a31d-4afc-905d-2dcce210c785}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{8c538cf5-06e5-449f-977e-41ef5d52538a}</UniqueIdentifier>
+      <UniqueIdentifier>{6307bd54-0fa6-4243-ac82-272aa9031345}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{b599d6db-86a6-43af-a284-b53dda015875}</UniqueIdentifier>
+      <UniqueIdentifier>{4de69e4e-5058-499f-9982-a362d57efd80}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{5ddfc64c-cf0c-45d0-a6d4-1f56ad3a95b0}</UniqueIdentifier>
+      <UniqueIdentifier>{fb31ca1b-58d1-40cb-9b7a-c29c26db82a5}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{e49b21f4-33c9-457f-843f-ad0690264fb2}</UniqueIdentifier>
+      <UniqueIdentifier>{14778bdd-a8b8-428c-a3ef-a864e6552095}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{72fba5c6-c2da-4a64-b0d3-a0b43f44201c}</UniqueIdentifier>
+      <UniqueIdentifier>{346d4b58-03f7-483b-ad9a-8d0795e01c48}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs120.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -218,7 +218,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -246,7 +246,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -269,13 +269,13 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -306,7 +306,7 @@ exit 0</Command>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -315,24 +315,24 @@ exit 0</Command>
     <ClInclude Include="include\Poco\Crypto\CipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKey.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
+    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoStream.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoTransform.h"/>
+    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
+    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\RSACipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\RSADigestEngine.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKey.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKeyImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\X509Certificate.h"/>
-    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
-    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
-    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
-    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Cipher.cpp"/>
@@ -340,23 +340,23 @@ exit 0</Command>
     <ClCompile Include="src\CipherImpl.cpp"/>
     <ClCompile Include="src\CipherKey.cpp"/>
     <ClCompile Include="src\CipherKeyImpl.cpp"/>
+    <ClCompile Include="src\CryptoException.cpp"/>
     <ClCompile Include="src\CryptoStream.cpp"/>
     <ClCompile Include="src\CryptoTransform.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
+    <ClCompile Include="src\ECKey.cpp"/>
+    <ClCompile Include="src\ECKeyImpl.cpp"/>
+    <ClCompile Include="src\EVPPKey.cpp"/>
+    <ClCompile Include="src\KeyPair.cpp"/>
+    <ClCompile Include="src\KeyPairImpl.cpp"/>
+    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
+    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\RSACipherImpl.cpp"/>
     <ClCompile Include="src\RSADigestEngine.cpp"/>
     <ClCompile Include="src\RSAKey.cpp"/>
     <ClCompile Include="src\RSAKeyImpl.cpp"/>
-    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\X509Certificate.cpp"/>
-    <ClCompile Include="src\CryptoException.cpp"/>
-    <ClCompile Include="src\EVPPKey.cpp"/>
-    <ClCompile Include="src\KeyPair.cpp"/>
-    <ClCompile Include="src\KeyPairImpl.cpp"/>
-    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
-    <ClCompile Include="src\DigestEngine.cpp"/>
-    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
-    <ClCompile Include="src\ECKey.cpp"/>
-    <ClCompile Include="src\ECKeyImpl.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">

Crypto/Crypto_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{3931bea2-66cf-4920-ba6a-326c7ae5b7e7}</UniqueIdentifier>
+      <UniqueIdentifier>{ea97621d-4d55-4af1-a8b3-de4c3c24b922}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{c3b1a20f-48a6-4667-9b2c-4c6e78c9a76f}</UniqueIdentifier>
+      <UniqueIdentifier>{c80d133e-1529-47ab-8aec-bae6440c9159}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{19d80d89-53e5-428c-b9a6-a89f46f67c0f}</UniqueIdentifier>
+      <UniqueIdentifier>{d011f077-99a8-419e-bb0a-e86a8f8509a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{732e1ee7-339f-4643-823a-03225c19c472}</UniqueIdentifier>
+      <UniqueIdentifier>{3b706b58-6a64-4257-b8f7-dbba732e8b9d}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{738ab6ed-4d25-45f3-affa-7923c359433f}</UniqueIdentifier>
+      <UniqueIdentifier>{e96cd875-c31c-4f5e-b0bb-93732108025b}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{03dfc2e9-6221-4649-854f-bfa5d462bc2d}</UniqueIdentifier>
+      <UniqueIdentifier>{24efcbc0-09d6-45c3-a4f5-4034a52bcbfc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{255eaddd-972d-4bdb-9d0f-f9781db59297}</UniqueIdentifier>
+      <UniqueIdentifier>{e61c6d60-4ecd-49b5-896b-f2c38bfd65e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{c68fd959-ec4a-481a-b9b2-6eccfc1c1e95}</UniqueIdentifier>
+      <UniqueIdentifier>{379a477c-1469-4fc8-8427-5ca83eb016b9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{0fa639ee-9bb6-408f-94e8-b115695f2a23}</UniqueIdentifier>
+      <UniqueIdentifier>{b3a871c9-32fb-4d5b-8098-3be4dc046a7c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{ec85d216-0deb-4f38-aa5a-1e1d97661a3c}</UniqueIdentifier>
+      <UniqueIdentifier>{48a48e24-7716-4c27-be32-8e1ad5922e78}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{08e0bf2a-1628-4866-a2f2-0f3d77149ea1}</UniqueIdentifier>
+      <UniqueIdentifier>{a62e53c7-6368-46ae-af02-ceac6b8c8c2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{233c991b-6ad7-41e2-8ad3-f898849e072a}</UniqueIdentifier>
+      <UniqueIdentifier>{16de56d2-7784-416e-bf14-db2b9aadd328}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{e447b31c-8e8e-4410-873f-4d08ea3e6449}</UniqueIdentifier>
+      <UniqueIdentifier>{648717c1-0ea0-4041-be0b-fdc022ec6aca}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{000007ec-80f8-4fe3-aa46-eae6e4a60b82}</UniqueIdentifier>
+      <UniqueIdentifier>{0a08b2bf-9623-4b4f-9cac-9a9ed1f8fed9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{1f3cb5dc-984e-46cb-9dd8-7fd5bc7b4287}</UniqueIdentifier>
+      <UniqueIdentifier>{1a3101d3-428b-4cfc-bacd-2c6c0df7a8eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{4d5180db-e285-4119-b5e5-92f9d43b783b}</UniqueIdentifier>
+      <UniqueIdentifier>{eaecf0f5-faf7-4d11-a3c7-d854fef0ffb0}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{ae16be50-c4f8-4339-895f-67d61a58a09b}</UniqueIdentifier>
+      <UniqueIdentifier>{3cdc69eb-1e7e-4b8b-b1c4-fe2212f877c9}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{1b001a04-c9c0-4163-bca9-e09d34b2ddd3}</UniqueIdentifier>
+      <UniqueIdentifier>{37899ba7-a729-41bf-9e79-faba6c9320b3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs140.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -218,7 +218,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -246,7 +246,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -269,13 +269,13 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -306,7 +306,7 @@ exit 0</Command>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_vs140.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{4c50e169-8ef3-4900-8b79-8c2ddc091f8b}</UniqueIdentifier>
+      <UniqueIdentifier>{65e19db7-0654-4832-8999-73681d3ff8c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{9617c1f6-6600-4294-a71a-5c8107f4c2c4}</UniqueIdentifier>
+      <UniqueIdentifier>{95794276-19a2-4c38-aebb-e3d1dd761517}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{ede4c7e4-b31e-4769-a096-568920cba6b8}</UniqueIdentifier>
+      <UniqueIdentifier>{440153a3-4aa9-492f-9fbe-d564a782d735}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{dd118673-399e-4283-94e7-595e3605c5a7}</UniqueIdentifier>
+      <UniqueIdentifier>{8aa982b1-701f-44e0-8104-3123bb08aecb}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{74978693-b0b2-4850-9393-f35f66377108}</UniqueIdentifier>
+      <UniqueIdentifier>{eae15f6a-7d08-4a07-b988-5857715c0c2a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{6833a505-96c1-4b9b-b9d3-a6c189e28df8}</UniqueIdentifier>
+      <UniqueIdentifier>{4c75e24f-553e-4013-8150-c26161eec9dd}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{684a010f-7d52-4b12-8bd3-35f3867577a2}</UniqueIdentifier>
+      <UniqueIdentifier>{2e0a9f83-0066-41fe-9f7d-9cd3cd3a2158}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{c146560c-e0f9-46da-95d7-65006aafdf99}</UniqueIdentifier>
+      <UniqueIdentifier>{3755f2b8-8526-45d0-9817-9f8e367c6bbf}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{765044ed-6cab-4241-b791-f40226637a35}</UniqueIdentifier>
+      <UniqueIdentifier>{dbdee508-5537-4a03-8cc7-326fe61c6ddb}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{cf83236f-1e21-4657-bc3a-8ee015da5b03}</UniqueIdentifier>
+      <UniqueIdentifier>{5512ed02-1a29-4e1c-b6ad-0fd6709f7b8d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{a4b2c506-4140-4f98-b606-35a94051583d}</UniqueIdentifier>
+      <UniqueIdentifier>{a4ce585a-31c0-498f-8439-48cdcb6514e0}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{b2bbe5c4-44ba-49d5-b086-5e723c9cc18b}</UniqueIdentifier>
+      <UniqueIdentifier>{e17103c3-ad90-481d-9856-fe29f4ecf16c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{f502de52-76bc-4f7b-a36b-245c6821a0e4}</UniqueIdentifier>
+      <UniqueIdentifier>{cbbc4c35-acfd-4586-b3b2-e6462c2ad017}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{6774cd98-a457-43cd-8620-00f3195b6cd6}</UniqueIdentifier>
+      <UniqueIdentifier>{61d717d4-943c-4ef1-ae0d-f233d0d89c39}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{b02c4292-e944-4956-b2a8-540f8748d2b1}</UniqueIdentifier>
+      <UniqueIdentifier>{b79307df-4301-4f57-940f-3b0929fc21a7}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{cf5537c5-7e99-4755-8912-09b87ee6a8b9}</UniqueIdentifier>
+      <UniqueIdentifier>{15ab8d44-c058-46dc-abf5-5f1aaccfdf8b}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{79be748b-8c8b-47ab-99de-d9ca3a9eb031}</UniqueIdentifier>
+      <UniqueIdentifier>{ef276345-f447-4863-8a6f-737f83d7d0cd}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{684d4fb6-01da-4e98-9cc1-190543f13c0d}</UniqueIdentifier>
+      <UniqueIdentifier>{d90b8288-53fe-48dc-93fd-9af287e0f95a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_vs150.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.26228.10</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoCrypto</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
     <OutDir>..\bin\</OutDir>
@@ -218,7 +218,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMTd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
@@ -246,7 +246,7 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMT.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
@@ -269,13 +269,13 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMDd.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
@@ -306,7 +306,7 @@ exit 0</Command>
     </ClCompile>
     <Lib>
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>..\lib\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib\PocoCryptoMD.lib</OutputFile>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_vs150.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{b44eee1f-a0b3-4f2d-b354-6ab4c3eee1b9}</UniqueIdentifier>
+      <UniqueIdentifier>{c8cc94f0-1673-44c2-a833-d364c75c2240}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{5fb33f31-2476-473d-a93c-ee375b6bf08d}</UniqueIdentifier>
+      <UniqueIdentifier>{deadfe1c-0120-4a46-ba94-e89ddf0fdb66}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{91357e40-0927-4032-8d4d-00fdbfd8d23a}</UniqueIdentifier>
+      <UniqueIdentifier>{1b9e1c3b-343b-44ef-8a55-876d58d05bc2}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{e11e384f-b3a1-4c55-9334-37937795bf21}</UniqueIdentifier>
+      <UniqueIdentifier>{51982601-f27a-403d-99f1-a5c36f53817a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{6644a355-a77a-47af-af4a-b76c1c03881c}</UniqueIdentifier>
+      <UniqueIdentifier>{4f282496-3419-4563-a90f-d92e42217fd3}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{746c45ba-9012-4d77-b4d7-30949fc8225a}</UniqueIdentifier>
+      <UniqueIdentifier>{32f9f34d-c17b-46ae-83e9-cd2b49060c5f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{ba65a143-78fa-4f78-ba76-78b894ae6c58}</UniqueIdentifier>
+      <UniqueIdentifier>{d12aba4d-4768-4fe2-9aa8-b0cf5d00cc06}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{7ebb18f3-24c5-4ece-bd29-49dbb49e6b02}</UniqueIdentifier>
+      <UniqueIdentifier>{4309ff89-037e-4f63-84b9-70350b1aa698}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{85fcc4c8-bf34-45a8-93c3-871e37c2e42c}</UniqueIdentifier>
+      <UniqueIdentifier>{39a59572-7f56-4a16-839c-d7ea5fabf060}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{63e0ce8d-5396-44b4-a77f-b17d6eeffc35}</UniqueIdentifier>
+      <UniqueIdentifier>{e5b1f82b-8580-468f-9f91-7cc42dc405bf}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{a152fd8d-b268-4df0-a4b7-9cf53f6f5d87}</UniqueIdentifier>
+      <UniqueIdentifier>{2d62b773-64a3-48e2-bbb1-605c932d9dc5}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{35810b4f-8256-4579-9697-8731ddf71b93}</UniqueIdentifier>
+      <UniqueIdentifier>{357eae3e-57f0-46f9-afef-119ae29bb1c1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{485b4051-f20d-4c09-9879-deb4ab371c61}</UniqueIdentifier>
+      <UniqueIdentifier>{0efeef7f-564e-4079-8612-47000a2b9bdc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{b65c7f07-16a4-4493-a337-4f30a1b22675}</UniqueIdentifier>
+      <UniqueIdentifier>{1669ec1e-276f-4564-a788-6b1b84475eea}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{191ad27b-d600-4de3-965d-488cf95737d9}</UniqueIdentifier>
+      <UniqueIdentifier>{42f92b16-a0a3-4691-8723-0cb7689a2417}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{b2c4b7b2-5aea-4fbd-8feb-a26a54b57f7f}</UniqueIdentifier>
+      <UniqueIdentifier>{7b4a9de5-5c00-48dd-b814-16505f906e17}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{33491ad2-a1dd-45df-92a5-130d10eab832}</UniqueIdentifier>
+      <UniqueIdentifier>{77def7ea-3db6-4d99-8535-e9bece23e868}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{a353a708-9f9e-4849-8989-14394eff38a1}</UniqueIdentifier>
+      <UniqueIdentifier>{46b86faa-e436-4b18-bae4-1536ac17e09f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs100.vcxproj

@@ -95,11 +95,11 @@
     <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">..\lib64\</OutDir>
     <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">obj64\Crypto\$(Configuration)\</IntDir>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCrypto64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCrypto64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <PreBuildEvent>
@@ -208,7 +208,9 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCryptoMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -238,7 +240,9 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCryptoMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -261,7 +265,7 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
@@ -269,7 +273,9 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCryptoMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -300,7 +306,9 @@ exit 0</Command>
       <AdditionalOptions>%(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>..\lib64\PocoCryptoMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs100.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{8688bbed-e99f-4a47-8651-ee0d89090e99}</UniqueIdentifier>
+      <UniqueIdentifier>{72425694-8241-4b95-815b-ce622e03fb7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{d2df6231-23a1-42ae-ad27-7f24ffc5b2cb}</UniqueIdentifier>
+      <UniqueIdentifier>{8d402b7a-b24d-4d2c-ae6f-fb57e760b00c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{9403b794-5192-41a9-bcc8-a2ebd2d1c3df}</UniqueIdentifier>
+      <UniqueIdentifier>{bc46d46e-b402-482c-99e4-86bed97f2161}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{67fdc986-b33f-47b5-8d21-eb77f9347c3a}</UniqueIdentifier>
+      <UniqueIdentifier>{9fce84dc-3de8-49e2-a364-5b15b8f3fd98}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{9443f4aa-9000-4e8f-a144-20c995f3c01b}</UniqueIdentifier>
+      <UniqueIdentifier>{a1e15714-6aab-4bc7-add1-0324baff4415}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{3292af88-e6cf-49dd-bc3b-a897ee34f8c5}</UniqueIdentifier>
+      <UniqueIdentifier>{92e3de94-89c8-4963-83f7-581e686e5dff}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{9b5fc6c7-710b-484a-8dee-0b2fcd2c2797}</UniqueIdentifier>
+      <UniqueIdentifier>{48abe959-ec9f-46bf-bc62-4764310474c0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{ceaa56ae-49c8-45de-96d8-c23b0d2cf653}</UniqueIdentifier>
+      <UniqueIdentifier>{f0652cb5-2ac9-4b8a-b1d0-921ea5032746}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{56f57a2a-fbf8-433c-b3ac-837b89d17dca}</UniqueIdentifier>
+      <UniqueIdentifier>{e7c967de-92dd-47f9-bd51-794ba7a9b8b2}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{d06b995b-226c-4400-836a-81d994acd332}</UniqueIdentifier>
+      <UniqueIdentifier>{43054b0b-501d-458a-ac94-6617b6f0de09}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{3ee43923-139a-4e6d-b6fe-91dcf2c7551b}</UniqueIdentifier>
+      <UniqueIdentifier>{e8a86b45-7d3b-420e-9646-7bb27f2be564}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{79bfb876-270d-4915-84c2-cbecc29f8a0d}</UniqueIdentifier>
+      <UniqueIdentifier>{d4690d2b-5035-4356-ba4a-3b03d445607b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{857507e1-433e-457f-bc0c-c6fa52572648}</UniqueIdentifier>
+      <UniqueIdentifier>{0748c5a4-5670-4ab2-9911-9c5ba43026f3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{85b30b21-1fc5-4932-b12b-5dfd55f0c251}</UniqueIdentifier>
+      <UniqueIdentifier>{ca026041-e468-4b82-afc8-7fa0981a7561}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{9aa9fb56-961b-4b6f-8b50-73f2276cf7b5}</UniqueIdentifier>
+      <UniqueIdentifier>{3e92b852-ae95-4103-902f-c48322a75c1e}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{116bcfef-9c66-49b3-a2ea-678c22ba3343}</UniqueIdentifier>
+      <UniqueIdentifier>{965f8fe8-70ef-44c3-9449-17c799e75802}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{b366a9fe-1810-440c-b300-1625f14752ce}</UniqueIdentifier>
+      <UniqueIdentifier>{41b93e9a-8cb7-4e56-8262-9ecd90ea06c3}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{882956a6-bb2f-4837-82ad-bba7db405401}</UniqueIdentifier>
+      <UniqueIdentifier>{a0e04724-3885-4e3b-a512-052f6fc398a7}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs110.vcxproj

@@ -87,11 +87,11 @@
   <PropertyGroup>
     <_ProjectFileVersion>11.0.50727.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCrypto64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCrypto64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -218,7 +218,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -246,7 +247,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -269,13 +271,14 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -304,7 +307,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs110.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{8d2d111a-fd95-43de-86b1-2000261b6bad}</UniqueIdentifier>
+      <UniqueIdentifier>{da67e757-041c-4fd9-b1c0-1527613effcc}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{8e879d09-e533-4e66-9290-7b01494e6cae}</UniqueIdentifier>
+      <UniqueIdentifier>{31239e13-50f3-4f51-b632-12a8c3c879ad}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{7671961c-225d-4423-bda5-b9a38c127b7d}</UniqueIdentifier>
+      <UniqueIdentifier>{5e973b8a-dc2b-4c3c-b613-3b1341f6d8db}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{8d7af12e-2b4a-43c1-80c9-dd4f6a30a1bf}</UniqueIdentifier>
+      <UniqueIdentifier>{14e87d55-5d47-427a-92c8-099da90452d6}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{45a9e031-bb57-46d0-a4b4-5c62cbda7cc3}</UniqueIdentifier>
+      <UniqueIdentifier>{1fd1dc4d-1e4d-41b5-8805-70fda5a208ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{dcb3058e-e1c6-423c-bf95-f0934adf9c49}</UniqueIdentifier>
+      <UniqueIdentifier>{149d3e7d-6c3e-4b11-9ab5-8234652836ed}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{b5f9c444-c598-44e4-9817-8cba24356129}</UniqueIdentifier>
+      <UniqueIdentifier>{25e05db3-444d-480e-9c54-e1b99d994c68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{01898f93-b63b-4124-b631-a5d7d9b36b04}</UniqueIdentifier>
+      <UniqueIdentifier>{3c3a9926-00c2-4119-ac15-666bc4f93293}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{438a22cf-3d62-4d16-9319-6d2c54ec0517}</UniqueIdentifier>
+      <UniqueIdentifier>{10f61efc-922c-4354-a8b3-9db8bc8e9a1d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{3938575a-924c-4fcc-9a3b-726b48a860ec}</UniqueIdentifier>
+      <UniqueIdentifier>{3d2b2a84-f9b9-40f6-a355-fda3d853c1b1}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{18e5fde3-28ca-4f1b-86e3-6590f293e652}</UniqueIdentifier>
+      <UniqueIdentifier>{ac4b8a94-34b0-4a3b-9617-f6ac5b364b7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{dbcbeefc-f9cc-4c1f-97f8-171ef463aac5}</UniqueIdentifier>
+      <UniqueIdentifier>{ad990d3c-25df-411c-a995-1ba5b2d92743}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{2a6be19a-6ab3-4cd3-9351-fcc7023a4722}</UniqueIdentifier>
+      <UniqueIdentifier>{8badb82f-c756-4326-8811-408e6c80e3d8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{f76a0271-67d5-48ee-9c8c-c8734f230f5f}</UniqueIdentifier>
+      <UniqueIdentifier>{522f129b-4aca-4b3f-a3f6-7555c60d1594}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{f4cdfc97-b6f2-4d48-8e1a-d3cf745431e9}</UniqueIdentifier>
+      <UniqueIdentifier>{902ccf0d-39ef-4e07-8d13-b20420f52163}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{68ab2af1-4781-474f-bbbc-d082521a20de}</UniqueIdentifier>
+      <UniqueIdentifier>{be46b078-1079-432e-9e2a-aa8e8ecf9b7e}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{0f8679b3-02b5-461e-b4d1-7054f6416f85}</UniqueIdentifier>
+      <UniqueIdentifier>{3670191a-bf5e-44d7-a388-31946cbf276b}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{20b2e2be-14f4-4ae7-a9d7-6839f7b1d9ce}</UniqueIdentifier>
+      <UniqueIdentifier>{14881241-f3fc-46c1-8b14-2dad19545c82}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs120.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>12.0.21005.1</_ProjectFileVersion>
+    <_ProjectFileVersion>12.0.30501.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCrypto64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCrypto64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -218,7 +218,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -246,7 +247,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -269,13 +271,14 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -304,7 +307,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -313,24 +317,24 @@ exit 0</Command>
     <ClInclude Include="include\Poco\Crypto\CipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKey.h"/>
     <ClInclude Include="include\Poco\Crypto\CipherKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
+    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoStream.h"/>
     <ClInclude Include="include\Poco\Crypto\CryptoTransform.h"/>
+    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
+    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
+    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
+    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\RSACipherImpl.h"/>
     <ClInclude Include="include\Poco\Crypto\RSADigestEngine.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKey.h"/>
     <ClInclude Include="include\Poco\Crypto\RSAKeyImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\PKCS12Container.h"/>
     <ClInclude Include="include\Poco\Crypto\X509Certificate.h"/>
-    <ClInclude Include="include\Poco\Crypto\Crypto.h"/>
-    <ClInclude Include="include\Poco\Crypto\CryptoException.h"/>
-    <ClInclude Include="include\Poco\Crypto\EVPPKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPair.h"/>
-    <ClInclude Include="include\Poco\Crypto\KeyPairImpl.h"/>
-    <ClInclude Include="include\Poco\Crypto\OpenSSLInitializer.h"/>
-    <ClInclude Include="include\Poco\Crypto\DigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECDSADigestEngine.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKey.h"/>
-    <ClInclude Include="include\Poco\Crypto\ECKeyImpl.h"/>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Cipher.cpp"/>
@@ -338,23 +342,23 @@ exit 0</Command>
     <ClCompile Include="src\CipherImpl.cpp"/>
     <ClCompile Include="src\CipherKey.cpp"/>
     <ClCompile Include="src\CipherKeyImpl.cpp"/>
+    <ClCompile Include="src\CryptoException.cpp"/>
     <ClCompile Include="src\CryptoStream.cpp"/>
     <ClCompile Include="src\CryptoTransform.cpp"/>
+    <ClCompile Include="src\DigestEngine.cpp"/>
+    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
+    <ClCompile Include="src\ECKey.cpp"/>
+    <ClCompile Include="src\ECKeyImpl.cpp"/>
+    <ClCompile Include="src\EVPPKey.cpp"/>
+    <ClCompile Include="src\KeyPair.cpp"/>
+    <ClCompile Include="src\KeyPairImpl.cpp"/>
+    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
+    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\RSACipherImpl.cpp"/>
     <ClCompile Include="src\RSADigestEngine.cpp"/>
     <ClCompile Include="src\RSAKey.cpp"/>
     <ClCompile Include="src\RSAKeyImpl.cpp"/>
-    <ClCompile Include="src\PKCS12Container.cpp"/>
     <ClCompile Include="src\X509Certificate.cpp"/>
-    <ClCompile Include="src\CryptoException.cpp"/>
-    <ClCompile Include="src\EVPPKey.cpp"/>
-    <ClCompile Include="src\KeyPair.cpp"/>
-    <ClCompile Include="src\KeyPairImpl.cpp"/>
-    <ClCompile Include="src\OpenSSLInitializer.cpp"/>
-    <ClCompile Include="src\DigestEngine.cpp"/>
-    <ClCompile Include="src\ECDSADigestEngine.cpp"/>
-    <ClCompile Include="src\ECKey.cpp"/>
-    <ClCompile Include="src\ECKeyImpl.cpp"/>
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">

Crypto/Crypto_x64_vs120.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{5b64e6b9-e23c-4c4e-bb8f-37afd4fe4a3f}</UniqueIdentifier>
+      <UniqueIdentifier>{63b229d9-02d5-48fe-bef8-95a485a0d0a8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{2dc6b067-c11b-4b4a-84fc-0765848859c1}</UniqueIdentifier>
+      <UniqueIdentifier>{968be2ca-ccad-4fa8-a22e-1aeffaf1ab71}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{6a937147-f5c8-4daa-bc65-e57489ee7f95}</UniqueIdentifier>
+      <UniqueIdentifier>{2c210294-07a1-4c3b-a3ba-ad16c2af05eb}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{f151bfc1-954c-46b1-8fcf-46ef09d57088}</UniqueIdentifier>
+      <UniqueIdentifier>{6d972a73-85d8-49ef-a8b8-acfd661dbd1f}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{0ba67096-4fe0-428e-8bfe-4af27b0ef79e}</UniqueIdentifier>
+      <UniqueIdentifier>{b3478c59-fa8a-413c-8b78-3b3819f61afb}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{6c053337-5542-4df0-bf46-e633e162ac4b}</UniqueIdentifier>
+      <UniqueIdentifier>{e9541509-2d70-4fce-a329-cb7b589a30c8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{8fccac56-eb54-4b52-8c51-5e62b203defc}</UniqueIdentifier>
+      <UniqueIdentifier>{77557ce9-700d-4a5c-a255-df55fc30e1e9}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{9aec1e27-aaad-4eb4-8a03-68042c4bde92}</UniqueIdentifier>
+      <UniqueIdentifier>{6468beba-4cb5-4582-b408-f875653f4639}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{f31f22e8-3fbc-4d7b-91b0-9db2236b3de1}</UniqueIdentifier>
+      <UniqueIdentifier>{bd3b396b-e615-4ab2-9c92-293ab66c5500}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{9cd96c79-1e7b-4f5c-9467-a515a13cd81b}</UniqueIdentifier>
+      <UniqueIdentifier>{b1f0a0ec-3792-49d1-a17e-255b575b0b00}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{0ad89347-11c2-443e-93a8-9071f2f58722}</UniqueIdentifier>
+      <UniqueIdentifier>{088e7495-b4e6-40e4-948d-f1759ddef98c}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{7b877678-a1b8-43ff-8677-8baddde22ad0}</UniqueIdentifier>
+      <UniqueIdentifier>{b782e26f-c87d-409f-9e75-15d5be7ea075}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{95686c3e-c37d-4f88-95f1-1ba78ffe0d65}</UniqueIdentifier>
+      <UniqueIdentifier>{02726107-e25e-4f38-8ad7-f3cdbb5031d3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{200f4da9-dd9a-4520-b079-e269a2404f98}</UniqueIdentifier>
+      <UniqueIdentifier>{63b084b9-9733-4a90-9aef-d42b6af9dba2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{8ba56691-df39-494e-a539-3ace463bd049}</UniqueIdentifier>
+      <UniqueIdentifier>{53b0529e-28bc-490b-b89d-63f5e59c30f2}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{5b52921a-4ae8-4ec8-b8ad-d5cee82a81e4}</UniqueIdentifier>
+      <UniqueIdentifier>{040d866d-4e68-42d2-a0c9-607b6148e6d2}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{b9e8ad66-bc0d-421d-9ddf-baa579126663}</UniqueIdentifier>
+      <UniqueIdentifier>{906dc4c4-674b-4dc7-a735-4f45fe71b7b8}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{219aa11a-663e-4ff4-bbcd-360771ef004b}</UniqueIdentifier>
+      <UniqueIdentifier>{80d6b646-3e8e-4d8c-a255-633830a45225}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs140.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>14.0.25123.0</_ProjectFileVersion>
+    <_ProjectFileVersion>14.0.25431.1</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCrypto64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCrypto64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -218,7 +218,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -246,7 +247,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -269,13 +271,14 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -304,7 +307,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs140.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{d3e3bb6e-7f17-4916-b72b-789139289a6c}</UniqueIdentifier>
+      <UniqueIdentifier>{83603bc1-ff58-4daf-a902-e3ec17428d7d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{d9608685-6475-4c6e-824b-ba1f16e2e757}</UniqueIdentifier>
+      <UniqueIdentifier>{d36725e1-3ecd-4594-9bfc-7ad01320f214}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{163f4e2c-f145-44b7-afd0-805c43701cf6}</UniqueIdentifier>
+      <UniqueIdentifier>{87409edd-1749-42a6-9717-6d5ad0486654}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{e85669b0-79ff-45d6-801c-bc7c389ddb4f}</UniqueIdentifier>
+      <UniqueIdentifier>{7756f0b7-1722-4ce6-97c7-95971d7a9d85}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{499cd9e7-ec7f-4b29-9d68-d3f6e9bf4e1f}</UniqueIdentifier>
+      <UniqueIdentifier>{63883e28-1a2f-4291-aa02-8277c989e09e}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{2bf3cd12-ce7a-4426-86e3-058f981f1f53}</UniqueIdentifier>
+      <UniqueIdentifier>{28e0d023-86a0-4f38-b453-746d586be3e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{0df2f380-4822-4228-bb85-07bcc40cf596}</UniqueIdentifier>
+      <UniqueIdentifier>{4bd56276-22de-42a0-b0d3-429152e3df0c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{e0c6d16c-b58f-449e-97e2-28d298fc65a6}</UniqueIdentifier>
+      <UniqueIdentifier>{64130826-a872-44c8-b63d-48e4eb0529e1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{48322480-e1cd-4074-897d-26b54f0130ab}</UniqueIdentifier>
+      <UniqueIdentifier>{ba92b58a-7806-4db0-bc1f-0ef068c80ad1}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{bca4443c-a903-49c7-9b01-06a7de2b337c}</UniqueIdentifier>
+      <UniqueIdentifier>{cce0e0c4-862e-4f52-975f-469c044c6e4e}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{5ee3c328-f00a-42ff-a995-36012968b9ba}</UniqueIdentifier>
+      <UniqueIdentifier>{b8d5ba49-c041-40f8-8850-4e0669f87433}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{5ebf8c52-a956-4d63-abe9-a8e1bf1e34b0}</UniqueIdentifier>
+      <UniqueIdentifier>{f7760cb5-edb5-4cd4-8b42-ae14319e527f}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{def09540-2932-496e-890c-12c82efb8942}</UniqueIdentifier>
+      <UniqueIdentifier>{1f04f46b-0816-48b1-a234-ad07769aef28}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{363d9a54-9bba-48e2-9324-61ce6304ab52}</UniqueIdentifier>
+      <UniqueIdentifier>{6dd9e051-cbe4-4842-8540-a3e96a27771d}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{08be421c-277e-4686-827b-7a41ad332197}</UniqueIdentifier>
+      <UniqueIdentifier>{105e320e-51be-459e-9499-8da34fa9dc5b}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{59774c4e-9080-4ac9-9a9f-86c978e7459d}</UniqueIdentifier>
+      <UniqueIdentifier>{8d419576-bead-4557-9886-36986089bed8}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{4513247d-6b10-4505-8b68-61e33bd9be72}</UniqueIdentifier>
+      <UniqueIdentifier>{0d9c5c94-9d70-4fba-93af-e95a601ede14}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{e3bb9603-6fe1-4c16-b21c-36be7e43305e}</UniqueIdentifier>
+      <UniqueIdentifier>{75141eee-aeee-4206-9138-c44f66e0ccfb}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs150.vcxproj

@@ -85,13 +85,13 @@
   </ImportGroup>
   <PropertyGroup Label="UserMacros"/>
   <PropertyGroup>
-    <_ProjectFileVersion>15.0.26228.10</_ProjectFileVersion>
+    <_ProjectFileVersion>15.0.27625.0</_ProjectFileVersion>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoCrypto64d</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptomdd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptomtd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoCryptoMDd</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoCryptoMTd</TargetName>
     <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoCrypto64</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptomd</TargetName>
-    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptomt</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoCryptoMD</TargetName>
+    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoCryptoMT</TargetName>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
     <OutDir>..\bin64\</OutDir>
@@ -218,7 +218,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomtd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMTd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">
@@ -246,7 +247,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomt.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMT.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
@@ -269,13 +271,14 @@ exit 0</Command>
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
       <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>..\lib64\PocoCryptoMDd.pdb</ProgramDataBaseFileName>
       <WarningLevel>Level3</WarningLevel>
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomdd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMDd.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">
@@ -304,7 +307,8 @@ exit 0</Command>
       <CompileAs>Default</CompileAs>
     </ClCompile>
     <Lib>
-      <OutputFile>..\lib64\PocoCryptomd.lib</OutputFile>
+      <OutputFile>..\lib64\PocoCryptoMD.lib</OutputFile>
+      <TargetMachine>MachineX64</TargetMachine>
     </Lib>
   </ItemDefinitionGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs150.vcxproj.filters

@@ -2,58 +2,58 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Cipher">
-      <UniqueIdentifier>{feb66efb-0308-45ad-b103-646a848a7194}</UniqueIdentifier>
+      <UniqueIdentifier>{3e138295-3791-4c6d-b4ea-15221f814553}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Header Files">
-      <UniqueIdentifier>{dfa8c684-98e3-44c6-8e7d-b5b64fb4c63d}</UniqueIdentifier>
+      <UniqueIdentifier>{c492164d-abb7-411b-a2e0-5de3e3ce7e33}</UniqueIdentifier>
     </Filter>
     <Filter Include="Cipher\Source Files">
-      <UniqueIdentifier>{f0376b48-442e-4aa8-b2ea-1643211a3a54}</UniqueIdentifier>
+      <UniqueIdentifier>{357cee67-df11-4f26-a969-3d0ecab85b8a}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA">
-      <UniqueIdentifier>{2b0e007e-0056-4709-b2b7-6d8ed4471344}</UniqueIdentifier>
+      <UniqueIdentifier>{7246294d-682e-44c7-a4b6-1327c91a67c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Header Files">
-      <UniqueIdentifier>{17a9f69b-a3a8-48c3-b88f-0306585468d0}</UniqueIdentifier>
+      <UniqueIdentifier>{f884d6e0-c7b1-4978-96ad-5ad8e999e6fa}</UniqueIdentifier>
     </Filter>
     <Filter Include="RSA\Source Files">
-      <UniqueIdentifier>{4d88fec1-35e4-4573-89b2-33587e529720}</UniqueIdentifier>
+      <UniqueIdentifier>{af6b5188-a099-47e6-b30b-0113957bc070}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate">
-      <UniqueIdentifier>{fed835ed-e760-4223-962e-191b98b57e90}</UniqueIdentifier>
+      <UniqueIdentifier>{a419ac5e-b541-41cb-8fe3-43e9cbf2aca3}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Header Files">
-      <UniqueIdentifier>{dbbd61d4-cf37-43e8-a0ad-e7999c5a3d70}</UniqueIdentifier>
+      <UniqueIdentifier>{0d2c5f61-f0dc-48d0-9a21-fa1255ee073e}</UniqueIdentifier>
     </Filter>
     <Filter Include="Certificate\Source Files">
-      <UniqueIdentifier>{dc70a372-7916-4c69-a0c7-1bf609dabbe0}</UniqueIdentifier>
+      <UniqueIdentifier>{9519f917-f5a9-480f-91a6-60f0731ba749}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore">
-      <UniqueIdentifier>{d4dd7ead-0209-47f2-a9e3-d3bfb8211a1e}</UniqueIdentifier>
+      <UniqueIdentifier>{02fed1b7-2f13-4bea-ba04-7e4947930e1a}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Header Files">
-      <UniqueIdentifier>{a09369f7-9eec-41da-b582-108347f2029f}</UniqueIdentifier>
+      <UniqueIdentifier>{f883a5e2-6e06-40f0-bd95-df39c341b5a4}</UniqueIdentifier>
     </Filter>
     <Filter Include="CryptoCore\Source Files">
-      <UniqueIdentifier>{b756ced0-b2ac-472f-bff6-31d7abef69e4}</UniqueIdentifier>
+      <UniqueIdentifier>{2c8cfb51-646c-45e9-a621-67e2a9bc0957}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest">
-      <UniqueIdentifier>{8987f04f-8f65-43fd-b4f3-049e8ee34f0e}</UniqueIdentifier>
+      <UniqueIdentifier>{061dad20-c929-4b68-a6ff-a6c0e090004c}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Header Files">
-      <UniqueIdentifier>{00e2008a-4dad-46bc-83c5-caf67879825b}</UniqueIdentifier>
+      <UniqueIdentifier>{c5403311-ae38-4e03-93bc-44979c01db4b}</UniqueIdentifier>
     </Filter>
     <Filter Include="Digest\Source Files">
-      <UniqueIdentifier>{eeb3c1de-3b29-48d3-a262-b62e19b35863}</UniqueIdentifier>
+      <UniqueIdentifier>{f89a9097-d2ec-4f1b-8e72-3e8ab8508e23}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC">
-      <UniqueIdentifier>{e3371425-03d9-4c64-ac23-ccbeafae4285}</UniqueIdentifier>
+      <UniqueIdentifier>{d79bf42e-2805-44b2-a717-669c3b219382}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Header Files">
-      <UniqueIdentifier>{8beef14d-9dc2-41bf-b30e-0c01f316bf77}</UniqueIdentifier>
+      <UniqueIdentifier>{6420d848-620a-4c7e-92e5-680e61e8fad5}</UniqueIdentifier>
     </Filter>
     <Filter Include="EC\Source Files">
-      <UniqueIdentifier>{232b8ef0-340f-48c9-a4ef-668962c6bc53}</UniqueIdentifier>
+      <UniqueIdentifier>{00357a4f-3660-4444-b160-0e6fc8da0c13}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>

Crypto/Crypto_x64_vs90.vcproj

@@ -189,7 +189,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCryptomtd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCryptoMTd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -204,7 +204,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCryptomtd.lib"
+				OutputFile="..\lib64\PocoCryptoMTd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -264,7 +264,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCryptomt.lib"
+				OutputFile="..\lib64\PocoCryptoMT.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -308,7 +308,7 @@
 				ForceConformanceInForLoopScope="true"
 				RuntimeTypeInfo="true"
 				UsePrecompiledHeader="0"
-				ProgramDataBaseFileName="..\lib64\PocoCryptomdd.pdb"
+				ProgramDataBaseFileName="..\lib64\PocoCryptoMDd.pdb"
 				WarningLevel="3"
 				Detect64BitPortabilityProblems="false"
 				DebugInformationFormat="3"
@@ -323,7 +323,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCryptomdd.lib"
+				OutputFile="..\lib64\PocoCryptoMDd.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>
@@ -383,7 +383,7 @@
 				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLibrarianTool"
-				OutputFile="..\lib64\PocoCryptomd.lib"
+				OutputFile="..\lib64\PocoCryptoMD.lib"
 				TargetMachine="17"/>
 			<Tool
 				Name="VCALinkTool"/>