chore(NetSSL): msvc project files

NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -708,6 +708,8 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h" />
     <ClInclude Include="src\HTTPSTestServer.h" />
     <ClInclude Include="src\NetSSLTestSuite.h" />
+    <ClInclude Include="src\SecureStreamSocketTest.h" />
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h" />
     <ClInclude Include="src\TCPServerTest.h" />
     <ClInclude Include="src\TCPServerTestSuite.h" />
     <ClInclude Include="src\WebSocketTest.h" />
@@ -769,6 +771,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp" />
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp" />
     <ClCompile Include="src\TCPServerTest.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>

NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj.filters

@@ -70,6 +70,15 @@
     <Filter Include="FTPSClient\Source Files">
       <UniqueIdentifier>{a6261ec6-e08d-4c71-875f-5c72bfcf310d}</UniqueIdentifier>
     </Filter>
+    <Filter Include="SecureSocket">
+      <UniqueIdentifier>{a01c89f1-e268-4d8d-86fa-2737e47b88b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Header Files">
+      <UniqueIdentifier>{76dec4a5-2ee6-4774-aa6c-c2d0bc979bbe}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Source Files">
+      <UniqueIdentifier>{6bbfea19-8600-4083-be33-6b343d521e4b}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\HTTPSTestServer.h">
@@ -114,6 +123,12 @@
     <ClInclude Include="src\FTPSClientTestSuite.h">
       <Filter>FTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTest.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -161,5 +176,11 @@
     <ClCompile Include="src\FTPSClientTestSuite.cpp">
       <Filter>FTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|ARM64">
@@ -1047,6 +1047,8 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h" />
     <ClInclude Include="src\HTTPSTestServer.h" />
     <ClInclude Include="src\NetSSLTestSuite.h" />
+    <ClInclude Include="src\SecureStreamSocketTest.h" />
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h" />
     <ClInclude Include="src\TCPServerTest.h" />
     <ClInclude Include="src\TCPServerTestSuite.h" />
     <ClInclude Include="src\WebSocketTest.h" />
@@ -1108,6 +1110,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp" />
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp" />
     <ClCompile Include="src\TCPServerTest.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>

NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj.filters

@@ -70,6 +70,15 @@
     <Filter Include="FTPSClient\Source Files">
       <UniqueIdentifier>{93a3a5f8-8056-435b-86ca-ef2fb15351c8}</UniqueIdentifier>
     </Filter>
+    <Filter Include="SecureSocket">
+      <UniqueIdentifier>{a5fbbc5a-297c-465b-a150-e7e4f9078eef}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Header Files">
+      <UniqueIdentifier>{ed2ce712-70d3-45cc-a0d1-ca8823321ca6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Source Files">
+      <UniqueIdentifier>{432fbf93-c96e-47a5-888f-aa786982fdb3}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\HTTPSTestServer.h">
@@ -114,6 +123,12 @@
     <ClInclude Include="src\FTPSClientTestSuite.h">
       <Filter>FTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTest.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -161,5 +176,11 @@
     <ClCompile Include="src\FTPSClientTestSuite.cpp">
       <Filter>FTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj

@@ -764,6 +764,34 @@
 				</File>
 			</Filter>
 		</Filter>
+		<Filter
+			Name="SecureSocket"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath=".\src\SecureStreamSocketTest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\SecureStreamSocketTestSuite.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath=".\src\SecureStreamSocketTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\SecureStreamSocketTestSuite.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
 	</Files>
 	<Globals>
 	</Globals>

NetSSL_Win/testsuite/TestSuite_vs160.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|Win32">
@@ -654,8 +654,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h" />
     <ClInclude Include="src\HTTPSTestServer.h" />
     <ClInclude Include="src\NetSSLTestSuite.h" />
+    <ClInclude Include="src\SecureStreamSocketTest.h" />
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h" />
     <ClInclude Include="src\TCPServerTest.h" />
     <ClInclude Include="src\TCPServerTestSuite.h" />
+    <ClInclude Include="src\WebSocketTest.h" />
+    <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Driver.cpp">
@@ -698,6 +702,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp" />
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp" />
     <ClCompile Include="src\TCPServerTest.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -708,6 +714,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

NetSSL_Win/testsuite/TestSuite_vs160.vcxproj.filters

@@ -52,6 +52,24 @@
     <Filter Include="HTTPSClient\Source Files">
       <UniqueIdentifier>{fd8022c1-22bd-4625-af5a-10bd378a95bb}</UniqueIdentifier>
     </Filter>
+    <Filter Include="SecureSocket">
+      <UniqueIdentifier>{7dd8cb36-bdb2-42f8-8417-55394d5fdd62}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Header Files">
+      <UniqueIdentifier>{9d9fc789-de25-4b65-ab74-b2fbcea13b6d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Source Files">
+      <UniqueIdentifier>{7d900974-e475-4868-a421-05e27a263725}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{d10f11d0-44f3-4926-8117-2403b24bbd58}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{c4a90c4a-ab95-4d8d-9bef-780bdc8225b4}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{e0400fb5-388e-4d4d-aae6-f987e019c57e}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\HTTPSTestServer.h">
@@ -81,6 +99,18 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTest.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +143,17 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

NetSSL_Win/testsuite/TestSuite_vs170.vcxproj

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="debug_shared|ARM64">
@@ -969,8 +969,12 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h" />
     <ClInclude Include="src\HTTPSTestServer.h" />
     <ClInclude Include="src\NetSSLTestSuite.h" />
+    <ClInclude Include="src\SecureStreamSocketTest.h" />
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h" />
     <ClInclude Include="src\TCPServerTest.h" />
     <ClInclude Include="src\TCPServerTestSuite.h" />
+    <ClInclude Include="src\WebSocketTest.h" />
+    <ClInclude Include="src\WebSocketTestSuite.h" />
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\Driver.cpp">
@@ -1013,6 +1017,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp" />
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp" />
     <ClCompile Include="src\TCPServerTest.cpp">
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
       <LanguageStandard>stdcpp17</LanguageStandard>
@@ -1023,6 +1029,8 @@
       <LanguageStandard>stdcpp17</LanguageStandard>
       <LanguageStandard_C>stdc11</LanguageStandard_C>
     </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp" />
+    <ClCompile Include="src\WebSocketTestSuite.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets" />

NetSSL_Win/testsuite/TestSuite_vs170.vcxproj.filters

@@ -52,6 +52,24 @@
     <Filter Include="HTTPSClient\Source Files">
       <UniqueIdentifier>{90c43e80-1ba2-4e5c-9054-2796df1113e4}</UniqueIdentifier>
     </Filter>
+    <Filter Include="WebSocket">
+      <UniqueIdentifier>{04bc257c-ada9-4922-b5ef-22e505d8212f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Header Files">
+      <UniqueIdentifier>{79d4cac4-4127-40ba-b039-eff4bf4e473d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="WebSocket\Source Files">
+      <UniqueIdentifier>{706074a0-340b-49d0-a058-3543522ef6ab}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket">
+      <UniqueIdentifier>{010f9272-1b8e-46f1-8cae-4649e0459133}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Header Files">
+      <UniqueIdentifier>{8c5d49dd-dd83-49e0-af18-93b1b7e1b135}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SecureSocket\Source Files">
+      <UniqueIdentifier>{5912c872-6357-4db0-af6b-c4c03591f3ad}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\HTTPSTestServer.h">
@@ -81,6 +99,18 @@
     <ClInclude Include="src\HTTPSStreamFactoryTest.h">
       <Filter>HTTPSClient\Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTest.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SecureStreamSocketTestSuite.h">
+      <Filter>SecureSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTest.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\WebSocketTestSuite.h">
+      <Filter>WebSocket\Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="src\HTTPSTestServer.cpp">
@@ -113,5 +143,17 @@
     <ClCompile Include="src\HTTPSStreamFactoryTest.cpp">
       <Filter>HTTPSClient\Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTest.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SecureStreamSocketTestSuite.cpp">
+      <Filter>SecureSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTest.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WebSocketTestSuite.cpp">
+      <Filter>WebSocket\Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
 </Project>

NetSSL_Win/testsuite/TestSuite_vs90.vcproj

@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="Windows-1252"?>
 <VisualStudioProject
-	Name="TestSuite"
-	Version="9.00"
 	ProjectType="Visual C++"
+	Version="9.00"
+	Name="TestSuite"
 	ProjectGUID="{25E8E5AB-7B9C-4A2F-A0F6-12B6C5B11F28}"
 	RootNamespace="TestSuite"
-	Keyword="Win32Proj">
+	Keyword="Win32Proj"
+	TargetFrameworkVersion="0"
+	>
 	<Platforms>
 		<Platform
-			Name="Win32"/>
+			Name="Win32"
+		/>
 	</Platforms>
-	<ToolFiles/>
+	<ToolFiles>
+	</ToolFiles>
 	<Configurations>
 		<Configuration
 			Name="debug_shared|Win32"
@@ -18,19 +22,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;"
@@ -48,39 +59,50 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\TestSuited.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\lib"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="bin\TestSuited.pdb"
 				SubSystem="1"
 				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"
@@ -88,19 +110,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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"
@@ -120,15 +149,19 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\TestSuite.exe"
 				LinkIncremental="1"
@@ -138,21 +171,28 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				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"
@@ -160,19 +200,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
@@ -190,40 +237,51 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\static_mt\TestSuited.exe"
 				LinkIncremental="2"
+				SuppressStartupBanner="true"
 				AdditionalLibraryDirectories="..\..\lib"
 				IgnoreDefaultLibraryNames="nafxcwd.lib"
-				SuppressStartupBanner="true"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="bin\static_mt\TestSuited.pdb"
 				SubSystem="1"
 				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_static_mt|Win32"
@@ -231,19 +289,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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"
@@ -263,15 +328,19 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\static_mt\TestSuite.exe"
 				LinkIncremental="1"
@@ -282,21 +351,28 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				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_md|Win32"
@@ -304,19 +380,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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"
 				AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include"
 				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;"
@@ -334,39 +417,50 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\static_md\TestSuited.exe"
 				LinkIncremental="2"
-				AdditionalLibraryDirectories="..\..\lib"
 				SuppressStartupBanner="true"
+				AdditionalLibraryDirectories="..\..\lib"
 				GenerateDebugInformation="true"
 				ProgramDatabaseFile="bin\static_md\TestSuited.pdb"
 				SubSystem="1"
 				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_static_md|Win32"
@@ -374,19 +468,26 @@
 			IntermediateDirectory="obj\$(ConfigurationName)"
 			ConfigurationType="1"
 			UseOfMFC="0"
-			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"
@@ -406,15 +507,19 @@
 				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="ws2_32.lib iphlpapi.lib Crypt32.lib"
 				OutputFile="bin\static_md\TestSuite.exe"
 				LinkIncremental="1"
@@ -424,114 +529,234 @@
 				OptimizeReferences="2"
 				EnableCOMDATFolding="2"
 				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>
 	</Configurations>
-	<References/>
+	<References>
+	</References>
 	<Files>
 		<Filter
-			Name="HTTPS">
+			Name="HTTPS"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSTestServer.h"/>
+					RelativePath=".\src\HTTPSTestServer.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSTestServer.cpp"/>
+					RelativePath=".\src\HTTPSTestServer.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="_Suite">
+			Name="_Suite"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\src\NetSSLTestSuite.h"/>
+					RelativePath=".\src\NetSSLTestSuite.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\NetSSLTestSuite.cpp"/>
+					RelativePath=".\src\NetSSLTestSuite.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="_Driver">
+			Name="_Driver"
+			>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\Driver.cpp"/>
+					RelativePath=".\src\Driver.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="TCPServer">
+			Name="TCPServer"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\src\TCPServerTest.h"/>
+					RelativePath=".\src\TCPServerTest.h"
+					>
+				</File>
 				<File
-					RelativePath=".\src\TCPServerTestSuite.h"/>
+					RelativePath=".\src\TCPServerTestSuite.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\TCPServerTest.cpp"/>
+					RelativePath=".\src\TCPServerTest.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\TCPServerTestSuite.cpp"/>
+					RelativePath=".\src\TCPServerTestSuite.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="HTTPSServer">
+			Name="HTTPSServer"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSServerTest.h"/>
+					RelativePath=".\src\HTTPSServerTest.h"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSServerTestSuite.h"/>
+					RelativePath=".\src\HTTPSServerTestSuite.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSServerTest.cpp"/>
+					RelativePath=".\src\HTTPSServerTest.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSServerTestSuite.cpp"/>
+					RelativePath=".\src\HTTPSServerTestSuite.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 		<Filter
-			Name="HTTPSClient">
+			Name="HTTPSClient"
+			>
 			<Filter
-				Name="Header Files">
+				Name="Header Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSClientSessionTest.h"/>
+					RelativePath=".\src\HTTPSClientSessionTest.h"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSClientTestSuite.h"/>
+					RelativePath=".\src\HTTPSClientTestSuite.h"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSStreamFactoryTest.h"/>
+					RelativePath=".\src\HTTPSStreamFactoryTest.h"
+					>
+				</File>
 			</Filter>
 			<Filter
-				Name="Source Files">
+				Name="Source Files"
+				>
 				<File
-					RelativePath=".\src\HTTPSClientSessionTest.cpp"/>
+					RelativePath=".\src\HTTPSClientSessionTest.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSClientTestSuite.cpp"/>
+					RelativePath=".\src\HTTPSClientTestSuite.cpp"
+					>
+				</File>
 				<File
-					RelativePath=".\src\HTTPSStreamFactoryTest.cpp"/>
+					RelativePath=".\src\HTTPSStreamFactoryTest.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="SecureSocket"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath=".\src\SecureStreamSocketTest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\SecureStreamSocketTestSuite.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath=".\src\SecureStreamSocketTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\SecureStreamSocketTestSuite.cpp"
+					>
+				</File>
+			</Filter>
+		</Filter>
+		<Filter
+			Name="WebSocket"
+			>
+			<Filter
+				Name="Header Files"
+				>
+				<File
+					RelativePath=".\src\WebSocketTest.h"
+					>
+				</File>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.h"
+					>
+				</File>
+			</Filter>
+			<Filter
+				Name="Source Files"
+				>
+				<File
+					RelativePath=".\src\WebSocketTest.cpp"
+					>
+				</File>
+				<File
+					RelativePath=".\src\WebSocketTestSuite.cpp"
+					>
+				</File>
 			</Filter>
 		</Filter>
 	</Files>
-	<Globals/>
+	<Globals>
+	</Globals>
 </VisualStudioProject>