fix(ProGen): regen CppUnit and Net VS projects

2024-12-12 18:20:26 +01:00 · 2023-11-06 17:07:32 +01:00 · 2023-11-06 17:07:32 +01:00 · 442be3fe57
commit 442be3fe57
parent fb1fb41466
6 changed files with 1157 additions and 719 deletions
--- a/CppUnit/CppUnit_vs170.vcxproj
+++ b/CppUnit/CppUnit_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">
@ -80,7 +80,6 @@
    <ProjectGuid>{138BB448-808A-4FE5-A66D-78D1F8770F59}</ProjectGuid>
    <RootNamespace>CppUnit</RootNamespace>
    <Keyword>Win32Proj</Keyword>
    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
@ -231,7 +230,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros"/>
  <PropertyGroup>
-    <_ProjectFileVersion>17.0.32505.173</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">CppUnitA64d</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">CppUnitmdd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">CppUnitmtd</TargetName>
@ -345,12 +344,11 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
-      <LanguageStandard>stdcpp17</LanguageStandard>
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
-      <OutputFile>..\binA64\$(TargetName).dll</OutputFile>
+      <OutputFile>..\binA64\CppUnitA64d.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
@ -379,11 +377,11 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Link>
-      <OutputFile>..\binA64\$(TargetName).dll</OutputFile>
+      <OutputFile>..\binA64\CppUnitA64.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
@ -412,10 +410,9 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Lib>
-      <OutputFile>..\libA64\$(TargetName).lib</OutputFile>
+      <OutputFile>..\libA64\CppUnitmtd.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">
@ -437,11 +434,11 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Lib>
-      <OutputFile>..\libA64\$(TargetName).lib</OutputFile>
+      <OutputFile>..\libA64\CppUnitmt.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">
@ -462,10 +459,9 @@
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Lib>
-      <OutputFile>..\libA64\$(TargetName).lib</OutputFile>
+      <OutputFile>..\libA64\CppUnitmdd.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">
@ -487,11 +483,11 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
      <LanguageStandard>stdcpp17</LanguageStandard>
    </ClCompile>
    <Lib>
-      <OutputFile>..\libA64\$(TargetName).lib</OutputFile>
+      <OutputFile>..\libA64\CppUnitmd.lib</OutputFile>
    </Lib>
  </ItemDefinitionGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
@ -510,13 +506,14 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <OutputFile>..\bin\CppUnitd.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary>
@ -542,6 +539,7 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
@ -569,7 +567,7 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
@ -598,6 +596,7 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -617,7 +616,7 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
@ -643,7 +642,7 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\CppUnitmd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
@ -669,13 +668,14 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <OutputFile>..\bin64\CppUnit64d.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary>
@ -701,6 +701,7 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
@ -728,7 +729,7 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
@ -757,6 +758,7 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -776,7 +778,7 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
@ -805,6 +807,7 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
--- a/CppUnit/CppUnit_vs170.vcxproj.filters
+++ b/CppUnit/CppUnit_vs170.vcxproj.filters
@ -2,11 +2,11 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="Source Files">
-      <UniqueIdentifier>{52c8067a-54e6-44bf-a510-eb95e4ec9865}</UniqueIdentifier>
+      <UniqueIdentifier>{84e2f454-350e-4e2b-8bfd-f3cbbb62f23c}</UniqueIdentifier>
      <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
    </Filter>
    <Filter Include="Include Files">
-      <UniqueIdentifier>{d1a255dc-fbfb-43a1-ad75-b34778d06787}</UniqueIdentifier>
+      <UniqueIdentifier>{e32858e2-8161-4416-aa5b-e230b409f24b}</UniqueIdentifier>
      <Extensions>*.h</Extensions>
    </Filter>
  </ItemGroup>
--- a/Net/Net_vs170.vcxproj
+++ b/Net/Net_vs170.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="debug_shared|ARM64">
      <Configuration>debug_shared</Configuration>
@ -75,6 +75,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>17.0</VCProjectVersion>
    <ProjectName>Net</ProjectName>
    <ProjectGuid>{B057A1FE-09F7-465E-B8B5-E1B659051D76}</ProjectGuid>
    <RootNamespace>Net</RootNamespace>
@ -83,33 +84,33 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="Configuration">
    <ConfigurationType>StaticLibrary</ConfigurationType>
@ -163,34 +164,33 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
    <ConfigurationType>DynamicLibrary</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings">
+  <ImportGroup Label="ExtensionSettings"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
@ -211,26 +211,44 @@
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <PropertyGroup Label="UserMacros"/>
  <PropertyGroup>
-    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">PocoNetA64d</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">PocoNetmdd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">PocoNetmtd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">PocoNetA64</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">PocoNetmd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">PocoNetmt</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">PocoNet</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">PocoNetmd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">PocoNetmt</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">PocoNet64d</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">PocoNetmdd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">PocoNetmtd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">PocoNet64</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">PocoNetmd</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">PocoNetmt</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
    <OutDir>..\binA64\</OutDir>
@ -326,7 +344,8 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
@ -334,7 +353,7 @@
      <OutputFile>..\binA64\PocoNetA64d.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\binA64\PocoNetA64d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalLibraryDirectories>..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\libA64\PocoNetd.lib</ImportLibrary>
@ -360,7 +379,8 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
@ -389,11 +409,11 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\libA64\PocoNetmtd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -419,7 +439,8 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -439,11 +460,11 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\libA64\PocoNetmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -469,7 +490,8 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
@ -492,14 +514,16 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>..\bin\PocoNetd.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\bin\PocoNetd.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\lib\PocoNetd.lib</ImportLibrary>
@ -525,7 +549,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -553,11 +579,12 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoNetmtd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib\PocoNetmtd.lib</OutputFile>
@ -582,7 +609,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib\PocoNetmt.lib</OutputFile>
@ -601,11 +630,12 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoNetmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib\PocoNetmdd.lib</OutputFile>
@ -627,11 +657,12 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib\PocoNetmd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -654,14 +685,16 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
      <OutputFile>..\bin64\PocoNet64d.dll</OutputFile>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>..\bin64\PocoNet64d.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SubSystem>Console</SubSystem>
      <ImportLibrary>..\lib64\PocoNetd.lib</ImportLibrary>
@ -687,7 +720,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -715,11 +750,12 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoNetmtd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib64\PocoNetmtd.lib</OutputFile>
@ -744,7 +780,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib64\PocoNetmt.lib</OutputFile>
@ -763,11 +801,12 @@
      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
      <RuntimeTypeInfo>true</RuntimeTypeInfo>
      <PrecompiledHeader/>
