diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj
index 7cdbea00b..7dc80cc4d 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj
+++ b/Foundation/testsuite/TestSuite_vs100.vcxproj
@@ -1,562 +1,563 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup Label="ProjectConfigurations">
-    <ProjectConfiguration Include="debug_shared|Win32">
-      <Configuration>debug_shared</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_md|Win32">
-      <Configuration>debug_static_md</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="debug_static_mt|Win32">
-      <Configuration>debug_static_mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_shared|Win32">
-      <Configuration>release_shared</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_md|Win32">
-      <Configuration>release_static_md</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-    <ProjectConfiguration Include="release_static_mt|Win32">
-      <Configuration>release_static_mt</Configuration>
-      <Platform>Win32</Platform>
-    </ProjectConfiguration>
-  </ItemGroup>
-  <PropertyGroup Label="Globals">
-    <ProjectName>TestSuite</ProjectName>
-    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
-    <Keyword>Win32Proj</Keyword>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Static</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
-    <ConfigurationType>Application</ConfigurationType>
-    <UseOfMfc>Dynamic</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
-  </PropertyGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
-  <ImportGroup Label="ExtensionSettings">
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </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" />
-  </ImportGroup>
-  <PropertyGroup Label="UserMacros" />
-  <PropertyGroup>
-    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
-    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
-    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
-    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
-    <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>
-  </PropertyGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>true</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <MinimalRebuild>true</MinimalRebuild>
-      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
-      <BufferSecurityCheck>true</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>true</GenerateDebugInformation>
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
-    <ClCompile>
-      <Optimization>Disabled</Optimization>
-      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
-      <IntrinsicFunctions>true</IntrinsicFunctions>
-      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
-      <OmitFramePointers>true</OmitFramePointers>
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <StringPooling>true</StringPooling>
-      <MinimalRebuild>false</MinimalRebuild>
-      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
-      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
-      <BufferSecurityCheck>false</BufferSecurityCheck>
-      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
-      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
-      <RuntimeTypeInfo>true</RuntimeTypeInfo>
-      <PrecompiledHeader>
-      </PrecompiledHeader>
-      <WarningLevel>Level3</WarningLevel>
-      <DebugInformationFormat>
-      </DebugInformationFormat>
-    </ClCompile>
-    <Link>
-      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
-      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
-      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
-      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
-      <GenerateDebugInformation>false</GenerateDebugInformation>
-      <ProgramDatabaseFile>
-      </ProgramDatabaseFile>
-      <SubSystem>Windows</SubSystem>
-      <OptimizeReferences>true</OptimizeReferences>
-      <EnableCOMDATFolding>false</EnableCOMDATFolding>
-      <TargetMachine>MachineX86</TargetMachine>
-    </Link>
-  </ItemDefinitionGroup>
-  <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp" />
-    <ClCompile Include="src\AutoPtrTest.cpp" />
-    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
-    <ClCompile Include="src\ByteOrderTest.cpp" />
-    <ClCompile Include="src\CoreTest.cpp" />
-    <ClCompile Include="src\CoreTestSuite.cpp" />
-    <ClCompile Include="src\DynamicAnyTest.cpp" />
-    <ClCompile Include="src\DynamicFactoryTest.cpp" />
-    <ClCompile Include="src\FormatTest.cpp" />
-    <ClCompile Include="src\FPETest.cpp" />
-    <ClCompile Include="src\MemoryPoolTest.cpp" />
-    <ClCompile Include="src\NamedTuplesTest.cpp" />
-    <ClCompile Include="src\NDCTest.cpp" />
-    <ClCompile Include="src\NumberFormatterTest.cpp" />
-    <ClCompile Include="src\NumberParserTest.cpp" />
-    <ClCompile Include="src\RegularExpressionTest.cpp" />
-    <ClCompile Include="src\SharedPtrTest.cpp" />
-    <ClCompile Include="src\StringTest.cpp" />
-    <ClCompile Include="src\StringTokenizerTest.cpp" />
-    <ClCompile Include="src\TuplesTest.cpp" />
-    <ClCompile Include="src\TypeListTest.cpp" />
-    <ClCompile Include="src\Base64Test.cpp" />
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
-    <ClCompile Include="src\CountingStreamTest.cpp" />
-    <ClCompile Include="src\FileStreamTest.cpp" />
-    <ClCompile Include="src\HexBinaryTest.cpp" />
-    <ClCompile Include="src\LineEndingConverterTest.cpp" />
-    <ClCompile Include="src\MemoryStreamTest.cpp" />
-    <ClCompile Include="src\NullStreamTest.cpp" />
-    <ClCompile Include="src\StreamCopierTest.cpp" />
-    <ClCompile Include="src\StreamsTestSuite.cpp" />
-    <ClCompile Include="src\StreamTokenizerTest.cpp" />
-    <ClCompile Include="src\TeeStreamTest.cpp" />
-    <ClCompile Include="src\ZLibTest.cpp" />
-    <ClCompile Include="src\CryptTestSuite.cpp" />
-    <ClCompile Include="src\DigestStreamTest.cpp" />
-    <ClCompile Include="src\HMACEngineTest.cpp" />
-    <ClCompile Include="src\MD4EngineTest.cpp" />
-    <ClCompile Include="src\MD5EngineTest.cpp" />
-    <ClCompile Include="src\RandomStreamTest.cpp" />
-    <ClCompile Include="src\RandomTest.cpp" />
-    <ClCompile Include="src\SHA1EngineTest.cpp" />
-    <ClCompile Include="src\NotificationCenterTest.cpp" />
-    <ClCompile Include="src\NotificationQueueTest.cpp" />
-    <ClCompile Include="src\NotificationsTestSuite.cpp" />
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
-    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
-    <ClCompile Include="src\ActiveMethodTest.cpp" />
-    <ClCompile Include="src\ActivityTest.cpp" />
-    <ClCompile Include="src\ConditionTest.cpp" />
-    <ClCompile Include="src\RWLockTest.cpp" />
-    <ClCompile Include="src\SemaphoreTest.cpp" />
-    <ClCompile Include="src\ThreadingTestSuite.cpp" />
-    <ClCompile Include="src\ThreadLocalTest.cpp" />
-    <ClCompile Include="src\ThreadPoolTest.cpp" />
-    <ClCompile Include="src\ThreadTest.cpp" />
-    <ClCompile Include="src\TimerTest.cpp" />
-    <ClCompile Include="src\ClassLoaderTest.cpp" />
-    <ClCompile Include="src\ManifestTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTest.cpp" />
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
-    <ClCompile Include="src\TestPlugin.cpp" />
-    <ClCompile Include="src\ChannelTest.cpp" />
-    <ClCompile Include="src\FileChannelTest.cpp" />
-    <ClCompile Include="src\LoggerTest.cpp" />
-    <ClCompile Include="src\LoggingFactoryTest.cpp" />
-    <ClCompile Include="src\LoggingRegistryTest.cpp" />
-    <ClCompile Include="src\LoggingTestSuite.cpp" />
-    <ClCompile Include="src\LogStreamTest.cpp" />
-    <ClCompile Include="src\PatternFormatterTest.cpp" />
-    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
-    <ClCompile Include="src\TestChannel.cpp" />
-    <ClCompile Include="src\FilesystemTestSuite.cpp" />
-    <ClCompile Include="src\FileTest.cpp" />
-    <ClCompile Include="src\GlobTest.cpp" />
-    <ClCompile Include="src\PathTest.cpp" />
-    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
-    <ClCompile Include="src\UUIDTest.cpp" />
-    <ClCompile Include="src\UUIDTestSuite.cpp" />
-    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
-    <ClCompile Include="src\DateTimeParserTest.cpp" />
-    <ClCompile Include="src\DateTimeTest.cpp" />
-    <ClCompile Include="src\DateTimeTestSuite.cpp" />
-    <ClCompile Include="src\LocalDateTimeTest.cpp" />
-    <ClCompile Include="src\StopwatchTest.cpp" />
-    <ClCompile Include="src\TimespanTest.cpp" />
-    <ClCompile Include="src\TimestampTest.cpp" />
-    <ClCompile Include="src\TimezoneTest.cpp" />
-    <ClCompile Include="src\StreamConverterTest.cpp" />
-    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
-    <ClCompile Include="src\TextConverterTest.cpp" />
-    <ClCompile Include="src\TextEncodingTest.cpp" />
-    <ClCompile Include="src\TextIteratorTest.cpp" />
-    <ClCompile Include="src\TextTestSuite.cpp" />
-    <ClCompile Include="src\UnicodeConverterTest.cpp" />
-    <ClCompile Include="src\UTF8StringTest.cpp" />
-    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
-    <ClCompile Include="src\URITest.cpp" />
-    <ClCompile Include="src\URITestSuite.cpp" />
-    <ClCompile Include="src\FoundationTestSuite.cpp" />
-    <ClCompile Include="src\WinDriver.cpp" />
-    <ClCompile Include="src\NamedEventTest.cpp" />
-    <ClCompile Include="src\NamedMutexTest.cpp" />
-    <ClCompile Include="src\ProcessesTestSuite.cpp" />
-    <ClCompile Include="src\ProcessTest.cpp" />
-    <ClCompile Include="src\SharedMemoryTest.cpp" />
-    <ClCompile Include="src\TaskManagerTest.cpp" />
-    <ClCompile Include="src\TaskTest.cpp" />
-    <ClCompile Include="src\TaskTestSuite.cpp" />
-    <ClCompile Include="src\BasicEventTest.cpp" />
-    <ClCompile Include="src\DummyDelegate.cpp" />
-    <ClCompile Include="src\EventTestSuite.cpp" />
-    <ClCompile Include="src\FIFOEventTest.cpp" />
-    <ClCompile Include="src\PriorityEventTest.cpp" />
-    <ClCompile Include="src\CacheTestSuite.cpp" />
-    <ClCompile Include="src\ExpireCacheTest.cpp" />
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\LRUCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
-    <ClCompile Include="src\HashingTestSuite.cpp" />
-    <ClCompile Include="src\HashMapTest.cpp" />
-    <ClCompile Include="src\HashSetTest.cpp" />
-    <ClCompile Include="src\HashTableTest.cpp" />
-    <ClCompile Include="src\LinearHashTableTest.cpp" />
-    <ClCompile Include="src\SimpleHashTableTest.cpp" />
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\AnyTest.h" />
-    <ClInclude Include="src\AutoPtrTest.h" />
-    <ClInclude Include="src\AutoReleasePoolTest.h" />
-    <ClInclude Include="src\ByteOrderTest.h" />
-    <ClInclude Include="src\CoreTest.h" />
-    <ClInclude Include="src\CoreTestSuite.h" />
-    <ClInclude Include="src\DynamicAnyTest.h" />
-    <ClInclude Include="src\DynamicFactoryTest.h" />
-    <ClInclude Include="src\FormatTest.h" />
-    <ClInclude Include="src\FPETest.h" />
-    <ClInclude Include="src\MemoryPoolTest.h" />
-    <ClInclude Include="src\NamedTuplesTest.h" />
-    <ClInclude Include="src\NDCTest.h" />
-    <ClInclude Include="src\NumberFormatterTest.h" />
-    <ClInclude Include="src\NumberParserTest.h" />
-    <ClInclude Include="src\RegularExpressionTest.h" />
-    <ClInclude Include="src\SharedPtrTest.h" />
-    <ClInclude Include="src\StringTest.h" />
-    <ClInclude Include="src\StringTokenizerTest.h" />
-    <ClInclude Include="src\TuplesTest.h" />
-    <ClInclude Include="src\TypeListTest.h" />
-    <ClInclude Include="src\Base64Test.h" />
-    <ClInclude Include="src\BinaryReaderWriterTest.h" />
-    <ClInclude Include="src\CountingStreamTest.h" />
-    <ClInclude Include="src\FileStreamTest.h" />
-    <ClInclude Include="src\HexBinaryTest.h" />
-    <ClInclude Include="src\LineEndingConverterTest.h" />
-    <ClInclude Include="src\MemoryStreamTest.h" />
-    <ClInclude Include="src\NullStreamTest.h" />
-    <ClInclude Include="src\StreamCopierTest.h" />
-    <ClInclude Include="src\StreamsTestSuite.h" />
-    <ClInclude Include="src\StreamTokenizerTest.h" />
-    <ClInclude Include="src\TeeStreamTest.h" />
-    <ClInclude Include="src\ZLibTest.h" />
-    <ClInclude Include="src\CryptTestSuite.h" />
-    <ClInclude Include="src\DigestStreamTest.h" />
-    <ClInclude Include="src\HMACEngineTest.h" />
-    <ClInclude Include="src\MD4EngineTest.h" />
-    <ClInclude Include="src\MD5EngineTest.h" />
-    <ClInclude Include="src\RandomStreamTest.h" />
-    <ClInclude Include="src\RandomTest.h" />
-    <ClInclude Include="src\SHA1EngineTest.h" />
-    <ClInclude Include="src\NotificationCenterTest.h" />
-    <ClInclude Include="src\NotificationQueueTest.h" />
-    <ClInclude Include="src\NotificationsTestSuite.h" />
-    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
-    <ClInclude Include="src\TimedNotificationQueueTest.h" />
-    <ClInclude Include="src\ActiveDispatcherTest.h" />
-    <ClInclude Include="src\ActiveMethodTest.h" />
-    <ClInclude Include="src\ActivityTest.h" />
-    <ClInclude Include="src\ConditionTest.h" />
-    <ClInclude Include="src\RWLockTest.h" />
-    <ClInclude Include="src\SemaphoreTest.h" />
-    <ClInclude Include="src\ThreadingTestSuite.h" />
-    <ClInclude Include="src\ThreadLocalTest.h" />
-    <ClInclude Include="src\ThreadPoolTest.h" />
-    <ClInclude Include="src\ThreadTest.h" />
-    <ClInclude Include="src\TimerTest.h" />
-    <ClInclude Include="src\ClassLoaderTest.h" />
-    <ClInclude Include="src\ManifestTest.h" />
-    <ClInclude Include="src\SharedLibraryTest.h" />
-    <ClInclude Include="src\SharedLibraryTestSuite.h" />
-    <ClInclude Include="src\TestPlugin.h" />
-    <ClInclude Include="src\ChannelTest.h" />
-    <ClInclude Include="src\FileChannelTest.h" />
-    <ClInclude Include="src\LoggerTest.h" />
-    <ClInclude Include="src\LoggingFactoryTest.h" />
-    <ClInclude Include="src\LoggingRegistryTest.h" />
-    <ClInclude Include="src\LoggingTestSuite.h" />
-    <ClInclude Include="src\LogStreamTest.h" />
-    <ClInclude Include="src\PatternFormatterTest.h" />
-    <ClInclude Include="src\SimpleFileChannelTest.h" />
-    <ClInclude Include="src\TestChannel.h" />
-    <ClInclude Include="src\FilesystemTestSuite.h" />
-    <ClInclude Include="src\FileTest.h" />
-    <ClInclude Include="src\GlobTest.h" />
-    <ClInclude Include="src\PathTest.h" />
-    <ClInclude Include="src\UUIDGeneratorTest.h" />
-    <ClInclude Include="src\UUIDTest.h" />
-    <ClInclude Include="src\UUIDTestSuite.h" />
-    <ClInclude Include="src\DateTimeFormatterTest.h" />
-    <ClInclude Include="src\DateTimeParserTest.h" />
-    <ClInclude Include="src\DateTimeTest.h" />
-    <ClInclude Include="src\DateTimeTestSuite.h" />
-    <ClInclude Include="src\LocalDateTimeTest.h" />
-    <ClInclude Include="src\StopwatchTest.h" />
-    <ClInclude Include="src\TimespanTest.h" />
-    <ClInclude Include="src\TimestampTest.h" />
-    <ClInclude Include="src\TimezoneTest.h" />
-    <ClInclude Include="src\StreamConverterTest.h" />
-    <ClInclude Include="src\TextBufferIteratorTest.h" />
-    <ClInclude Include="src\TextConverterTest.h" />
-    <ClInclude Include="src\TextEncodingTest.h" />
-    <ClInclude Include="src\TextIteratorTest.h" />
-    <ClInclude Include="src\TextTestSuite.h" />
-    <ClInclude Include="src\UnicodeConverterTest.h" />
-    <ClInclude Include="src\UTF8StringTest.h" />
-    <ClInclude Include="src\URIStreamOpenerTest.h" />
-    <ClInclude Include="src\URITest.h" />
-    <ClInclude Include="src\URITestSuite.h" />
-    <ClInclude Include="src\FoundationTestSuite.h" />
-    <ClInclude Include="src\NamedEventTest.h" />
-    <ClInclude Include="src\NamedMutexTest.h" />
-    <ClInclude Include="src\ProcessesTestSuite.h" />
-    <ClInclude Include="src\ProcessTest.h" />
-    <ClInclude Include="src\SharedMemoryTest.h" />
-    <ClInclude Include="src\TaskManagerTest.h" />
-    <ClInclude Include="src\TaskTest.h" />
-    <ClInclude Include="src\TaskTestSuite.h" />
-    <ClInclude Include="src\BasicEventTest.h" />
-    <ClInclude Include="src\DummyDelegate.h" />
-    <ClInclude Include="src\EventTestSuite.h" />
-    <ClInclude Include="src\FIFOEventTest.h" />
-    <ClInclude Include="src\PriorityEventTest.h" />
-    <ClInclude Include="src\CacheTestSuite.h" />
-    <ClInclude Include="src\ExpireCacheTest.h" />
-    <ClInclude Include="src\ExpireLRUCacheTest.h" />
-    <ClInclude Include="src\LRUCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireCacheTest.h" />
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
-    <ClInclude Include="src\HashingTestSuite.h" />
-    <ClInclude Include="src\HashMapTest.h" />
-    <ClInclude Include="src\HashSetTest.h" />
-    <ClInclude Include="src\HashTableTest.h" />
-    <ClInclude Include="src\LinearHashTableTest.h" />
-    <ClInclude Include="src\SimpleHashTableTest.h" />
-  </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <ImportGroup Label="ExtensionTargets">
-  </ImportGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="debug_shared|Win32">
+      <Configuration>debug_shared</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_md|Win32">
+      <Configuration>debug_static_md</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="debug_static_mt|Win32">
+      <Configuration>debug_static_mt</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="release_shared|Win32">
+      <Configuration>release_shared</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_md|Win32">
+      <Configuration>release_static_md</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="release_static_mt|Win32">
+      <Configuration>release_static_mt</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectName>TestSuite</ProjectName>
+    <ProjectGuid>{F1EE93DF-347F-4CB3-B191-C4E63F38E972}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Static</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseOfMfc>Dynamic</UseOfMfc>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </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" />
+  </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" />
+  </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" />
+  </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" />
+  </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" />
+  </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" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup>
+    <_ProjectFileVersion>10.0.30319.1</_ProjectFileVersion>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">bin\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">false</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">bin\static_md\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">true</LinkIncremental>
+    <OutDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">bin\static_mt\</OutDir>
+    <IntDir Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">obj\$(Configuration)\</IntDir>
+    <LinkIncremental Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">false</LinkIncremental>
+    <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>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitd.lib;WinTestRunnerd.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_shared|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnit.lib;WinTestRunner.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmd.lib;WinTestRunnermd.lib;PocoFoundationmd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_md\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmdd.lib;WinTestRunnermdd.lib;PocoFoundationmdd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_md\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <MinimalRebuild>true</MinimalRebuild>
+      <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+      <BufferSecurityCheck>true</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>EditAndContinue</DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmtd.lib;WinTestRunnermtd.lib;PocoFoundationmtd.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuited.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='release_static_mt|Win32'">
+    <ClCompile>
+      <Optimization>Disabled</Optimization>
+      <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <OmitFramePointers>true</OmitFramePointers>
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <StringPooling>true</StringPooling>
+      <MinimalRebuild>false</MinimalRebuild>
+      <BasicRuntimeChecks>Default</BasicRuntimeChecks>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <TreatWChar_tAsBuiltInType>true</TreatWChar_tAsBuiltInType>
+      <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
+      <RuntimeTypeInfo>true</RuntimeTypeInfo>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <DebugInformationFormat>
+      </DebugInformationFormat>
+    </ClCompile>
+    <Link>
+      <AdditionalDependencies>CppUnitmt.lib;WinTestRunnermt.lib;PocoFoundationmt.lib;WinTestRunner.res;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <OutputFile>bin\static_mt\TestSuite.exe</OutputFile>
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
+      <IgnoreSpecificDefaultLibraries>nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
+      <GenerateDebugInformation>false</GenerateDebugInformation>
+      <ProgramDatabaseFile>
+      </ProgramDatabaseFile>
+      <SubSystem>Windows</SubSystem>
+      <OptimizeReferences>true</OptimizeReferences>
+      <EnableCOMDATFolding>false</EnableCOMDATFolding>
+      <TargetMachine>MachineX86</TargetMachine>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClCompile Include="src\AnyTest.cpp" />
+    <ClCompile Include="src\ArrayTest.cpp" />
+    <ClCompile Include="src\AutoPtrTest.cpp" />
+    <ClCompile Include="src\AutoReleasePoolTest.cpp" />
+    <ClCompile Include="src\ByteOrderTest.cpp" />
+    <ClCompile Include="src\CoreTest.cpp" />
+    <ClCompile Include="src\CoreTestSuite.cpp" />
+    <ClCompile Include="src\DynamicFactoryTest.cpp" />
+    <ClCompile Include="src\FormatTest.cpp" />
+    <ClCompile Include="src\FPETest.cpp" />
+    <ClCompile Include="src\MemoryPoolTest.cpp" />
+    <ClCompile Include="src\NamedTuplesTest.cpp" />
+    <ClCompile Include="src\NDCTest.cpp" />
+    <ClCompile Include="src\NumberFormatterTest.cpp" />
+    <ClCompile Include="src\NumberParserTest.cpp" />
+    <ClCompile Include="src\RegularExpressionTest.cpp" />
+    <ClCompile Include="src\SharedPtrTest.cpp" />
+    <ClCompile Include="src\StringTest.cpp" />
+    <ClCompile Include="src\StringTokenizerTest.cpp" />
+    <ClCompile Include="src\TuplesTest.cpp" />
+    <ClCompile Include="src\TypeListTest.cpp" />
+    <ClCompile Include="src\Base64Test.cpp" />
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp" />
+    <ClCompile Include="src\CountingStreamTest.cpp" />
+    <ClCompile Include="src\FileStreamTest.cpp" />
+    <ClCompile Include="src\HexBinaryTest.cpp" />
+    <ClCompile Include="src\LineEndingConverterTest.cpp" />
+    <ClCompile Include="src\MemoryStreamTest.cpp" />
+    <ClCompile Include="src\NullStreamTest.cpp" />
+    <ClCompile Include="src\StreamCopierTest.cpp" />
+    <ClCompile Include="src\StreamsTestSuite.cpp" />
+    <ClCompile Include="src\StreamTokenizerTest.cpp" />
+    <ClCompile Include="src\TeeStreamTest.cpp" />
+    <ClCompile Include="src\VarTest.cpp" />
+    <ClCompile Include="src\ZLibTest.cpp" />
+    <ClCompile Include="src\CryptTestSuite.cpp" />
+    <ClCompile Include="src\DigestStreamTest.cpp" />
+    <ClCompile Include="src\HMACEngineTest.cpp" />
+    <ClCompile Include="src\MD4EngineTest.cpp" />
+    <ClCompile Include="src\MD5EngineTest.cpp" />
+    <ClCompile Include="src\RandomStreamTest.cpp" />
+    <ClCompile Include="src\RandomTest.cpp" />
+    <ClCompile Include="src\SHA1EngineTest.cpp" />
+    <ClCompile Include="src\NotificationCenterTest.cpp" />
+    <ClCompile Include="src\NotificationQueueTest.cpp" />
+    <ClCompile Include="src\NotificationsTestSuite.cpp" />
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp" />
+    <ClCompile Include="src\ActiveDispatcherTest.cpp" />
+    <ClCompile Include="src\ActiveMethodTest.cpp" />
+    <ClCompile Include="src\ActivityTest.cpp" />
+    <ClCompile Include="src\ConditionTest.cpp" />
+    <ClCompile Include="src\RWLockTest.cpp" />
+    <ClCompile Include="src\SemaphoreTest.cpp" />
+    <ClCompile Include="src\ThreadingTestSuite.cpp" />
+    <ClCompile Include="src\ThreadLocalTest.cpp" />
+    <ClCompile Include="src\ThreadPoolTest.cpp" />
+    <ClCompile Include="src\ThreadTest.cpp" />
+    <ClCompile Include="src\TimerTest.cpp" />
+    <ClCompile Include="src\ClassLoaderTest.cpp" />
+    <ClCompile Include="src\ManifestTest.cpp" />
+    <ClCompile Include="src\SharedLibraryTest.cpp" />
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp" />
+    <ClCompile Include="src\TestPlugin.cpp" />
+    <ClCompile Include="src\ChannelTest.cpp" />
+    <ClCompile Include="src\FileChannelTest.cpp" />
+    <ClCompile Include="src\LoggerTest.cpp" />
+    <ClCompile Include="src\LoggingFactoryTest.cpp" />
+    <ClCompile Include="src\LoggingRegistryTest.cpp" />
+    <ClCompile Include="src\LoggingTestSuite.cpp" />
+    <ClCompile Include="src\LogStreamTest.cpp" />
+    <ClCompile Include="src\PatternFormatterTest.cpp" />
+    <ClCompile Include="src\SimpleFileChannelTest.cpp" />
+    <ClCompile Include="src\TestChannel.cpp" />
+    <ClCompile Include="src\FilesystemTestSuite.cpp" />
+    <ClCompile Include="src\FileTest.cpp" />
+    <ClCompile Include="src\GlobTest.cpp" />
+    <ClCompile Include="src\PathTest.cpp" />
+    <ClCompile Include="src\UUIDGeneratorTest.cpp" />
+    <ClCompile Include="src\UUIDTest.cpp" />
+    <ClCompile Include="src\UUIDTestSuite.cpp" />
+    <ClCompile Include="src\DateTimeFormatterTest.cpp" />
+    <ClCompile Include="src\DateTimeParserTest.cpp" />
+    <ClCompile Include="src\DateTimeTest.cpp" />
+    <ClCompile Include="src\DateTimeTestSuite.cpp" />
+    <ClCompile Include="src\LocalDateTimeTest.cpp" />
+    <ClCompile Include="src\StopwatchTest.cpp" />
+    <ClCompile Include="src\TimespanTest.cpp" />
+    <ClCompile Include="src\TimestampTest.cpp" />
+    <ClCompile Include="src\TimezoneTest.cpp" />
+    <ClCompile Include="src\StreamConverterTest.cpp" />
+    <ClCompile Include="src\TextBufferIteratorTest.cpp" />
+    <ClCompile Include="src\TextConverterTest.cpp" />
+    <ClCompile Include="src\TextEncodingTest.cpp" />
+    <ClCompile Include="src\TextIteratorTest.cpp" />
+    <ClCompile Include="src\TextTestSuite.cpp" />
+    <ClCompile Include="src\UnicodeConverterTest.cpp" />
+    <ClCompile Include="src\UTF8StringTest.cpp" />
+    <ClCompile Include="src\URIStreamOpenerTest.cpp" />
+    <ClCompile Include="src\URITest.cpp" />
+    <ClCompile Include="src\URITestSuite.cpp" />
+    <ClCompile Include="src\FoundationTestSuite.cpp" />
+    <ClCompile Include="src\WinDriver.cpp" />
+    <ClCompile Include="src\NamedEventTest.cpp" />
+    <ClCompile Include="src\NamedMutexTest.cpp" />
+    <ClCompile Include="src\ProcessesTestSuite.cpp" />
+    <ClCompile Include="src\ProcessTest.cpp" />
+    <ClCompile Include="src\SharedMemoryTest.cpp" />
+    <ClCompile Include="src\TaskManagerTest.cpp" />
+    <ClCompile Include="src\TaskTest.cpp" />
+    <ClCompile Include="src\TaskTestSuite.cpp" />
+    <ClCompile Include="src\BasicEventTest.cpp" />
+    <ClCompile Include="src\DummyDelegate.cpp" />
+    <ClCompile Include="src\EventTestSuite.cpp" />
+    <ClCompile Include="src\FIFOEventTest.cpp" />
+    <ClCompile Include="src\PriorityEventTest.cpp" />
+    <ClCompile Include="src\CacheTestSuite.cpp" />
+    <ClCompile Include="src\ExpireCacheTest.cpp" />
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp" />
+    <ClCompile Include="src\LRUCacheTest.cpp" />
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp" />
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp" />
+    <ClCompile Include="src\HashingTestSuite.cpp" />
+    <ClCompile Include="src\HashMapTest.cpp" />
+    <ClCompile Include="src\HashSetTest.cpp" />
+    <ClCompile Include="src\HashTableTest.cpp" />
+    <ClCompile Include="src\LinearHashTableTest.cpp" />
+    <ClCompile Include="src\SimpleHashTableTest.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\AnyTest.h" />
+    <ClInclude Include="src\AutoPtrTest.h" />
+    <ClInclude Include="src\AutoReleasePoolTest.h" />
+    <ClInclude Include="src\ByteOrderTest.h" />
+    <ClInclude Include="src\CoreTest.h" />
+    <ClInclude Include="src\CoreTestSuite.h" />
+    <ClInclude Include="src\DynamicAnyTest.h" />
+    <ClInclude Include="src\DynamicFactoryTest.h" />
+    <ClInclude Include="src\FormatTest.h" />
+    <ClInclude Include="src\FPETest.h" />
+    <ClInclude Include="src\MemoryPoolTest.h" />
+    <ClInclude Include="src\NamedTuplesTest.h" />
+    <ClInclude Include="src\NDCTest.h" />
+    <ClInclude Include="src\NumberFormatterTest.h" />
+    <ClInclude Include="src\NumberParserTest.h" />
+    <ClInclude Include="src\RegularExpressionTest.h" />
+    <ClInclude Include="src\SharedPtrTest.h" />
+    <ClInclude Include="src\StringTest.h" />
+    <ClInclude Include="src\StringTokenizerTest.h" />
+    <ClInclude Include="src\TuplesTest.h" />
+    <ClInclude Include="src\TypeListTest.h" />
+    <ClInclude Include="src\Base64Test.h" />
+    <ClInclude Include="src\BinaryReaderWriterTest.h" />
+    <ClInclude Include="src\CountingStreamTest.h" />
+    <ClInclude Include="src\FileStreamTest.h" />
+    <ClInclude Include="src\HexBinaryTest.h" />
+    <ClInclude Include="src\LineEndingConverterTest.h" />
+    <ClInclude Include="src\MemoryStreamTest.h" />
+    <ClInclude Include="src\NullStreamTest.h" />
+    <ClInclude Include="src\StreamCopierTest.h" />
+    <ClInclude Include="src\StreamsTestSuite.h" />
+    <ClInclude Include="src\StreamTokenizerTest.h" />
+    <ClInclude Include="src\TeeStreamTest.h" />
+    <ClInclude Include="src\ZLibTest.h" />
+    <ClInclude Include="src\CryptTestSuite.h" />
+    <ClInclude Include="src\DigestStreamTest.h" />
+    <ClInclude Include="src\HMACEngineTest.h" />
+    <ClInclude Include="src\MD4EngineTest.h" />
+    <ClInclude Include="src\MD5EngineTest.h" />
+    <ClInclude Include="src\RandomStreamTest.h" />
+    <ClInclude Include="src\RandomTest.h" />
+    <ClInclude Include="src\SHA1EngineTest.h" />
+    <ClInclude Include="src\NotificationCenterTest.h" />
+    <ClInclude Include="src\NotificationQueueTest.h" />
+    <ClInclude Include="src\NotificationsTestSuite.h" />
+    <ClInclude Include="src\PriorityNotificationQueueTest.h" />
+    <ClInclude Include="src\TimedNotificationQueueTest.h" />
+    <ClInclude Include="src\ActiveDispatcherTest.h" />
+    <ClInclude Include="src\ActiveMethodTest.h" />
+    <ClInclude Include="src\ActivityTest.h" />
+    <ClInclude Include="src\ConditionTest.h" />
+    <ClInclude Include="src\RWLockTest.h" />
+    <ClInclude Include="src\SemaphoreTest.h" />
+    <ClInclude Include="src\ThreadingTestSuite.h" />
+    <ClInclude Include="src\ThreadLocalTest.h" />
+    <ClInclude Include="src\ThreadPoolTest.h" />
+    <ClInclude Include="src\ThreadTest.h" />
+    <ClInclude Include="src\TimerTest.h" />
+    <ClInclude Include="src\ClassLoaderTest.h" />
+    <ClInclude Include="src\ManifestTest.h" />
+    <ClInclude Include="src\SharedLibraryTest.h" />
+    <ClInclude Include="src\SharedLibraryTestSuite.h" />
+    <ClInclude Include="src\TestPlugin.h" />
+    <ClInclude Include="src\ChannelTest.h" />
+    <ClInclude Include="src\FileChannelTest.h" />
+    <ClInclude Include="src\LoggerTest.h" />
+    <ClInclude Include="src\LoggingFactoryTest.h" />
+    <ClInclude Include="src\LoggingRegistryTest.h" />
+    <ClInclude Include="src\LoggingTestSuite.h" />
+    <ClInclude Include="src\LogStreamTest.h" />
+    <ClInclude Include="src\PatternFormatterTest.h" />
+    <ClInclude Include="src\SimpleFileChannelTest.h" />
+    <ClInclude Include="src\TestChannel.h" />
+    <ClInclude Include="src\FilesystemTestSuite.h" />
+    <ClInclude Include="src\FileTest.h" />
+    <ClInclude Include="src\GlobTest.h" />
+    <ClInclude Include="src\PathTest.h" />
+    <ClInclude Include="src\UUIDGeneratorTest.h" />
+    <ClInclude Include="src\UUIDTest.h" />
+    <ClInclude Include="src\UUIDTestSuite.h" />
+    <ClInclude Include="src\DateTimeFormatterTest.h" />
+    <ClInclude Include="src\DateTimeParserTest.h" />
+    <ClInclude Include="src\DateTimeTest.h" />
+    <ClInclude Include="src\DateTimeTestSuite.h" />
+    <ClInclude Include="src\LocalDateTimeTest.h" />
+    <ClInclude Include="src\StopwatchTest.h" />
+    <ClInclude Include="src\TimespanTest.h" />
+    <ClInclude Include="src\TimestampTest.h" />
+    <ClInclude Include="src\TimezoneTest.h" />
+    <ClInclude Include="src\StreamConverterTest.h" />
+    <ClInclude Include="src\TextBufferIteratorTest.h" />
+    <ClInclude Include="src\TextConverterTest.h" />
+    <ClInclude Include="src\TextEncodingTest.h" />
+    <ClInclude Include="src\TextIteratorTest.h" />
+    <ClInclude Include="src\TextTestSuite.h" />
+    <ClInclude Include="src\UnicodeConverterTest.h" />
+    <ClInclude Include="src\UTF8StringTest.h" />
+    <ClInclude Include="src\URIStreamOpenerTest.h" />
+    <ClInclude Include="src\URITest.h" />
+    <ClInclude Include="src\URITestSuite.h" />
+    <ClInclude Include="src\FoundationTestSuite.h" />
+    <ClInclude Include="src\NamedEventTest.h" />
+    <ClInclude Include="src\NamedMutexTest.h" />
+    <ClInclude Include="src\ProcessesTestSuite.h" />
+    <ClInclude Include="src\ProcessTest.h" />
+    <ClInclude Include="src\SharedMemoryTest.h" />
+    <ClInclude Include="src\TaskManagerTest.h" />
+    <ClInclude Include="src\TaskTest.h" />
+    <ClInclude Include="src\TaskTestSuite.h" />
+    <ClInclude Include="src\BasicEventTest.h" />
+    <ClInclude Include="src\DummyDelegate.h" />
+    <ClInclude Include="src\EventTestSuite.h" />
+    <ClInclude Include="src\FIFOEventTest.h" />
+    <ClInclude Include="src\PriorityEventTest.h" />
+    <ClInclude Include="src\CacheTestSuite.h" />
+    <ClInclude Include="src\ExpireCacheTest.h" />
+    <ClInclude Include="src\ExpireLRUCacheTest.h" />
+    <ClInclude Include="src\LRUCacheTest.h" />
+    <ClInclude Include="src\UniqueExpireCacheTest.h" />
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h" />
+    <ClInclude Include="src\HashingTestSuite.h" />
+    <ClInclude Include="src\HashMapTest.h" />
+    <ClInclude Include="src\HashSetTest.h" />
+    <ClInclude Include="src\HashTableTest.h" />
+    <ClInclude Include="src\LinearHashTableTest.h" />
+    <ClInclude Include="src\SimpleHashTableTest.h" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
index aa14bd19c..584bca56a 100644
--- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
+++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters
@@ -1,936 +1,939 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <ItemGroup>
-    <Filter Include="Core">
-      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\Source Files">
-      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Core\Header Files">
-      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Streams">
-      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Streams\Source Files">
-      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Streams\Header Files">
-      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypt">
-      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypt\Source Files">
-      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Crypt\Header Files">
-      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Notifications">
-      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Notifications\Source Files">
-      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Notifications\Header Files">
-      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Threading">
-      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Threading\Source Files">
-      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Threading\Header Files">
-      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="SharedLibrary">
-      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="SharedLibrary\Source Files">
-      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="SharedLibrary\Header Files">
-      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Logging">
-      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Logging\Source Files">
-      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Logging\Header Files">
-      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Filesystem">
-      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Filesystem\Source Files">
-      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Filesystem\Header Files">
-      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UUID">
-      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UUID\Source Files">
-      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="UUID\Header Files">
-      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DateTime">
-      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DateTime\Source Files">
-      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="DateTime\Header Files">
-      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Text">
-      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Text\Source Files">
-      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Text\Header Files">
-      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="URI">
-      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="URI\Source Files">
-      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="URI\Header Files">
-      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="_Suite">
-      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="_Suite\Source Files">
-      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="_Suite\Header Files">
-      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="_Driver">
-      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="_Driver\Source Files">
-      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Processes">
-      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Processes\Source Files">
-      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Processes\Header Files">
-      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tasks">
-      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tasks\Source Files">
-      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Tasks\Header Files">
-      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Event">
-      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Event\Header Files">
-      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Event\Source Files">
-      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Cache">
-      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Cache\Header Files">
-      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Cache\Source Files">
-      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Hashing">
-      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Hashing\Header Files">
-      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
-    </Filter>
-    <Filter Include="Hashing\Source Files">
-      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
-    </Filter>
-  </ItemGroup>
-  <ItemGroup>
-    <ClCompile Include="src\AnyTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\AutoPtrTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\AutoReleasePoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ByteOrderTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CoreTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CoreTestSuite.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DynamicAnyTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DynamicFactoryTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FormatTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FPETest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MemoryPoolTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NamedTuplesTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NDCTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NumberFormatterTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NumberParserTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RegularExpressionTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SharedPtrTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StringTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StringTokenizerTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TuplesTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TypeListTest.cpp">
-      <Filter>Core\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\Base64Test.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\BinaryReaderWriterTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CountingStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FileStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HexBinaryTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LineEndingConverterTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MemoryStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NullStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StreamCopierTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StreamsTestSuite.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StreamTokenizerTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TeeStreamTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ZLibTest.cpp">
-      <Filter>Streams\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CryptTestSuite.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DigestStreamTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HMACEngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MD4EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\MD5EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RandomStreamTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RandomTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SHA1EngineTest.cpp">
-      <Filter>Crypt\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NotificationCenterTest.cpp">
-      <Filter>Notifications\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NotificationQueueTest.cpp">
-      <Filter>Notifications\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NotificationsTestSuite.cpp">
-      <Filter>Notifications\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PriorityNotificationQueueTest.cpp">
-      <Filter>Notifications\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TimedNotificationQueueTest.cpp">
-      <Filter>Notifications\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ActiveDispatcherTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ActiveMethodTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ActivityTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ConditionTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\RWLockTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SemaphoreTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ThreadingTestSuite.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ThreadLocalTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ThreadPoolTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ThreadTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TimerTest.cpp">
-      <Filter>Threading\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ClassLoaderTest.cpp">
-      <Filter>SharedLibrary\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ManifestTest.cpp">
-      <Filter>SharedLibrary\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SharedLibraryTest.cpp">
-      <Filter>SharedLibrary\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SharedLibraryTestSuite.cpp">
-      <Filter>SharedLibrary\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TestPlugin.cpp">
-      <Filter>SharedLibrary\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ChannelTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FileChannelTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LoggerTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LoggingFactoryTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LoggingRegistryTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LoggingTestSuite.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LogStreamTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PatternFormatterTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SimpleFileChannelTest.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TestChannel.cpp">
-      <Filter>Logging\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FilesystemTestSuite.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FileTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\GlobTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PathTest.cpp">
-      <Filter>Filesystem\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UUIDGeneratorTest.cpp">
-      <Filter>UUID\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UUIDTest.cpp">
-      <Filter>UUID\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UUIDTestSuite.cpp">
-      <Filter>UUID\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DateTimeFormatterTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DateTimeParserTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DateTimeTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DateTimeTestSuite.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LocalDateTimeTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StopwatchTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TimespanTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TimestampTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TimezoneTest.cpp">
-      <Filter>DateTime\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\StreamConverterTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TextBufferIteratorTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TextConverterTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TextEncodingTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TextIteratorTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TextTestSuite.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UnicodeConverterTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UTF8StringTest.cpp">
-      <Filter>Text\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\URIStreamOpenerTest.cpp">
-      <Filter>URI\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\URITest.cpp">
-      <Filter>URI\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\URITestSuite.cpp">
-      <Filter>URI\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FoundationTestSuite.cpp">
-      <Filter>_Suite\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\WinDriver.cpp">
-      <Filter>_Driver\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NamedEventTest.cpp">
-      <Filter>Processes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\NamedMutexTest.cpp">
-      <Filter>Processes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ProcessesTestSuite.cpp">
-      <Filter>Processes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ProcessTest.cpp">
-      <Filter>Processes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SharedMemoryTest.cpp">
-      <Filter>Processes\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TaskManagerTest.cpp">
-      <Filter>Tasks\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TaskTest.cpp">
-      <Filter>Tasks\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\TaskTestSuite.cpp">
-      <Filter>Tasks\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\BasicEventTest.cpp">
-      <Filter>Event\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\DummyDelegate.cpp">
-      <Filter>Event\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\EventTestSuite.cpp">
-      <Filter>Event\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\FIFOEventTest.cpp">
-      <Filter>Event\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\PriorityEventTest.cpp">
-      <Filter>Event\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\CacheTestSuite.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ExpireCacheTest.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ExpireLRUCacheTest.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LRUCacheTest.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UniqueExpireCacheTest.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp">
-      <Filter>Cache\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HashingTestSuite.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HashMapTest.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HashSetTest.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\HashTableTest.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\LinearHashTableTest.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-    <ClCompile Include="src\SimpleHashTableTest.cpp">
-      <Filter>Hashing\Source Files</Filter>
-    </ClCompile>
-  </ItemGroup>
-  <ItemGroup>
-    <ClInclude Include="src\AnyTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\AutoPtrTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\AutoReleasePoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ByteOrderTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CoreTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CoreTestSuite.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DynamicAnyTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DynamicFactoryTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FormatTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FPETest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\MemoryPoolTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NamedTuplesTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NDCTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NumberFormatterTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NumberParserTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RegularExpressionTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SharedPtrTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StringTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StringTokenizerTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TuplesTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TypeListTest.h">
-      <Filter>Core\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\Base64Test.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\BinaryReaderWriterTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CountingStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FileStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HexBinaryTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LineEndingConverterTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\MemoryStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NullStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StreamCopierTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StreamsTestSuite.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StreamTokenizerTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TeeStreamTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ZLibTest.h">
-      <Filter>Streams\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CryptTestSuite.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DigestStreamTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HMACEngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\MD4EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\MD5EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RandomStreamTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RandomTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SHA1EngineTest.h">
-      <Filter>Crypt\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NotificationCenterTest.h">
-      <Filter>Notifications\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NotificationQueueTest.h">
-      <Filter>Notifications\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NotificationsTestSuite.h">
-      <Filter>Notifications\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PriorityNotificationQueueTest.h">
-      <Filter>Notifications\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TimedNotificationQueueTest.h">
-      <Filter>Notifications\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ActiveDispatcherTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ActiveMethodTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ActivityTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ConditionTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\RWLockTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SemaphoreTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ThreadingTestSuite.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ThreadLocalTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ThreadPoolTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ThreadTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TimerTest.h">
-      <Filter>Threading\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ClassLoaderTest.h">
-      <Filter>SharedLibrary\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ManifestTest.h">
-      <Filter>SharedLibrary\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SharedLibraryTest.h">
-      <Filter>SharedLibrary\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SharedLibraryTestSuite.h">
-      <Filter>SharedLibrary\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TestPlugin.h">
-      <Filter>SharedLibrary\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ChannelTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FileChannelTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LoggerTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LoggingFactoryTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LoggingRegistryTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LoggingTestSuite.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LogStreamTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PatternFormatterTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SimpleFileChannelTest.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TestChannel.h">
-      <Filter>Logging\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FilesystemTestSuite.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FileTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\GlobTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PathTest.h">
-      <Filter>Filesystem\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UUIDGeneratorTest.h">
-      <Filter>UUID\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UUIDTest.h">
-      <Filter>UUID\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UUIDTestSuite.h">
-      <Filter>UUID\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DateTimeFormatterTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DateTimeParserTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DateTimeTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DateTimeTestSuite.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LocalDateTimeTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StopwatchTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TimespanTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TimestampTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TimezoneTest.h">
-      <Filter>DateTime\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\StreamConverterTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TextBufferIteratorTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TextConverterTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TextEncodingTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TextIteratorTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TextTestSuite.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UnicodeConverterTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UTF8StringTest.h">
-      <Filter>Text\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\URIStreamOpenerTest.h">
-      <Filter>URI\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\URITest.h">
-      <Filter>URI\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\URITestSuite.h">
-      <Filter>URI\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FoundationTestSuite.h">
-      <Filter>_Suite\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NamedEventTest.h">
-      <Filter>Processes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\NamedMutexTest.h">
-      <Filter>Processes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ProcessesTestSuite.h">
-      <Filter>Processes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ProcessTest.h">
-      <Filter>Processes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SharedMemoryTest.h">
-      <Filter>Processes\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TaskManagerTest.h">
-      <Filter>Tasks\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TaskTest.h">
-      <Filter>Tasks\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\TaskTestSuite.h">
-      <Filter>Tasks\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\BasicEventTest.h">
-      <Filter>Event\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\DummyDelegate.h">
-      <Filter>Event\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\EventTestSuite.h">
-      <Filter>Event\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\FIFOEventTest.h">
-      <Filter>Event\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\PriorityEventTest.h">
-      <Filter>Event\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\CacheTestSuite.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ExpireCacheTest.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\ExpireLRUCacheTest.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LRUCacheTest.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UniqueExpireCacheTest.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\UniqueExpireLRUCacheTest.h">
-      <Filter>Cache\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HashingTestSuite.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HashMapTest.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HashSetTest.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\HashTableTest.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\LinearHashTableTest.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-    <ClInclude Include="src\SimpleHashTableTest.h">
-      <Filter>Hashing\Header Files</Filter>
-    </ClInclude>
-  </ItemGroup>
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Core">
+      <UniqueIdentifier>{a59b5185-a828-49a5-af23-d86b47d2c19c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Core\Source Files">
+      <UniqueIdentifier>{1e6128ad-7c36-4a4d-ad5c-c604171281c1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Core\Header Files">
+      <UniqueIdentifier>{7abaf643-e5e3-4023-bbe8-8b8febe849dd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Streams">
+      <UniqueIdentifier>{87d01d31-9117-4d34-9d22-7babfd7b7bff}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Streams\Source Files">
+      <UniqueIdentifier>{f6aad27f-31ed-496c-97ce-9c7d153d166d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Streams\Header Files">
+      <UniqueIdentifier>{d83da1d6-0738-4a6b-a7f7-fd79ac9ae23c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Crypt">
+      <UniqueIdentifier>{0ed8b0f5-8c2f-4c45-b211-e0144659fcb6}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Crypt\Source Files">
+      <UniqueIdentifier>{81f46737-5924-42f1-96dd-e809506231bd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Crypt\Header Files">
+      <UniqueIdentifier>{a0215363-3aef-44fa-b1a5-153f868079dc}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Notifications">
+      <UniqueIdentifier>{6ed14268-7950-426b-a6c8-b05a86890ab1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Notifications\Source Files">
+      <UniqueIdentifier>{09f64b14-f65d-4d7a-809a-29c3792f46b7}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Notifications\Header Files">
+      <UniqueIdentifier>{ffbc93f2-916d-43ca-9416-06c87734a668}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threading">
+      <UniqueIdentifier>{32ee8bb2-1b7b-4826-b50d-66e7f90fbe34}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threading\Source Files">
+      <UniqueIdentifier>{a8482038-01a5-4790-bd4a-1d857be47fec}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Threading\Header Files">
+      <UniqueIdentifier>{fa7c79fd-7b14-4aea-ba1b-6b9ad50e2e2d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SharedLibrary">
+      <UniqueIdentifier>{db211c8f-878a-41b0-9e48-53a7bd45b2cd}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SharedLibrary\Source Files">
+      <UniqueIdentifier>{00ac797c-cdfe-4dd5-b0d0-feea5cf4b3f0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="SharedLibrary\Header Files">
+      <UniqueIdentifier>{ef5ce424-fc18-4a60-8093-9f1ea328d52d}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Logging">
+      <UniqueIdentifier>{e9794e29-e01f-476a-b5b0-ee65be0c2132}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Logging\Source Files">
+      <UniqueIdentifier>{59047d4e-bd68-42a9-9309-7e624c42a9b0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Logging\Header Files">
+      <UniqueIdentifier>{110b921c-f4d4-4f37-bdf3-01a7a2538693}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Filesystem">
+      <UniqueIdentifier>{665bb14f-e709-4b3b-8ac3-3bf3a94b686f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Filesystem\Source Files">
+      <UniqueIdentifier>{9c0a2a3e-eb78-47b0-9768-ef0dfc6e23d9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Filesystem\Header Files">
+      <UniqueIdentifier>{71886495-7c6c-42c4-8a3e-4d0a93def203}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="UUID">
+      <UniqueIdentifier>{515441cb-c92a-4003-80ae-9cce02ed4c09}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="UUID\Source Files">
+      <UniqueIdentifier>{59f2f054-075b-4f91-8434-b9bc6d02f8a9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="UUID\Header Files">
+      <UniqueIdentifier>{1ad60877-d2c7-4061-8cb9-fd5f220bbc20}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DateTime">
+      <UniqueIdentifier>{d29fdc4f-a128-4f49-ae88-61ae7f63ffb2}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DateTime\Source Files">
+      <UniqueIdentifier>{907687c4-8f5f-4cf3-ae43-6ee1a22571de}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="DateTime\Header Files">
+      <UniqueIdentifier>{5d57a631-556c-4b0c-a417-de68ea3f1aeb}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Text">
+      <UniqueIdentifier>{1bbb02e6-b984-4ca8-8ea2-0e0ae41c09e9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Text\Source Files">
+      <UniqueIdentifier>{ea02acda-0ec0-41b8-8e85-19fbf1b71687}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Text\Header Files">
+      <UniqueIdentifier>{f0c7bb59-bb71-42fc-8275-aaed17decfb0}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="URI">
+      <UniqueIdentifier>{60844487-77c9-46e6-b54e-39d7c7139ec3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="URI\Source Files">
+      <UniqueIdentifier>{28b544d5-54dd-449c-b2c6-62f92ee68f94}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="URI\Header Files">
+      <UniqueIdentifier>{6f757782-30a7-47bb-b9c1-9197250c52d3}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_Suite">
+      <UniqueIdentifier>{40a76071-eda0-455b-a482-b5a37ffd0b9a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_Suite\Source Files">
+      <UniqueIdentifier>{a38b8ef3-6882-4a35-850c-9380db4b7d8b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_Suite\Header Files">
+      <UniqueIdentifier>{ec6d5b4b-fcf5-4a4a-9e90-c1b548939c42}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_Driver">
+      <UniqueIdentifier>{128755f3-1063-45aa-b4ad-6f796da5b60c}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="_Driver\Source Files">
+      <UniqueIdentifier>{52dde893-fa0a-4f27-8c92-e758a206d626}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Processes">
+      <UniqueIdentifier>{fee75e70-8621-4511-a6a0-50a32ca0b45b}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Processes\Source Files">
+      <UniqueIdentifier>{f89473da-f4fc-4aae-9fa4-2f8c361c06f1}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Processes\Header Files">
+      <UniqueIdentifier>{19f29f26-70d7-41d6-a8aa-3bcd7fd7448a}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tasks">
+      <UniqueIdentifier>{e5121ac0-03cc-416a-a403-1040fdbd6559}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tasks\Source Files">
+      <UniqueIdentifier>{1a7b3c9d-d60e-4b82-b146-4cb3ef47ce7f}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Tasks\Header Files">
+      <UniqueIdentifier>{7a7cb161-16b5-4b1c-97c3-7cdbf33a4013}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Event">
+      <UniqueIdentifier>{9378befb-ab93-48c0-9be3-df72edda5370}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Event\Header Files">
+      <UniqueIdentifier>{9af092ac-23f9-4829-aaf8-7409e3196a33}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Event\Source Files">
+      <UniqueIdentifier>{06f76446-a7b0-457b-8e4b-341d222f57ac}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Cache">
+      <UniqueIdentifier>{03e890a9-85f6-4148-bc85-d29640ba1250}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Cache\Header Files">
+      <UniqueIdentifier>{b16bd65c-3280-498f-b7a0-b51525a49971}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Cache\Source Files">
+      <UniqueIdentifier>{4e83f3e5-e513-4f4e-b3c2-1d0954b7d9b9}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Hashing">
+      <UniqueIdentifier>{14d22125-f7e7-47b8-9334-da6486ee9182}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Hashing\Header Files">
+      <UniqueIdentifier>{570d80b8-a7cf-4092-9bdd-f74ff73ec221}</UniqueIdentifier>
+    </Filter>
+    <Filter Include="Hashing\Source Files">
+      <UniqueIdentifier>{9793912a-a80c-4122-8d10-1edb0ea86a09}</UniqueIdentifier>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="src\AnyTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\AutoPtrTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\AutoReleasePoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ByteOrderTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CoreTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CoreTestSuite.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DynamicFactoryTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FormatTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FPETest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MemoryPoolTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NamedTuplesTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NDCTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NumberFormatterTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NumberParserTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RegularExpressionTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SharedPtrTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StringTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StringTokenizerTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TuplesTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TypeListTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\Base64Test.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\BinaryReaderWriterTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CountingStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FileStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HexBinaryTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LineEndingConverterTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MemoryStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NullStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StreamCopierTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StreamsTestSuite.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StreamTokenizerTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TeeStreamTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ZLibTest.cpp">
+      <Filter>Streams\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CryptTestSuite.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DigestStreamTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HMACEngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MD4EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\MD5EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RandomStreamTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RandomTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SHA1EngineTest.cpp">
+      <Filter>Crypt\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NotificationCenterTest.cpp">
+      <Filter>Notifications\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NotificationQueueTest.cpp">
+      <Filter>Notifications\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NotificationsTestSuite.cpp">
+      <Filter>Notifications\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\PriorityNotificationQueueTest.cpp">
+      <Filter>Notifications\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TimedNotificationQueueTest.cpp">
+      <Filter>Notifications\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ActiveDispatcherTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ActiveMethodTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ActivityTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ConditionTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\RWLockTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SemaphoreTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ThreadingTestSuite.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ThreadLocalTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ThreadPoolTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ThreadTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TimerTest.cpp">
+      <Filter>Threading\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ClassLoaderTest.cpp">
+      <Filter>SharedLibrary\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ManifestTest.cpp">
+      <Filter>SharedLibrary\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SharedLibraryTest.cpp">
+      <Filter>SharedLibrary\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SharedLibraryTestSuite.cpp">
+      <Filter>SharedLibrary\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TestPlugin.cpp">
+      <Filter>SharedLibrary\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ChannelTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FileChannelTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LoggerTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LoggingFactoryTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LoggingRegistryTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LoggingTestSuite.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LogStreamTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\PatternFormatterTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SimpleFileChannelTest.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TestChannel.cpp">
+      <Filter>Logging\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FilesystemTestSuite.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FileTest.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\GlobTest.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\PathTest.cpp">
+      <Filter>Filesystem\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UUIDGeneratorTest.cpp">
+      <Filter>UUID\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UUIDTest.cpp">
+      <Filter>UUID\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UUIDTestSuite.cpp">
+      <Filter>UUID\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DateTimeFormatterTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DateTimeParserTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DateTimeTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DateTimeTestSuite.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LocalDateTimeTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StopwatchTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TimespanTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TimestampTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TimezoneTest.cpp">
+      <Filter>DateTime\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\StreamConverterTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TextBufferIteratorTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TextConverterTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TextEncodingTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TextIteratorTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TextTestSuite.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UnicodeConverterTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UTF8StringTest.cpp">
+      <Filter>Text\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\URIStreamOpenerTest.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\URITest.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\URITestSuite.cpp">
+      <Filter>URI\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FoundationTestSuite.cpp">
+      <Filter>_Suite\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\WinDriver.cpp">
+      <Filter>_Driver\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NamedEventTest.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\NamedMutexTest.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ProcessesTestSuite.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ProcessTest.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SharedMemoryTest.cpp">
+      <Filter>Processes\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TaskManagerTest.cpp">
+      <Filter>Tasks\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TaskTest.cpp">
+      <Filter>Tasks\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\TaskTestSuite.cpp">
+      <Filter>Tasks\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\BasicEventTest.cpp">
+      <Filter>Event\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\DummyDelegate.cpp">
+      <Filter>Event\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\EventTestSuite.cpp">
+      <Filter>Event\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\FIFOEventTest.cpp">
+      <Filter>Event\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\PriorityEventTest.cpp">
+      <Filter>Event\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\CacheTestSuite.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ExpireCacheTest.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ExpireLRUCacheTest.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LRUCacheTest.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UniqueExpireCacheTest.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\UniqueExpireLRUCacheTest.cpp">
+      <Filter>Cache\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HashingTestSuite.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HashMapTest.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HashSetTest.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\HashTableTest.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\LinearHashTableTest.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\SimpleHashTableTest.cpp">
+      <Filter>Hashing\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\VarTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ArrayTest.cpp">
+      <Filter>Core\Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="src\AnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\AutoPtrTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\AutoReleasePoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ByteOrderTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CoreTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CoreTestSuite.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicAnyTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DynamicFactoryTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FormatTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FPETest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\MemoryPoolTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NamedTuplesTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NDCTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NumberFormatterTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NumberParserTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\RegularExpressionTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SharedPtrTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StringTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StringTokenizerTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TuplesTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TypeListTest.h">
+      <Filter>Core\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\Base64Test.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\BinaryReaderWriterTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CountingStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FileStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HexBinaryTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LineEndingConverterTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\MemoryStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NullStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StreamCopierTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StreamsTestSuite.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StreamTokenizerTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TeeStreamTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ZLibTest.h">
+      <Filter>Streams\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CryptTestSuite.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DigestStreamTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HMACEngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\MD4EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\MD5EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\RandomStreamTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\RandomTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SHA1EngineTest.h">
+      <Filter>Crypt\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NotificationCenterTest.h">
+      <Filter>Notifications\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NotificationQueueTest.h">
+      <Filter>Notifications\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NotificationsTestSuite.h">
+      <Filter>Notifications\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\PriorityNotificationQueueTest.h">
+      <Filter>Notifications\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TimedNotificationQueueTest.h">
+      <Filter>Notifications\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ActiveDispatcherTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ActiveMethodTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ActivityTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ConditionTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\RWLockTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SemaphoreTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ThreadingTestSuite.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ThreadLocalTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ThreadPoolTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ThreadTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TimerTest.h">
+      <Filter>Threading\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ClassLoaderTest.h">
+      <Filter>SharedLibrary\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ManifestTest.h">
+      <Filter>SharedLibrary\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SharedLibraryTest.h">
+      <Filter>SharedLibrary\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SharedLibraryTestSuite.h">
+      <Filter>SharedLibrary\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TestPlugin.h">
+      <Filter>SharedLibrary\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ChannelTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FileChannelTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LoggerTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LoggingFactoryTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LoggingRegistryTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LoggingTestSuite.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LogStreamTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\PatternFormatterTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SimpleFileChannelTest.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TestChannel.h">
+      <Filter>Logging\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FilesystemTestSuite.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FileTest.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\GlobTest.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\PathTest.h">
+      <Filter>Filesystem\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UUIDGeneratorTest.h">
+      <Filter>UUID\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UUIDTest.h">
+      <Filter>UUID\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UUIDTestSuite.h">
+      <Filter>UUID\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DateTimeFormatterTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DateTimeParserTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DateTimeTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DateTimeTestSuite.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LocalDateTimeTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StopwatchTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TimespanTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TimestampTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TimezoneTest.h">
+      <Filter>DateTime\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\StreamConverterTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TextBufferIteratorTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TextConverterTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TextEncodingTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TextIteratorTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TextTestSuite.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UnicodeConverterTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UTF8StringTest.h">
+      <Filter>Text\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\URIStreamOpenerTest.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\URITest.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\URITestSuite.h">
+      <Filter>URI\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FoundationTestSuite.h">
+      <Filter>_Suite\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NamedEventTest.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\NamedMutexTest.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ProcessesTestSuite.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ProcessTest.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SharedMemoryTest.h">
+      <Filter>Processes\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TaskManagerTest.h">
+      <Filter>Tasks\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TaskTest.h">
+      <Filter>Tasks\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\TaskTestSuite.h">
+      <Filter>Tasks\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\BasicEventTest.h">
+      <Filter>Event\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\DummyDelegate.h">
+      <Filter>Event\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\EventTestSuite.h">
+      <Filter>Event\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\FIFOEventTest.h">
+      <Filter>Event\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\PriorityEventTest.h">
+      <Filter>Event\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\CacheTestSuite.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ExpireCacheTest.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\ExpireLRUCacheTest.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LRUCacheTest.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UniqueExpireCacheTest.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\UniqueExpireLRUCacheTest.h">
+      <Filter>Cache\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HashingTestSuite.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HashMapTest.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HashSetTest.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\HashTableTest.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\LinearHashTableTest.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="src\SimpleHashTableTest.h">
+      <Filter>Hashing\Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
 </Project>
\ No newline at end of file