diff --git a/MongoDB/MongoDB_vs100.vcxproj b/MongoDB/MongoDB_vs100.vcxproj
index 6ea31ab91..550a3fa97 100644
--- a/MongoDB/MongoDB_vs100.vcxproj
+++ b/MongoDB/MongoDB_vs100.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs100.vcxproj.filters b/MongoDB/MongoDB_vs100.vcxproj.filters
index 019012bbc..9c4faabbb 100644
--- a/MongoDB/MongoDB_vs100.vcxproj.filters
+++ b/MongoDB/MongoDB_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{652c558d-29fa-4388-a2e3-14978f1fa60f}</UniqueIdentifier>
+      <UniqueIdentifier>{c1a0c9bb-b200-4b7d-b8c1-75440803bdf8}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{b3d4d558-11c5-4326-b307-22ef4a5548dd}</UniqueIdentifier>
+      <UniqueIdentifier>{26c79187-8579-490e-88fc-47966d175478}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs110.vcxproj b/MongoDB/MongoDB_vs110.vcxproj
index 36b579820..0fcae8776 100644
--- a/MongoDB/MongoDB_vs110.vcxproj
+++ b/MongoDB/MongoDB_vs110.vcxproj
@@ -327,10 +327,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs110.vcxproj.filters b/MongoDB/MongoDB_vs110.vcxproj.filters
index 8b6122fe4..76ed11f86 100644
--- a/MongoDB/MongoDB_vs110.vcxproj.filters
+++ b/MongoDB/MongoDB_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{8f779b39-a557-4aff-bc24-e77fff19c5b9}</UniqueIdentifier>
+      <UniqueIdentifier>{df1be483-8625-4080-b11a-2d1134304d82}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{19e6fc09-4d13-4a71-a5f7-356bad176413}</UniqueIdentifier>
+      <UniqueIdentifier>{f4d92172-0276-461b-a5a7-ac1e4ae3802f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs120.vcxproj b/MongoDB/MongoDB_vs120.vcxproj
index 30bbc1389..5575bb6b6 100644
--- a/MongoDB/MongoDB_vs120.vcxproj
+++ b/MongoDB/MongoDB_vs120.vcxproj
@@ -327,10 +327,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs120.vcxproj.filters b/MongoDB/MongoDB_vs120.vcxproj.filters
index 5b09fb54e..7608d9c41 100644
--- a/MongoDB/MongoDB_vs120.vcxproj.filters
+++ b/MongoDB/MongoDB_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{085951e5-3540-4ffd-9ec1-1d5567f9251f}</UniqueIdentifier>
+      <UniqueIdentifier>{0e48df0a-79cb-4920-9c22-7f07f2d9c6b7}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{788e8e57-17c8-4106-a4be-dfb52d1edd46}</UniqueIdentifier>
+      <UniqueIdentifier>{2cc36e61-f460-4089-9993-d842e9052508}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs140.vcxproj b/MongoDB/MongoDB_vs140.vcxproj
index ebd94cb0b..c51152d3c 100644
--- a/MongoDB/MongoDB_vs140.vcxproj
+++ b/MongoDB/MongoDB_vs140.vcxproj
@@ -327,10 +327,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs140.vcxproj.filters b/MongoDB/MongoDB_vs140.vcxproj.filters
index a7ab4e17c..5cc888bb0 100644
--- a/MongoDB/MongoDB_vs140.vcxproj.filters
+++ b/MongoDB/MongoDB_vs140.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{05f36b2b-270c-4a9a-8674-4f7cc0ea7c1e}</UniqueIdentifier>
+      <UniqueIdentifier>{56df83a1-0a9e-4a15-bb1f-1459f6672cf5}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{d2d2f5ea-ad45-4b2c-b5c1-f2bcc1e0c78e}</UniqueIdentifier>
+      <UniqueIdentifier>{4bf06de1-9869-41fc-865d-dde602b4edb3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs150.vcxproj b/MongoDB/MongoDB_vs150.vcxproj
index 898129ed4..808e8347a 100644
--- a/MongoDB/MongoDB_vs150.vcxproj
+++ b/MongoDB/MongoDB_vs150.vcxproj
@@ -327,10 +327,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs150.vcxproj.filters b/MongoDB/MongoDB_vs150.vcxproj.filters
index 2a4db99dd..ebcdc89b1 100644
--- a/MongoDB/MongoDB_vs150.vcxproj.filters
+++ b/MongoDB/MongoDB_vs150.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{a2784424-79d5-4f4c-9b7f-34a0014c6434}</UniqueIdentifier>
+      <UniqueIdentifier>{e0d7d491-832a-4464-af77-a69e1a1dc0ec}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{415a9d89-711f-403b-acdf-684930806fd0}</UniqueIdentifier>
+      <UniqueIdentifier>{24d8aedf-760b-4493-84ee-318e132ef44f}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs160.vcxproj b/MongoDB/MongoDB_vs160.vcxproj
index f40273bc6..99e3c0d90 100644
--- a/MongoDB/MongoDB_vs160.vcxproj
+++ b/MongoDB/MongoDB_vs160.vcxproj
@@ -327,10 +327,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_vs160.vcxproj.filters b/MongoDB/MongoDB_vs160.vcxproj.filters
index aca177cb1..69d9425d0 100644
--- a/MongoDB/MongoDB_vs160.vcxproj.filters
+++ b/MongoDB/MongoDB_vs160.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{617791ee-3382-44e0-83a8-915702f1ced5}</UniqueIdentifier>
+      <UniqueIdentifier>{87208add-be8b-49a5-a734-f0433c70d9f1}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{a485c59e-12aa-466b-a275-5b83ca686618}</UniqueIdentifier>
+      <UniqueIdentifier>{c6165f54-40f7-4424-abe6-4937263200e8}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_vs90.vcproj b/MongoDB/MongoDB_vs90.vcproj
index ac162443b..1b6d250e7 100644
--- a/MongoDB/MongoDB_vs90.vcproj
+++ b/MongoDB/MongoDB_vs90.vcproj
@@ -1,46 +1,35 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
 	Name="MongoDB"
+	Version="9.00"
+	ProjectType="Visual C++"
 	ProjectGUID="{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}"
 	RootNamespace="MongoDB"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
+	Keyword="Win32Proj">
 	<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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MongoDB_EXPORTS"
@@ -58,77 +47,59 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions=""
 				AdditionalDependencies=""
 				OutputFile="..\bin\PocoMongoDBd.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\bin\PocoMongoDBd.pdb"
+				AdditionalLibraryDirectories="..\lib"
 				SubSystem="1"
 				ImportLibrary="..\lib\PocoMongoDBd.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"
@@ -148,78 +119,60 @@
 				DebugInformationFormat="0"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions=""
 				AdditionalDependencies=""
 				OutputFile="..\bin\PocoMongoDB.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib"
 				GenerateDebugInformation="false"
+				AdditionalLibraryDirectories="..\lib"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				ImportLibrary="..\lib\PocoMongoDB.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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
@@ -238,61 +191,45 @@
 				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\PocoMongoDBmtd.lib"
-			/>
+				OutputFile="..\lib\PocoMongoDBmtd.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"
@@ -312,61 +249,45 @@
 				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\PocoMongoDBmt.lib"
-			/>
+				OutputFile="..\lib\PocoMongoDBmt.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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
@@ -385,61 +306,45 @@
 				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\PocoMongoDBmdd.lib"
-			/>
+				OutputFile="..\lib\PocoMongoDBmdd.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"
@@ -459,283 +364,165 @@
 				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\PocoMongoDBmd.lib"
-			/>
+				OutputFile="..\lib\PocoMongoDBmd.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"
-			>
+			Name="Source Files">
 			<File
-				RelativePath=".\src\Array.cpp"
-				>
-			</File>
+				RelativePath=".\src\Array.cpp"/>
 			<File
-				RelativePath=".\src\Binary.cpp"
-				>
-			</File>
+				RelativePath=".\src\Binary.cpp"/>
 			<File
-				RelativePath=".\src\Connection.cpp"
-				>
-			</File>
+				RelativePath=".\src\Connection.cpp"/>
 			<File
-				RelativePath=".\src\Cursor.cpp"
-				>
-			</File>
+				RelativePath=".\src\Cursor.cpp"/>
 			<File
-				RelativePath=".\src\Database.cpp"
-				>
-			</File>
+				RelativePath=".\src\Database.cpp"/>
 			<File
-				RelativePath=".\src\DeleteRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\DeleteRequest.cpp"/>
 			<File
-				RelativePath=".\src\Document.cpp"
-				>
-			</File>
+				RelativePath=".\src\Document.cpp"/>
 			<File
-				RelativePath=".\src\Element.cpp"
-				>
-			</File>
+				RelativePath=".\src\Element.cpp"/>
 			<File
-				RelativePath=".\src\GetMoreRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\GetMoreRequest.cpp"/>
 			<File
-				RelativePath=".\src\InsertRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\InsertRequest.cpp"/>
 			<File
-				RelativePath=".\src\JavaScriptCode.cpp"
-				>
-			</File>
+				RelativePath=".\src\JavaScriptCode.cpp"/>
 			<File
-				RelativePath=".\src\KillCursorsRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\KillCursorsRequest.cpp"/>
 			<File
-				RelativePath=".\src\Message.cpp"
-				>
-			</File>
+				RelativePath=".\src\Message.cpp"/>
 			<File
-				RelativePath=".\src\MessageHeader.cpp"
-				>
-			</File>
+				RelativePath=".\src\MessageHeader.cpp"/>
 			<File
-				RelativePath=".\src\ObjectId.cpp"
-				>
-			</File>
+				RelativePath=".\src\ObjectId.cpp"/>
 			<File
-				RelativePath=".\src\QueryRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\QueryRequest.cpp"/>
 			<File
-				RelativePath=".\src\RegularExpression.cpp"
-				>
-			</File>
+				RelativePath=".\src\RegularExpression.cpp"/>
 			<File
-				RelativePath=".\src\ReplicaSet.cpp"
-				>
-			</File>
+				RelativePath=".\src\ReplicaSet.cpp"/>
 			<File
-				RelativePath=".\src\RequestMessage.cpp"
-				>
-			</File>
+				RelativePath=".\src\RequestMessage.cpp"/>
 			<File
-				RelativePath=".\src\ResponseMessage.cpp"
-				>
-			</File>
+				RelativePath=".\src\ResponseMessage.cpp"/>
 			<File
-				RelativePath=".\src\UpdateRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\UpdateRequest.cpp"/>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			>
+			Name="Header Files">
 			<File
-				RelativePath=".\include\Poco\MongoDB\Array.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Array.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Binary.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Binary.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\BSONReader.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\BSONReader.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\BSONWriter.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\BSONWriter.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Connection.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Connection.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Cursor.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Cursor.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Database.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Database.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\DeleteRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\DeleteRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Document.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Document.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Element.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Element.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\GetMoreRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\GetMoreRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\InsertRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\InsertRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\JavaScriptCode.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\JavaScriptCode.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\KillCursorsRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\KillCursorsRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Message.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Message.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\MessageHeader.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\MessageHeader.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\MongoDB.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\MongoDB.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ObjectId.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ObjectId.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\PoolableConnectionFactory.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\PoolableConnectionFactory.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\QueryRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\QueryRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\RegularExpression.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\RegularExpression.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ReplicaSet.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ReplicaSet.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\RequestMessage.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\RequestMessage.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ResponseMessage.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ResponseMessage.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\UpdateRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\UpdateRequest.h"/>
 		</Filter>
 		<File
-			RelativePath="..\DLLVersion.rc"
-			>
+			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|Win32"
-				>
+				Name="debug_shared|Win32">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|Win32"
-				>
+				Name="release_shared|Win32">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_mt|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_md|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_md|Win32"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 		</File>
 	</Files>
-	<Globals>
-	</Globals>
+	<Globals/>
 </VisualStudioProject>
diff --git a/MongoDB/MongoDB_x64_vs100.vcxproj b/MongoDB/MongoDB_x64_vs100.vcxproj
index de83971d4..eefee93fa 100644
--- a/MongoDB/MongoDB_x64_vs100.vcxproj
+++ b/MongoDB/MongoDB_x64_vs100.vcxproj
@@ -324,10 +324,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs100.vcxproj.filters b/MongoDB/MongoDB_x64_vs100.vcxproj.filters
index 619622efd..449346ea2 100644
--- a/MongoDB/MongoDB_x64_vs100.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs100.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{1443c647-17a6-469d-8e39-a6e3c763eaac}</UniqueIdentifier>
+      <UniqueIdentifier>{971be427-9f67-4b13-865c-bec9c1fb9b84}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{b66c0c10-2c80-4c38-89e6-06f17a91defa}</UniqueIdentifier>
+      <UniqueIdentifier>{1b801009-c468-4dee-8da3-aae5760ccb1a}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj b/MongoDB/MongoDB_x64_vs110.vcxproj
index 358fd857f..4910cd368 100644
--- a/MongoDB/MongoDB_x64_vs110.vcxproj
+++ b/MongoDB/MongoDB_x64_vs110.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj.filters b/MongoDB/MongoDB_x64_vs110.vcxproj.filters
index c5750b3dd..2990cd2f8 100644
--- a/MongoDB/MongoDB_x64_vs110.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs110.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{1fc64256-139b-40ed-9b05-c30c7e645afa}</UniqueIdentifier>
+      <UniqueIdentifier>{cf7bba7b-0f46-4224-979a-74d892a929b0}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{1953633f-6607-4083-8646-cc8c1d8cfa6c}</UniqueIdentifier>
+      <UniqueIdentifier>{a606ee4a-12da-45b3-8da8-ab5a0da2da80}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs120.vcxproj b/MongoDB/MongoDB_x64_vs120.vcxproj
index f5b511922..375a6bf72 100644
--- a/MongoDB/MongoDB_x64_vs120.vcxproj
+++ b/MongoDB/MongoDB_x64_vs120.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs120.vcxproj.filters b/MongoDB/MongoDB_x64_vs120.vcxproj.filters
index 9747cbfcc..1db7f3049 100644
--- a/MongoDB/MongoDB_x64_vs120.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs120.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{f40981f8-6a4d-4ecb-9ed4-043989a4d477}</UniqueIdentifier>
+      <UniqueIdentifier>{99f82c9c-517d-4c3d-8211-b84f2cc93e68}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{f4c1d692-0554-48f1-b2d6-0a55f99c45dc}</UniqueIdentifier>
+      <UniqueIdentifier>{35465bae-c694-4fd2-b253-ba676e9539a3}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj b/MongoDB/MongoDB_x64_vs140.vcxproj
index 8c467bf14..1e7fbd602 100644
--- a/MongoDB/MongoDB_x64_vs140.vcxproj
+++ b/MongoDB/MongoDB_x64_vs140.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj.filters b/MongoDB/MongoDB_x64_vs140.vcxproj.filters
index 2137745ad..bd25498fa 100644
--- a/MongoDB/MongoDB_x64_vs140.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs140.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{aa9c50e1-f08e-47b2-a989-bb103dc49ff2}</UniqueIdentifier>
+      <UniqueIdentifier>{7137143e-61db-41e0-9886-6bfaf80c00c2}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{888355a6-792e-4f12-a3f2-5c07a910da12}</UniqueIdentifier>
+      <UniqueIdentifier>{27fa224e-7bd5-423b-9d4d-37427899842d}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj b/MongoDB/MongoDB_x64_vs150.vcxproj
index 1f5d9f95b..57031cf46 100644
--- a/MongoDB/MongoDB_x64_vs150.vcxproj
+++ b/MongoDB/MongoDB_x64_vs150.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj.filters b/MongoDB/MongoDB_x64_vs150.vcxproj.filters
index 53e24d1a4..260a6d0e9 100644
--- a/MongoDB/MongoDB_x64_vs150.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs150.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{8fd74abf-a801-4a3f-af96-10fdad89cb02}</UniqueIdentifier>
+      <UniqueIdentifier>{320afe46-b197-474b-aece-c8c3c9121624}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{31e3af9c-530b-4d49-be6d-16047fcfac3c}</UniqueIdentifier>
+      <UniqueIdentifier>{aec7b718-f853-479b-8719-9d2fb70d84ef}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs160.vcxproj b/MongoDB/MongoDB_x64_vs160.vcxproj
index 349dc36b2..4dd714b00 100644
--- a/MongoDB/MongoDB_x64_vs160.vcxproj
+++ b/MongoDB/MongoDB_x64_vs160.vcxproj
@@ -326,10 +326,8 @@
   </ItemGroup>
   <ItemGroup>
     <ResourceCompile Include="..\DLLVersion.rc">
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">true</ExcludedFromBuild>
-      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">true</ExcludedFromBuild>
       <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">true</ExcludedFromBuild>
     </ResourceCompile>
diff --git a/MongoDB/MongoDB_x64_vs160.vcxproj.filters b/MongoDB/MongoDB_x64_vs160.vcxproj.filters
index 0fd11b60e..dde6cdaf1 100644
--- a/MongoDB/MongoDB_x64_vs160.vcxproj.filters
+++ b/MongoDB/MongoDB_x64_vs160.vcxproj.filters
@@ -2,10 +2,10 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
     <Filter Include="Source Files">
-      <UniqueIdentifier>{b3bd09ab-8c48-4c62-b8ec-bedcb48dce40}</UniqueIdentifier>
+      <UniqueIdentifier>{8181d13c-3397-43ff-b2a5-c5f70f93c870}</UniqueIdentifier>
     </Filter>
     <Filter Include="Header Files">
-      <UniqueIdentifier>{9935a705-26da-4f8d-88f9-7e73614bbed5}</UniqueIdentifier>
+      <UniqueIdentifier>{415aede3-014b-4e6e-908f-b7e503107aee}</UniqueIdentifier>
     </Filter>
   </ItemGroup>
   <ItemGroup>
diff --git a/MongoDB/MongoDB_x64_vs90.vcproj b/MongoDB/MongoDB_x64_vs90.vcproj
index 635bdd31f..05f649951 100644
--- a/MongoDB/MongoDB_x64_vs90.vcproj
+++ b/MongoDB/MongoDB_x64_vs90.vcproj
@@ -1,46 +1,35 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	ProjectType="Visual C++"
-	Version="9.00"
 	Name="MongoDB"
+	Version="9.00"
+	ProjectType="Visual C++"
 	ProjectGUID="{4FF2F34B-7F37-3ACD-AFBC-F21D6D426199}"
 	RootNamespace="MongoDB"
-	Keyword="Win32Proj"
-	TargetFrameworkVersion="0"
-	>
+	Keyword="Win32Proj">
 	<Platforms>
 		<Platform
-			Name="x64"
-		/>
+			Name="x64"/>
 	</Platforms>
-	<ToolFiles>
-	</ToolFiles>
+	<ToolFiles/>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;MongoDB_EXPORTS"
@@ -58,77 +47,59 @@
 				DebugInformationFormat="3"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions=""
 				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoMongoDB64d.dll"
 				LinkIncremental="2"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib64"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="..\bin64\PocoMongoDB64d.pdb"
+				AdditionalLibraryDirectories="..\lib64"
 				SubSystem="1"
 				ImportLibrary="..\lib64\PocoMongoDBd.lib"
 				TargetMachine="17"
-			/>
+				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|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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"
@@ -148,79 +119,61 @@
 				DebugInformationFormat="0"
 				CompileAs="0"
 				DisableSpecificWarnings=""
-			/>
+				AdditionalOptions=""/>
 			<Tool
-				Name="VCManagedResourceCompilerTool"
-			/>
+				Name="VCManagedResourceCompilerTool"/>
 			<Tool
-				Name="VCResourceCompilerTool"
-			/>
+				Name="VCResourceCompilerTool"/>
 			<Tool
-				Name="VCPreLinkEventTool"
-			/>
+				Name="VCPreLinkEventTool"/>
 			<Tool
 				Name="VCLinkerTool"
-				AdditionalOptions=""
 				AdditionalDependencies=""
 				OutputFile="..\bin64\PocoMongoDB64.dll"
 				LinkIncremental="1"
 				SuppressStartupBanner="true"
-				AdditionalLibraryDirectories="..\lib64"
 				GenerateDebugInformation="false"
+				AdditionalLibraryDirectories="..\lib64"
 				SubSystem="1"
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				OptimizeForWindows98="0"
 				ImportLibrary="..\lib64\PocoMongoDB.lib"
 				TargetMachine="17"
-			/>
+				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|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
@@ -239,61 +192,46 @@
 				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="..\lib64\PocoMongoDBmtd.lib"
-			/>
+				TargetMachine="17"/>
 			<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|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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"
@@ -313,61 +251,46 @@
 				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="..\lib64\PocoMongoDBmt.lib"
-			/>
+				TargetMachine="17"/>
 			<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|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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;..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;POCO_STATIC;"
@@ -386,61 +309,46 @@
 				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="..\lib64\PocoMongoDBmdd.lib"
-			/>
+				TargetMachine="17"/>
 			<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|x64"
 			OutputDirectory="obj64\$(ConfigurationName)"
 			IntermediateDirectory="obj64\$(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"
@@ -460,283 +368,166 @@
 				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="..\lib64\PocoMongoDBmd.lib"
-			/>
+				TargetMachine="17"/>
 			<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"
-			>
+			Name="Source Files">
 			<File
-				RelativePath=".\src\Array.cpp"
-				>
-			</File>
+				RelativePath=".\src\Array.cpp"/>
 			<File
-				RelativePath=".\src\Binary.cpp"
-				>
-			</File>
+				RelativePath=".\src\Binary.cpp"/>
 			<File
-				RelativePath=".\src\Connection.cpp"
-				>
-			</File>
+				RelativePath=".\src\Connection.cpp"/>
 			<File
-				RelativePath=".\src\Cursor.cpp"
-				>
-			</File>
+				RelativePath=".\src\Cursor.cpp"/>
 			<File
-				RelativePath=".\src\Database.cpp"
-				>
-			</File>
+				RelativePath=".\src\Database.cpp"/>
 			<File
-				RelativePath=".\src\DeleteRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\DeleteRequest.cpp"/>
 			<File
-				RelativePath=".\src\Document.cpp"
-				>
-			</File>
+				RelativePath=".\src\Document.cpp"/>
 			<File
-				RelativePath=".\src\Element.cpp"
-				>
-			</File>
+				RelativePath=".\src\Element.cpp"/>
 			<File
-				RelativePath=".\src\GetMoreRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\GetMoreRequest.cpp"/>
 			<File
-				RelativePath=".\src\InsertRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\InsertRequest.cpp"/>
 			<File
-				RelativePath=".\src\JavaScriptCode.cpp"
-				>
-			</File>
+				RelativePath=".\src\JavaScriptCode.cpp"/>
 			<File
-				RelativePath=".\src\KillCursorsRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\KillCursorsRequest.cpp"/>
 			<File
-				RelativePath=".\src\Message.cpp"
-				>
-			</File>
+				RelativePath=".\src\Message.cpp"/>
 			<File
-				RelativePath=".\src\MessageHeader.cpp"
-				>
-			</File>
+				RelativePath=".\src\MessageHeader.cpp"/>
 			<File
-				RelativePath=".\src\ObjectId.cpp"
-				>
-			</File>
+				RelativePath=".\src\ObjectId.cpp"/>
 			<File
-				RelativePath=".\src\QueryRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\QueryRequest.cpp"/>
 			<File
-				RelativePath=".\src\RegularExpression.cpp"
-				>
-			</File>
+				RelativePath=".\src\RegularExpression.cpp"/>
 			<File
-				RelativePath=".\src\ReplicaSet.cpp"
-				>
-			</File>
+				RelativePath=".\src\ReplicaSet.cpp"/>
 			<File
-				RelativePath=".\src\RequestMessage.cpp"
-				>
-			</File>
+				RelativePath=".\src\RequestMessage.cpp"/>
 			<File
-				RelativePath=".\src\ResponseMessage.cpp"
-				>
-			</File>
+				RelativePath=".\src\ResponseMessage.cpp"/>
 			<File
-				RelativePath=".\src\UpdateRequest.cpp"
-				>
-			</File>
+				RelativePath=".\src\UpdateRequest.cpp"/>
 		</Filter>
 		<Filter
-			Name="Header Files"
-			>
+			Name="Header Files">
 			<File
-				RelativePath=".\include\Poco\MongoDB\Array.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Array.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Binary.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Binary.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\BSONReader.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\BSONReader.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\BSONWriter.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\BSONWriter.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Connection.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Connection.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Cursor.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Cursor.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Database.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Database.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\DeleteRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\DeleteRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Document.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Document.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Element.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Element.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\GetMoreRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\GetMoreRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\InsertRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\InsertRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\JavaScriptCode.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\JavaScriptCode.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\KillCursorsRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\KillCursorsRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\Message.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\Message.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\MessageHeader.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\MessageHeader.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\MongoDB.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\MongoDB.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ObjectId.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ObjectId.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\PoolableConnectionFactory.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\PoolableConnectionFactory.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\QueryRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\QueryRequest.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\RegularExpression.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\RegularExpression.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ReplicaSet.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ReplicaSet.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\RequestMessage.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\RequestMessage.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\ResponseMessage.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\ResponseMessage.h"/>
 			<File
-				RelativePath=".\include\Poco\MongoDB\UpdateRequest.h"
-				>
-			</File>
+				RelativePath=".\include\Poco\MongoDB\UpdateRequest.h"/>
 		</Filter>
 		<File
-			RelativePath="..\DLLVersion.rc"
-			>
+			RelativePath="..\DLLVersion.rc">
 			<FileConfiguration
-				Name="debug_shared|x64"
-				>
+				Name="debug_shared|x64">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
-				Name="release_shared|x64"
-				>
+				Name="release_shared|x64">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_mt|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_mt|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="debug_static_md|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 			<FileConfiguration
 				Name="release_static_md|x64"
-				ExcludedFromBuild="true"
-				>
+				ExcludedFromBuild="true">
 				<Tool
-					Name="VCResourceCompilerTool"
-				/>
+					Name="VCResourceCompilerTool"/>
 			</FileConfiguration>
 		</File>
 	</Files>
-	<Globals>
-	</Globals>
+	<Globals/>
 </VisualStudioProject>