-      <ProgramDataBaseFileName>..\lib64\PocoNetmdd.pdb</ProgramDataBaseFileName>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib64\PocoNetmdd.lib</OutputFile>
@ -792,7 +831,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Lib>
      <OutputFile>..\lib64\PocoNetmd.lib</OutputFile>
@ -919,113 +960,327 @@
    <ClInclude Include="src\wepoll.h"/>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp" />
+    <ClCompile Include="src\AbstractHTTPRequestHandler.cpp">
-    <ClCompile Include="src\DatagramSocket.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\DatagramSocketImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\DialogSocket.cpp" />
+    <ClCompile Include="src\DatagramSocket.cpp">
-    <ClCompile Include="src\DNS.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\FilePartSource.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\FTPClientSession.cpp" />
+    <ClCompile Include="src\DatagramSocketImpl.cpp">
-    <ClCompile Include="src\FTPStreamFactory.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HostEntry.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTMLForm.cpp" />
+    <ClCompile Include="src\DialogSocket.cpp">
-    <ClCompile Include="src\HTTPAuthenticationParams.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPBasicCredentials.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPBufferAllocator.cpp" />
+    <ClCompile Include="src\DNS.cpp">
-    <ClCompile Include="src\HTTPChunkedStream.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPClientSession.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPCookie.cpp" />
+    <ClCompile Include="src\FilePartSource.cpp">
-    <ClCompile Include="src\HTTPCredentials.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPDigestCredentials.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPFixedLengthStream.cpp" />
+    <ClCompile Include="src\FTPClientSession.cpp">
-    <ClCompile Include="src\HTTPHeaderStream.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPIOStream.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPMessage.cpp" />
+    <ClCompile Include="src\FTPStreamFactory.cpp">
-    <ClCompile Include="src\HTTPNTLMCredentials.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPRequest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPRequestHandler.cpp" />
+    <ClCompile Include="src\HostEntry.cpp">
-    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPResponse.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPServer.cpp" />
+    <ClCompile Include="src\HTMLForm.cpp">
-    <ClCompile Include="src\HTTPServerConnection.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPServerConnectionFactory.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPServerParams.cpp" />
+    <ClCompile Include="src\HTTPAuthenticationParams.cpp">
-    <ClCompile Include="src\HTTPServerRequest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPServerRequestImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPServerResponse.cpp" />
+    <ClCompile Include="src\HTTPBasicCredentials.cpp">
-    <ClCompile Include="src\HTTPServerResponseImpl.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPServerSession.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPSession.cpp" />
+    <ClCompile Include="src\HTTPBufferAllocator.cpp">
-    <ClCompile Include="src\HTTPSessionFactory.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPSessionInstantiator.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPStream.cpp" />
+    <ClCompile Include="src\HTTPChunkedStream.cpp">
-    <ClCompile Include="src\HTTPStreamFactory.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ICMPClient.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\ICMPEventArgs.cpp" />
+    <ClCompile Include="src\HTTPClientSession.cpp">
-    <ClCompile Include="src\ICMPPacket.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ICMPPacketImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\ICMPSocket.cpp" />
+    <ClCompile Include="src\HTTPCookie.cpp">
-    <ClCompile Include="src\ICMPSocketImpl.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ICMPv4PacketImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\IPAddress.cpp" />
+    <ClCompile Include="src\HTTPCredentials.cpp">
-    <ClCompile Include="src\IPAddressImpl.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MailMessage.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MailRecipient.cpp" />
+    <ClCompile Include="src\HTTPDigestCredentials.cpp">
-    <ClCompile Include="src\MailStream.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MediaType.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MessageHeader.cpp" />
+    <ClCompile Include="src\HTTPFixedLengthStream.cpp">
-    <ClCompile Include="src\MulticastSocket.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MultipartReader.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MultipartWriter.cpp" />
+    <ClCompile Include="src\HTTPHeaderStream.cpp">
-    <ClCompile Include="src\NameValueCollection.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\Net.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NetException.cpp" />
+    <ClCompile Include="src\HTTPIOStream.cpp">
-    <ClCompile Include="src\NetworkInterface.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\NTLMCredentials.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NTPClient.cpp" />
+    <ClCompile Include="src\HTTPMessage.cpp">
-    <ClCompile Include="src\NTPEventArgs.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\NTPPacket.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NullPartHandler.cpp" />
+    <ClCompile Include="src\HTTPNTLMCredentials.cpp">
-    <ClCompile Include="src\OAuth10Credentials.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\OAuth20Credentials.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\PartHandler.cpp" />
+    <ClCompile Include="src\HTTPRequest.cpp">
-    <ClCompile Include="src\PartSource.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\PartStore.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\PollSet.cpp" />
+    <ClCompile Include="src\HTTPRequestHandler.cpp">
-    <ClCompile Include="src\POP3ClientSession.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\QuotedPrintableDecoder.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableEncoder.cpp" />
+    <ClCompile Include="src\HTTPRequestHandlerFactory.cpp">
-    <ClCompile Include="src\RawSocket.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\RawSocketImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\RemoteSyslogChannel.cpp" />
+    <ClCompile Include="src\HTTPResponse.cpp">
-    <ClCompile Include="src\RemoteSyslogListener.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ServerSocket.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\ServerSocketImpl.cpp" />
+    <ClCompile Include="src\HTTPServer.cpp">
-    <ClCompile Include="src\SMTPChannel.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SMTPClientSession.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\Socket.cpp" />
+    <ClCompile Include="src\HTTPServerConnection.cpp">
-    <ClCompile Include="src\SocketAddress.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SocketAddressImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SocketImpl.cpp" />
+    <ClCompile Include="src\HTTPServerConnectionFactory.cpp">
-    <ClCompile Include="src\SocketNotification.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SocketNotifier.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SocketProactor.cpp" />
+    <ClCompile Include="src\HTTPServerParams.cpp">
-    <ClCompile Include="src\SocketReactor.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SocketStream.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SSPINTLMCredentials.cpp" />
+    <ClCompile Include="src\HTTPServerRequest.cpp">
-    <ClCompile Include="src\StreamSocket.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\StreamSocketImpl.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\StringPartSource.cpp" />
+    <ClCompile Include="src\HTTPServerRequestImpl.cpp">
-    <ClCompile Include="src\TCPServer.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\TCPServerConnection.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\TCPServerConnectionFactory.cpp" />
+    <ClCompile Include="src\HTTPServerResponse.cpp">
-    <ClCompile Include="src\TCPServerDispatcher.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\TCPServerParams.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\UDPClient.cpp" />
+    <ClCompile Include="src\HTTPServerResponseImpl.cpp">
-    <ClCompile Include="src\UDPServerParams.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\WebSocket.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\WebSocketImpl.cpp" />
+    <ClCompile Include="src\HTTPServerSession.cpp">
-    <ClCompile Include="src\wepoll.c" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\HTTPSession.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\HTTPSessionFactory.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\HTTPSessionInstantiator.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\HTTPStream.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\HTTPStreamFactory.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPClient.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPEventArgs.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPPacket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPPacketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPSocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPv4PacketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\IPAddress.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\IPAddressImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailMessage.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailRecipient.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailStream.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MediaType.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MessageHeader.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MulticastSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MultipartReader.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MultipartWriter.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NameValueCollection.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\Net.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NetException.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NetworkInterface.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTLMCredentials.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTPClient.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTPEventArgs.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTPPacket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NullPartHandler.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\OAuth10Credentials.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\OAuth20Credentials.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\PartHandler.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\PartSource.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\PartStore.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\PollSet.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\POP3ClientSession.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\QuotedPrintableDecoder.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\QuotedPrintableEncoder.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\RawSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\RawSocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\RemoteSyslogChannel.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\RemoteSyslogListener.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ServerSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ServerSocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SMTPChannel.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SMTPClientSession.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\Socket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketAddress.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketAddressImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketNotification.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketNotifier.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketProactor.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketReactor.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketStream.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SSPINTLMCredentials.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\StreamSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\StreamSocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\StringPartSource.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServer.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerConnection.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerConnectionFactory.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerDispatcher.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerParams.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\UDPClient.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\UDPServerParams.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\WebSocket.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\WebSocketImpl.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\wepoll.c">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
  </ItemGroup>
  <ItemGroup>
    <ResourceCompile Include="..\DLLVersion.rc">
@ -1044,6 +1299,5 @@
    </ResourceCompile>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets">
+  <ImportGroup Label="ExtensionTargets"/>
  </ImportGroup>
 </Project>
--- a/Net/Net_vs170.vcxproj.filters
+++ b/Net/Net_vs170.vcxproj.filters
@ -2,166 +2,166 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="NetCore">
-      <UniqueIdentifier>{0327a3ad-30cf-4db6-a801-53911cef2882}</UniqueIdentifier>
+      <UniqueIdentifier>{90277211-36fe-44fa-8779-bee1b27c0b33}</UniqueIdentifier>
    </Filter>
    <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{5bb088f8-9b67-443b-ba87-88c89083d108}</UniqueIdentifier>
+      <UniqueIdentifier>{dde6886a-711b-4b19-8ede-16e0946b3dd3}</UniqueIdentifier>
    </Filter>
    <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{c2212b81-c615-43ae-bc4b-538ea9acbd0c}</UniqueIdentifier>
+      <UniqueIdentifier>{225e8c7b-6770-4930-a8a6-de55b4e51c6f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets">
-      <UniqueIdentifier>{22aeb535-82d3-48de-bcc1-4855d0fa6957}</UniqueIdentifier>
+      <UniqueIdentifier>{89f0837c-8470-476c-872e-2feb780c3755}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{7c491825-976b-44a7-a830-3bf552a20300}</UniqueIdentifier>
+      <UniqueIdentifier>{2adaae0b-b111-47fc-8613-a8eda7c657b8}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{0ee833b1-e45b-4288-ae5e-91b76b4df09a}</UniqueIdentifier>
+      <UniqueIdentifier>{6b763933-275b-43db-8351-c759be910124}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages">
-      <UniqueIdentifier>{972bf346-2819-4b15-a005-ee821590335d}</UniqueIdentifier>
+      <UniqueIdentifier>{c8823488-ff33-4000-bc95-a32a4962bc5f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{790ee1d2-7e0b-4db9-b4a1-ed41b7577deb}</UniqueIdentifier>
+      <UniqueIdentifier>{66abd578-d1d6-4f71-b3b6-6442be8027ea}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{55ac476f-f77d-4bfa-a347-3e9d62a154bb}</UniqueIdentifier>
+      <UniqueIdentifier>{04a41c32-4f81-4630-8251-aebaac657dde}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP">
-      <UniqueIdentifier>{1121319e-26fe-4b5e-a99c-a9ad657feb1c}</UniqueIdentifier>
+      <UniqueIdentifier>{a1b32860-4beb-44c8-be19-9ce8f80a8628}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{66afe532-112f-4a65-8a48-6c283fe312ca}</UniqueIdentifier>
+      <UniqueIdentifier>{f3e1e652-16e3-4251-953d-dfbe62ea3982}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{010f68d2-86e0-4871-a30d-80e385d03fc9}</UniqueIdentifier>
+      <UniqueIdentifier>{eb9d676b-c46b-4256-a316-d50aa6d696db}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{c1508524-5428-4ed9-80bd-42156bc3f7e3}</UniqueIdentifier>
+      <UniqueIdentifier>{be5fbb21-ee3d-4a3b-824d-a93663d3b5b5}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{512b50b6-03cd-4491-897f-8eaaceef5fa4}</UniqueIdentifier>
+      <UniqueIdentifier>{4bf59802-369d-44b5-b5e2-27de877443b7}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{7a34e468-42db-41db-99b6-1c5143cf4720}</UniqueIdentifier>
+      <UniqueIdentifier>{2d040338-7189-4832-885f-c35df5e0261e}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer">
-      <UniqueIdentifier>{6a67a7a9-4e13-4aa9-a393-7d2bec8dfb40}</UniqueIdentifier>
+      <UniqueIdentifier>{65ff22c9-dc2e-4dd6-806f-112e50a728a3}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{2d54ebba-8e9d-417e-9da3-e02e349e3b64}</UniqueIdentifier>
+      <UniqueIdentifier>{171a9cfa-0f74-4258-b1cb-e8bc2f542719}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{9f7d4901-70e6-4271-8063-e1fce4ab7021}</UniqueIdentifier>
+      <UniqueIdentifier>{700a3455-e21e-4b83-bbde-3bbf58da3ac2}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient">
-      <UniqueIdentifier>{06bdc7d7-2fbd-4b4d-b2aa-c9ecb51c7bc5}</UniqueIdentifier>
+      <UniqueIdentifier>{491c59ae-0899-40d7-88e8-27b4b3bd341c}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{82980e3e-becb-4db7-9fd3-5e33aa1c8abc}</UniqueIdentifier>
+      <UniqueIdentifier>{e318a0ee-2d73-454f-a372-1cb32986fcbf}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{5cc883c1-7f7a-4444-81ea-fffa841fad3c}</UniqueIdentifier>
+      <UniqueIdentifier>{7bbbe1fd-5699-4d47-aeea-5c4ae76e0ed1}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML">
-      <UniqueIdentifier>{5069cc08-95e8-438c-a95c-3bfb44046feb}</UniqueIdentifier>
+      <UniqueIdentifier>{e1c20e0e-cf9d-4388-ae15-747c642452ee}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{7f600cd5-030c-416a-83bd-b55f27861921}</UniqueIdentifier>
+      <UniqueIdentifier>{e7c37000-31b5-4d4d-8b8e-ebb4b91e22aa}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{5e34956e-7957-4a58-9d36-3a41b799fdd7}</UniqueIdentifier>
+      <UniqueIdentifier>{303f1252-d50c-45f5-ad39-9538d48e7da8}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient">
-      <UniqueIdentifier>{b4a00fb0-4b7a-4f84-8c4f-bc3f54f0801e}</UniqueIdentifier>
+      <UniqueIdentifier>{64d4ca86-bc0e-47cd-93cb-1688b08c7dbc}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{a4548540-c2f7-47d4-a163-7420617948da}</UniqueIdentifier>
+      <UniqueIdentifier>{ac6da4d0-ff1d-4845-8655-c1d7bb8af706}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{8772fa07-ac53-41cd-aa2b-c99d1cde05c7}</UniqueIdentifier>
+      <UniqueIdentifier>{59dfc623-2f30-4dee-9e7f-b9ea32311877}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor">
-      <UniqueIdentifier>{826fb5ae-5563-45ac-bce3-24414626f0a8}</UniqueIdentifier>
+      <UniqueIdentifier>{e35f97d2-6c4e-4101-b8d9-2d40a6e1f8d6}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{df60d666-f912-4618-9bba-72e28295cb94}</UniqueIdentifier>
+      <UniqueIdentifier>{d4f6b235-3727-43b1-a45c-97634a88bcb5}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{1787e2b6-d541-4b16-93a2-e66e636f4770}</UniqueIdentifier>
+      <UniqueIdentifier>{729c6f41-45c3-445c-9eaf-adc6fa2ab957}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{4d782d56-61d9-423e-b668-07358c5acf2e}</UniqueIdentifier>
+      <UniqueIdentifier>{1c1aa126-7035-4c6c-b4a6-6db4bb9ba7b8}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{ac70d310-02cd-4084-b6e8-a8394c3da327}</UniqueIdentifier>
+      <UniqueIdentifier>{697d988f-e82e-4b9a-a763-4e20e959246e}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{87711a59-71ae-41ed-9058-a7f975bb4cd6}</UniqueIdentifier>
+      <UniqueIdentifier>{5f209277-2d19-4d78-b6f6-eb69ff9d169a}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP">
-      <UniqueIdentifier>{891c3f22-1a25-4d1c-af8c-92621b530082}</UniqueIdentifier>
+      <UniqueIdentifier>{97dc13ec-7fd0-4bd0-88d7-d3f4e8b5aaf0}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{61cd8667-c43a-42ad-80ad-2c012e3a63a8}</UniqueIdentifier>
+      <UniqueIdentifier>{82036806-9daf-40ea-97a9-7fa9d48d2c76}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{2d2fc73b-7622-4cdf-b9a2-431d8cef5b6d}</UniqueIdentifier>
+      <UniqueIdentifier>{d44c2015-66b4-41bb-bab8-ce94e0642356}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP">
-      <UniqueIdentifier>{ec40a7ac-6125-4cc1-b6ae-25f245629278}</UniqueIdentifier>
+      <UniqueIdentifier>{67442bc4-3f65-4814-8a73-98a91d70f29d}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{50f1d5a8-30e3-44a0-a52e-5a3445aa6638}</UniqueIdentifier>
+      <UniqueIdentifier>{bd80dc76-0f7c-4c57-b1d6-1211abc0b0f1}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{f5c8df69-6521-4f35-a31c-103322795b54}</UniqueIdentifier>
+      <UniqueIdentifier>{6a5f03bb-b749-40b5-86a2-8662f0ff7dfe}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging">
-      <UniqueIdentifier>{8fe68575-229a-4caa-8f62-ee1cce1856fe}</UniqueIdentifier>
+      <UniqueIdentifier>{f535b5d2-7a50-45aa-8ce1-d427d3a7e54c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{d7259566-fbb7-4998-a4e4-56dae77866a7}</UniqueIdentifier>
+      <UniqueIdentifier>{575be2dd-dcee-4599-a534-e51c4cbab323}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{47d3ce03-365c-4c13-86d0-342e99ebe32c}</UniqueIdentifier>
+      <UniqueIdentifier>{60d2fad0-8bae-4b91-a14c-f9b782c0d8ba}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{1bc55eb6-3c68-44e9-a929-ae46d1d11922}</UniqueIdentifier>
+      <UniqueIdentifier>{26842ddd-3b15-47f6-a5a0-b4044213e4b5}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{d79dbf11-3184-4558-acb9-a94cb0f0a461}</UniqueIdentifier>
+      <UniqueIdentifier>{db4b2298-756d-4f33-8047-e122cbf5ee67}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{b99e11f4-018c-45c9-84d4-47c1c17fd78b}</UniqueIdentifier>
+      <UniqueIdentifier>{4f92c211-e6a2-401d-b04e-887f42165a06}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth">
-      <UniqueIdentifier>{b35c8bbe-07c0-4f48-8236-5ffde07e185d}</UniqueIdentifier>
+      <UniqueIdentifier>{66d9c5ee-26b0-43d1-9a58-e257d9a76b59}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{b56349c5-6624-47fd-aeb6-0d48502db985}</UniqueIdentifier>
+      <UniqueIdentifier>{c0fc6593-fd16-4366-a83a-cae87e1fae2f}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{6df2f132-e07c-4ec2-b2fc-10262a58892b}</UniqueIdentifier>
+      <UniqueIdentifier>{08828b81-6913-4920-9f47-369439c27b3a}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP">
-      <UniqueIdentifier>{a313fb55-54b0-487c-86e6-fd0b3de340f0}</UniqueIdentifier>
+      <UniqueIdentifier>{1ba12463-f782-4a94-9113-acfe835a2b8a}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{65812101-be4a-4c49-912a-49eb9ea65cca}</UniqueIdentifier>
+      <UniqueIdentifier>{692613dc-6b1e-4ffb-9c28-47282f9b119f}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{f6c00d82-d1e8-4dd8-9fc2-b95d376662a6}</UniqueIdentifier>
+      <UniqueIdentifier>{2df8e415-77bd-41b2-b770-ec4bfaee9e00}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTLM">
-      <UniqueIdentifier>{34e35154-1aef-4fcf-991f-b3db9b4cbfc5}</UniqueIdentifier>
+      <UniqueIdentifier>{ccae9a0d-6819-45e0-af22-a5b2ff8b429b}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTLM\Header Files">
-      <UniqueIdentifier>{8c5c3d52-4e1d-4d0e-b5c6-a1199900e823}</UniqueIdentifier>
+      <UniqueIdentifier>{7f1a06da-5317-4803-9f4c-a13acd1e3959}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTLM\Source Files">
-      <UniqueIdentifier>{112649bf-0779-4de5-b573-cd0c0a2c3b78}</UniqueIdentifier>
+      <UniqueIdentifier>{d1384c8b-86bb-4d26-a6cf-06b490284056}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>
--- a/Net/testsuite/TestSuite_vs170.vcxproj
+++ b/Net/testsuite/TestSuite_vs170.vcxproj
@ -1,5 +1,5 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="debug_shared|ARM64">
      <Configuration>debug_shared</Configuration>
@ -75,6 +75,7 @@
    </ProjectConfiguration>
  </ItemGroup>
  <PropertyGroup Label="Globals">
    <VCProjectVersion>17.0</VCProjectVersion>
    <ProjectName>TestSuite</ProjectName>
    <ProjectGuid>{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}</ProjectGuid>
    <RootNamespace>TestSuite</RootNamespace>
@ -83,28 +84,28 @@
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props"/>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
@ -168,29 +169,28 @@
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="Configuration">
    <ConfigurationType>Application</ConfigurationType>
    <PlatformToolset>v143</PlatformToolset>
    <CharacterSet>MultiByte</CharacterSet>
    <PlatformToolset>v143</PlatformToolset>
  </PropertyGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props"/>
-  <ImportGroup Label="ExtensionSettings">
+  <ImportGroup Label="ExtensionSettings"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'" Label="PropertySheets">
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
@ -211,26 +211,44 @@
    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <ImportGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'" Label="PropertySheets">
-    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+    <Import Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props"/>
  </ImportGroup>
  <PropertyGroup Label="UserMacros"/>
  <PropertyGroup>
-    <_ProjectFileVersion>16.0.32602.291</_ProjectFileVersion>
+    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|ARM64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|ARM64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|ARM64'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|ARM64'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|ARM64'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">TestSuited</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_shared|x64'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_md|x64'">TestSuite</TargetName>
    <TargetName Condition="'$(Configuration)|$(Platform)'=='release_static_mt|x64'">TestSuite</TargetName>
  </PropertyGroup>
  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|ARM64'">
    <OutDir>binA64\</OutDir>
@ -338,16 +356,17 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\TestSuited.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>binA64\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineARM64</TargetMachine>
    </Link>
@ -371,12 +390,13 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\TestSuite.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
@ -401,16 +421,17 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\static_mt\TestSuited.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>binA64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineARM64</TargetMachine>
    </Link>
@ -434,12 +455,13 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\static_mt\TestSuite.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
@ -464,16 +486,17 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\static_md\TestSuited.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>binA64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineARM64</TargetMachine>
    </Link>
@ -497,12 +520,13 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>binA64\static_md\TestSuite.exe</OutputFile>
+      <OutputFile>$(OutDir)$(TargetName).exe</OutputFile>
      <AdditionalLibraryDirectories>..\..\libA64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <GenerateDebugInformation>false</GenerateDebugInformation>
      <SubSystem>Console</SubSystem>
@ -527,7 +551,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -535,7 +561,7 @@
      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@ -559,7 +585,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -588,7 +616,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -596,7 +626,7 @@
      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@ -620,7 +650,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -649,7 +681,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -657,7 +691,7 @@
      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX86</TargetMachine>
    </Link>
@ -681,7 +715,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -710,7 +746,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -718,7 +756,7 @@
      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@ -742,7 +780,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -771,7 +811,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -779,7 +821,7 @@
      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@ -803,7 +845,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -832,7 +876,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -840,7 +886,7 @@
      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
      <SuppressStartupBanner>true</SuppressStartupBanner>
      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
      <SubSystem>Console</SubSystem>
      <TargetMachine>MachineX64</TargetMachine>
    </Link>
@ -864,7 +910,9 @@
      <WarningLevel>Level3</WarningLevel>
      <DebugInformationFormat/>
      <CompileAs>Default</CompileAs>
-      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <Link>
      <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)</AdditionalDependencies>
@ -946,75 +994,208 @@
    <ClInclude Include="src\WebSocketTestSuite.h"/>
  </ItemGroup>
  <ItemGroup>
-    <ClCompile Include="src\DatagramSocketTest.cpp" />
+    <ClCompile Include="src\DatagramSocketTest.cpp">
-    <ClCompile Include="src\DialogServer.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\DialogSocketTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\DNSTest.cpp" />
+    <ClCompile Include="src\DialogServer.cpp">
-    <ClCompile Include="src\Driver.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\EchoServer.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\FTPClientSessionTest.cpp" />
+    <ClCompile Include="src\DialogSocketTest.cpp">
-    <ClCompile Include="src\FTPClientTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\FTPStreamFactoryTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTMLFormTest.cpp" />
+    <ClCompile Include="src\DNSTest.cpp">
-    <ClCompile Include="src\HTMLTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPClientSessionTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPClientTestSuite.cpp" />
+    <ClCompile Include="src\Driver.cpp">
-    <ClCompile Include="src\HTTPCookieTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPCredentialsTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPRequestTest.cpp" />
+    <ClCompile Include="src\EchoServer.cpp">
-    <ClCompile Include="src\HTTPResponseTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPServerTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPServerTestSuite.cpp" />
+    <ClCompile Include="src\FTPClientSessionTest.cpp">
-    <ClCompile Include="src\HTTPStreamFactoryTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\HTTPTestServer.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\HTTPTestSuite.cpp" />
+    <ClCompile Include="src\FTPClientTestSuite.cpp">
-    <ClCompile Include="src\ICMPClientTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ICMPClientTestSuite.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\ICMPSocketTest.cpp" />
+    <ClCompile Include="src\FTPStreamFactoryTest.cpp">
-    <ClCompile Include="src\IPAddressTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MailMessageTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MailStreamTest.cpp" />
+    <ClCompile Include="src\HTMLFormTest.cpp">
-    <ClCompile Include="src\MailTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MediaTypeTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MessageHeaderTest.cpp" />
+    <ClCompile Include="src\HTMLTestSuite.cpp">
-    <ClCompile Include="src\MessagesTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MulticastEchoServer.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\MulticastSocketTest.cpp" />
+    <ClCompile Include="src\HTTPClientSessionTest.cpp">
-    <ClCompile Include="src\MultipartReaderTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\MultipartWriterTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NameValueCollectionTest.cpp" />
+    <ClCompile Include="src\HTTPClientTestSuite.cpp">
-    <ClCompile Include="src\NetCoreTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\NetTestSuite.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NetworkInterfaceTest.cpp" />
+    <ClCompile Include="src\HTTPCookieTest.cpp">
-    <ClCompile Include="src\NTLMCredentialsTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\NTPClientTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\NTPClientTestSuite.cpp" />
+    <ClCompile Include="src\HTTPCredentialsTest.cpp">
-    <ClCompile Include="src\OAuth10CredentialsTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\OAuth20CredentialsTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\OAuthTestSuite.cpp" />
+    <ClCompile Include="src\HTTPRequestTest.cpp">
-    <ClCompile Include="src\PollSetTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\POP3ClientSessionTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\QuotedPrintableTest.cpp" />
+    <ClCompile Include="src\HTTPResponseTest.cpp">
-    <ClCompile Include="src\RawSocketTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\ReactorTestSuite.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SMTPClientSessionTest.cpp" />
+    <ClCompile Include="src\HTTPServerTest.cpp">
-    <ClCompile Include="src\SocketAddressTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SocketConnectorTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SocketProactorTest.cpp" />
+    <ClCompile Include="src\HTTPServerTestSuite.cpp">
-    <ClCompile Include="src\SocketReactorTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SocketsTestSuite.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\SocketStreamTest.cpp" />
+    <ClCompile Include="src\HTTPStreamFactoryTest.cpp">
-    <ClCompile Include="src\SocketTest.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\SyslogTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\TCPServerTest.cpp" />
+    <ClCompile Include="src\HTTPTestServer.cpp">
-    <ClCompile Include="src\TCPServerTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\UDPEchoServer.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\UDPServerTest.cpp" />
+    <ClCompile Include="src\HTTPTestSuite.cpp">
-    <ClCompile Include="src\UDPServerTestSuite.cpp" />
+      <MultiProcessorCompilation>true</MultiProcessorCompilation>
-    <ClCompile Include="src\WebSocketTest.cpp" />
+    </ClCompile>
-    <ClCompile Include="src\WebSocketTestSuite.cpp" />
+    <ClCompile Include="src\ICMPClientTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPClientTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ICMPSocketTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\IPAddressTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailMessageTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailStreamTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MailTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MediaTypeTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MessageHeaderTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MessagesTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MulticastEchoServer.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MulticastSocketTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MultipartReaderTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\MultipartWriterTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NameValueCollectionTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NetCoreTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NetTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NetworkInterfaceTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTLMCredentialsTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTPClientTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\NTPClientTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\OAuth10CredentialsTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\OAuth20CredentialsTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\OAuthTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\PollSetTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\POP3ClientSessionTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\QuotedPrintableTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\RawSocketTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\ReactorTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SMTPClientSessionTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketAddressTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketConnectorTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketProactorTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketReactorTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketsTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketStreamTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SocketTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\SyslogTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\TCPServerTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\UDPEchoServer.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\UDPServerTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\UDPServerTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\WebSocketTest.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
    <ClCompile Include="src\WebSocketTestSuite.cpp">
      <MultiProcessorCompilation>true</MultiProcessorCompilation>
    </ClCompile>
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>
-  <ImportGroup Label="ExtensionTargets">
+  <ImportGroup Label="ExtensionTargets"/>
  </ImportGroup>
 </Project>
--- a/Net/testsuite/TestSuite_vs170.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs170.vcxproj.filters
@ -2,172 +2,172 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <Filter Include="NetCore">
-      <UniqueIdentifier>{bb5f99a4-076d-40f6-bd03-b605e2f78942}</UniqueIdentifier>
+      <UniqueIdentifier>{1de7c206-c047-4fa9-9f70-76fba36d6357}</UniqueIdentifier>
    </Filter>
    <Filter Include="NetCore\Header Files">
-      <UniqueIdentifier>{370ee1f9-94d6-46c9-9cfd-ae9a82e4215e}</UniqueIdentifier>
+      <UniqueIdentifier>{b8067e77-98a2-483f-9ac4-87f6926e781d}</UniqueIdentifier>
    </Filter>
    <Filter Include="NetCore\Source Files">
-      <UniqueIdentifier>{659db2c3-80b4-4646-9df5-9ea4def9cb97}</UniqueIdentifier>
+      <UniqueIdentifier>{21307ccd-54fb-4e34-b214-d1445abb7f49}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite">
-      <UniqueIdentifier>{135d073c-c9d2-46f3-9f18-8692661c6a80}</UniqueIdentifier>
+      <UniqueIdentifier>{50f284c2-4fae-4db8-b938-edc31f894396}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{4cea6005-eb6b-4067-8254-b2c023c162b1}</UniqueIdentifier>
+      <UniqueIdentifier>{88476b8b-c763-4846-9332-faa616e0af8e}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{3718fde6-4856-4136-8951-ec466b8db23d}</UniqueIdentifier>
+      <UniqueIdentifier>{745ac167-857f-462c-ba8d-b77e85c3f0f8}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver">
-      <UniqueIdentifier>{ef1aacf2-69b0-4f45-a2fa-d6273e7de591}</UniqueIdentifier>
+      <UniqueIdentifier>{782f1313-d76f-43f8-b194-4db6d179c288}</UniqueIdentifier>
    </Filter>
    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{4379c133-cd56-4860-9c0e-1c3169ab30ee}</UniqueIdentifier>
+      <UniqueIdentifier>{7e31d1a5-174b-4d94-b66f-5306fc1d0516}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets">
-      <UniqueIdentifier>{c913a0b8-78bf-41ad-bded-a1f9a8b37902}</UniqueIdentifier>
+      <UniqueIdentifier>{f069a939-12ee-4950-a2be-ac79d0633704}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets\Header Files">
-      <UniqueIdentifier>{057f1290-2c76-46e8-8dfc-da11d02253ef}</UniqueIdentifier>
+      <UniqueIdentifier>{1ff556e1-f288-4a77-9af3-2d8dcba443cb}</UniqueIdentifier>
    </Filter>
    <Filter Include="Sockets\Source Files">
-      <UniqueIdentifier>{5a50683c-8e6a-400b-a50f-9eb7b74a6b12}</UniqueIdentifier>
+      <UniqueIdentifier>{b8e2bd2b-b893-4ce1-ac58-af41715c1d74}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages">
-      <UniqueIdentifier>{32ed4d09-4da4-4316-8211-0dabc2ecba44}</UniqueIdentifier>
+      <UniqueIdentifier>{a0aca32e-b4d1-46a1-8389-65ea253b36d6}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages\Header Files">
-      <UniqueIdentifier>{a9b5b4c6-2436-46aa-bc18-79d150dc29c7}</UniqueIdentifier>
+      <UniqueIdentifier>{eacb0411-250d-436e-8d2f-e7177d116ec0}</UniqueIdentifier>
    </Filter>
    <Filter Include="Messages\Source Files">
-      <UniqueIdentifier>{ca0b80f5-478b-497c-bf9e-7bb0d3b0eb62}</UniqueIdentifier>
+      <UniqueIdentifier>{d9e4d8e8-d182-4dea-9b5b-b89962403176}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP">
-      <UniqueIdentifier>{7f42dbcb-7c13-42ff-9f99-d4ce0d333515}</UniqueIdentifier>
+      <UniqueIdentifier>{b6edc3f3-cc59-494b-a71d-4f8c14ce3e39}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP\Header Files">
-      <UniqueIdentifier>{a8ace8af-b953-4ee5-9e7a-3cd7a54a78c0}</UniqueIdentifier>
+      <UniqueIdentifier>{458168b2-eebc-4dd4-9a03-d9f0f9a2a6c9}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTP\Source Files">
-      <UniqueIdentifier>{ea6141c5-7525-4a5b-b339-cd124ed4f22b}</UniqueIdentifier>
+      <UniqueIdentifier>{838e9f23-65d9-411d-ad98-865282c4b124}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer">
-      <UniqueIdentifier>{53842cf1-f516-431d-8eb5-e82dd686a69a}</UniqueIdentifier>
+      <UniqueIdentifier>{6790685c-24ac-4168-b7ec-11a33c69eecc}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Header Files">
-      <UniqueIdentifier>{b416b22f-fbf5-40c0-87db-11757f720182}</UniqueIdentifier>
+      <UniqueIdentifier>{e275504a-869c-4e49-8efb-5d761f5fa689}</UniqueIdentifier>
    </Filter>
    <Filter Include="TCPServer\Source Files">
-      <UniqueIdentifier>{61beb9b6-7056-4521-84b3-fae105421be5}</UniqueIdentifier>
+      <UniqueIdentifier>{eee2aa8f-28a6-4b90-9620-7074523024ed}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer">
-      <UniqueIdentifier>{0e63a36b-a325-42da-8557-9be5b90249f9}</UniqueIdentifier>
+      <UniqueIdentifier>{17bcc15e-9b80-4a1f-b001-0c5c87e1c174}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer\Header Files">
-      <UniqueIdentifier>{f1394d79-96e4-4eed-bfc4-d20f25b9430b}</UniqueIdentifier>
+      <UniqueIdentifier>{5045634b-9e56-4776-9d49-e636e35f53f2}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPServer\Source Files">
-      <UniqueIdentifier>{ddabcfb2-56ba-49be-adb7-af8fb9d3ef97}</UniqueIdentifier>
+      <UniqueIdentifier>{08c36bec-040b-40f4-aff2-62b9285dc941}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML">
-      <UniqueIdentifier>{021d4d11-8236-4574-a893-53d52a246d4f}</UniqueIdentifier>
+      <UniqueIdentifier>{b2e93dbe-aa43-4d42-a7f8-15eff701159f}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML\Header Files">
-      <UniqueIdentifier>{3ce8c86d-1258-488f-84be-7e95b3e0a540}</UniqueIdentifier>
+      <UniqueIdentifier>{91b9a556-e17f-4ed2-8362-0bc461cfa9d3}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTML\Source Files">
-      <UniqueIdentifier>{10ac33f6-f9c0-4caa-8bf4-e0d27328842d}</UniqueIdentifier>
+      <UniqueIdentifier>{78fe40f0-075d-4204-8585-bf075d34845c}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient">
-      <UniqueIdentifier>{244449a7-8c64-48e7-9112-209ef80e7cc3}</UniqueIdentifier>
+      <UniqueIdentifier>{d1d5fce3-0238-4e76-a858-cfd624518677}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient\Header Files">
-      <UniqueIdentifier>{39201469-efa7-45cc-89d4-41e6126221e0}</UniqueIdentifier>
+      <UniqueIdentifier>{d60f9e62-cc72-485e-9560-03e039bb99d7}</UniqueIdentifier>
    </Filter>
    <Filter Include="HTTPClient\Source Files">
-      <UniqueIdentifier>{1f58cb9c-30a1-4dff-813a-c315c41e1540}</UniqueIdentifier>
+      <UniqueIdentifier>{ffab98d4-0d10-4316-998e-64f2a7c1e420}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient">
-      <UniqueIdentifier>{dbc10ea1-5b42-469b-9358-ff12f39d8682}</UniqueIdentifier>
+      <UniqueIdentifier>{72bc5ba0-b4bc-45a7-887b-4f26d11c3388}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient\Header Files">
-      <UniqueIdentifier>{2f616086-6096-4c84-9622-6fffc25be1e0}</UniqueIdentifier>
+      <UniqueIdentifier>{cb750701-7d58-4b83-96bd-3e20c101dc88}</UniqueIdentifier>
    </Filter>
    <Filter Include="FTPClient\Source Files">
-      <UniqueIdentifier>{f9cd5b41-fc85-4e81-a08b-69f11f9aa058}</UniqueIdentifier>
+      <UniqueIdentifier>{c8829492-7db9-4fa8-bde1-8fec56ec7760}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor">
-      <UniqueIdentifier>{0a43d4b7-1310-420d-9d69-b1deb7e0be39}</UniqueIdentifier>
+      <UniqueIdentifier>{9b7bd1fc-4765-492c-b1fc-e8cd0dbf2901}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor\Header Files">
-      <UniqueIdentifier>{aa486584-1762-4de5-abc4-0bca8749ef07}</UniqueIdentifier>
+      <UniqueIdentifier>{eaab7fac-663b-488c-a432-cee5c82c803a}</UniqueIdentifier>
    </Filter>
    <Filter Include="Reactor\Source Files">
-      <UniqueIdentifier>{800eea8c-e13c-40aa-a581-b3af74ef6a74}</UniqueIdentifier>
+      <UniqueIdentifier>{acd6ae16-7521-4502-a85e-f7c260ad252e}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail">
-      <UniqueIdentifier>{897be9b0-379b-4005-b6ec-c633df4aa0a6}</UniqueIdentifier>
+      <UniqueIdentifier>{d5c53961-e5cf-4d89-8077-b1146b50ff9c}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Header Files">
-      <UniqueIdentifier>{5326e350-6c82-4b47-b8bb-acf10c40f9a7}</UniqueIdentifier>
+      <UniqueIdentifier>{78abd5c7-e162-40db-bae9-187a17af9b5e}</UniqueIdentifier>
    </Filter>
    <Filter Include="Mail\Source Files">
-      <UniqueIdentifier>{f2edd76d-ba16-4ee2-a68b-7d9e9f800879}</UniqueIdentifier>
+      <UniqueIdentifier>{bb0aaf00-be64-401b-b847-5968d682bf75}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP">
-      <UniqueIdentifier>{db1a8466-0305-4faa-9fe6-20fa535c1d80}</UniqueIdentifier>
+      <UniqueIdentifier>{9a43adf5-9118-437e-bd3f-979da977ac57}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP\Header Files">
-      <UniqueIdentifier>{2d22c5e1-721b-4d19-b698-8773ddc4dabc}</UniqueIdentifier>
+      <UniqueIdentifier>{ed4fe2e4-debb-4b0a-9b8a-434970c01115}</UniqueIdentifier>
    </Filter>
    <Filter Include="ICMP\Source Files">
-      <UniqueIdentifier>{0bbba14e-6a39-455c-aec1-15af68b3bc73}</UniqueIdentifier>
+      <UniqueIdentifier>{18b22b60-08c4-44a3-8915-ec192e8a3fb0}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP">
-      <UniqueIdentifier>{c92f3301-00f6-4491-beba-14937b1f3e68}</UniqueIdentifier>
+      <UniqueIdentifier>{3db6f9e0-ec17-41de-ad4b-48af29dc4ac1}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP\Header Files">
-      <UniqueIdentifier>{f6af5476-f273-4302-9e9b-5b6d0d1cbfb2}</UniqueIdentifier>
+      <UniqueIdentifier>{bec0a34f-958b-40d2-b6d6-bc6b6b147113}</UniqueIdentifier>
    </Filter>
    <Filter Include="NTP\Source Files">
-      <UniqueIdentifier>{804c7c07-44a1-4d61-be02-c6cc8b279420}</UniqueIdentifier>
+      <UniqueIdentifier>{8195d3bf-855d-4817-89ea-a58eff8c03c4}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging">
-      <UniqueIdentifier>{b8618dd9-3ad3-4ace-94e8-a74c69d9d2e7}</UniqueIdentifier>
+      <UniqueIdentifier>{6333479e-c8ff-44f7-a50d-085523e5105f}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{5696d5bc-86ff-43a9-b49c-9f9d45940500}</UniqueIdentifier>
+      <UniqueIdentifier>{72b65c24-6964-4b98-a113-329343f32ebd}</UniqueIdentifier>
    </Filter>
    <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{08a48a0b-85b2-43c9-b359-f08ae91631d5}</UniqueIdentifier>
+      <UniqueIdentifier>{09e33a50-8379-46db-8e79-e41018ee0d8f}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket">
-      <UniqueIdentifier>{c5cf5e44-9907-4ecd-9fcd-075c862a0282}</UniqueIdentifier>
+      <UniqueIdentifier>{bd402350-2d9d-4a4a-852d-be89ac05db28}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Header Files">
-      <UniqueIdentifier>{ebe4a4ae-edae-4c4f-9f4c-c05da0288028}</UniqueIdentifier>
+      <UniqueIdentifier>{f4cd0903-39ed-40f7-9e92-c4e7cbe35ef0}</UniqueIdentifier>
    </Filter>
    <Filter Include="WebSocket\Source Files">
-      <UniqueIdentifier>{57c8332e-5bc0-464a-ba23-717a5ad8d7e0}</UniqueIdentifier>
+      <UniqueIdentifier>{68a90000-19f3-4d13-8fae-e9b6e5716652}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth">
-      <UniqueIdentifier>{d8b00c86-03af-40df-8e84-2ba586a9e97c}</UniqueIdentifier>
+      <UniqueIdentifier>{66c54799-5c41-46f8-ae7a-58942ad4705b}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth\Header Files">
-      <UniqueIdentifier>{0ed1b87d-86e0-4883-9889-f8ca060cb9ad}</UniqueIdentifier>
+      <UniqueIdentifier>{f8351074-43b3-486c-b17c-1d3e97afa010}</UniqueIdentifier>
    </Filter>
    <Filter Include="OAuth\Source Files">
-      <UniqueIdentifier>{f3304f4b-f410-46d9-879d-66f81e13e1cc}</UniqueIdentifier>
+      <UniqueIdentifier>{2cfcb915-097f-4a15-861f-69087117bc54}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP">
-      <UniqueIdentifier>{fa35d4ea-24c8-4d08-a14d-d92fd1cb7d9f}</UniqueIdentifier>
+      <UniqueIdentifier>{160bf970-48eb-490c-a1c7-ada4205e3b04}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP\Source Files">
-      <UniqueIdentifier>{494ab2d2-7191-46ce-adfa-12fe16cd45e6}</UniqueIdentifier>
+      <UniqueIdentifier>{bd7d0bc2-d6a3-40fb-889d-3a9908f761b2}</UniqueIdentifier>
    </Filter>
    <Filter Include="UDP\Header Files">
-      <UniqueIdentifier>{3cb06642-ffbd-4684-b1f0-cfe3f3ad4bff}</UniqueIdentifier>
+      <UniqueIdentifier>{704cd365-f4d0-41dc-8509-02627e48fc33}</UniqueIdentifier>
    </Filter>
  </ItemGroup>
  <ItemGroup>