Merge branch 'trunk' into parallel-file-ops

2 files changed, 33 insertions, 44 deletions

diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
index ac7675ba5..4e385f376 100644
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj
+++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj
@@ -19,23 +19,17 @@
     </ProjectConfiguration>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\tests.arguments.cpp" />

-    <ClCompile Include="..\src\tests.chrono.cpp" />

-    <ClCompile Include="..\src\tests.dependencies.cpp" />

-    <ClCompile Include="..\src\tests.files.cpp" />

-    <ClCompile Include="..\src\tests.packagespec.cpp" />

-    <ClCompile Include="..\src\tests.paragraph.cpp" />

-    <ClCompile Include="..\src\tests.pch.cpp">

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">Create</PrecompiledHeader>

-      <PrecompiledHeader Condition="'$(Configuration)|$(Platform)'=='Release|x64'">Create</PrecompiledHeader>

-    </ClCompile>

-    <ClCompile Include="..\src\tests.plan.cpp" />

-    <ClCompile Include="..\src\tests.statusparagraphs.cpp" />

-    <ClCompile Include="..\src\tests.strings.cpp" />

-    <ClCompile Include="..\src\tests.update.cpp" />

-    <ClCompile Include="..\src\tests.utils.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\arguments.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\catch.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\chrono.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\dependencies.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\paragraph.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\plan.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\specifier.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\statusparagraphs.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\supports.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\update.cpp" />

+    <ClCompile Include="..\src\vcpkg-tests\util.cpp" />

   </ItemGroup>

   <ItemGroup>

     <ProjectReference Include="..\vcpkglib\vcpkglib.vcxproj">

@@ -43,8 +37,8 @@
     </ProjectReference>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\include\tests.pch.h" />

-    <ClInclude Include="..\include\tests.utils.h" />

+    <ClInclude Include="..\include\vcpkg-tests\catch.h" />

+    <ClInclude Include="..\include\vcpkg-tests\util.h" />

   </ItemGroup>

   <PropertyGroup Label="Globals">

     <ProjectGuid>{F27B8DB0-1279-4AF8-A2E3-1D49C4F0220D}</ProjectGuid>

@@ -68,7 +62,7 @@
     <UseOfMfc>false</UseOfMfc>

   </PropertyGroup>

   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">

-    <ConfigurationType>DynamicLibrary</ConfigurationType>

+    <ConfigurationType>Application</ConfigurationType>

     <UseDebugLibraries>true</UseDebugLibraries>

     <CharacterSet>Unicode</CharacterSet>

     <UseOfMfc>false</UseOfMfc>

@@ -112,38 +106,34 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" />

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">

     <ClCompile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level3</WarningLevel>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <UseFullPaths>true</UseFullPaths>

-      <PrecompiledHeaderFile>tests.pch.h</PrecompiledHeaderFile>

       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <MinimalRebuild>false</MinimalRebuild>

     </ClCompile>

     <Link>

-      <SubSystem>Windows</SubSystem>

+      <SubSystem>Console</SubSystem>

       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

   </ItemDefinitionGroup>

   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">

     <ClCompile>

-      <PrecompiledHeader>Use</PrecompiledHeader>

       <WarningLevel>Level4</WarningLevel>

       <Optimization>Disabled</Optimization>

       <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <UseFullPaths>true</UseFullPaths>

-      <PrecompiledHeaderFile>tests.pch.h</PrecompiledHeaderFile>

       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

       <MinimalRebuild>false</MinimalRebuild>

     </ClCompile>

     <Link>

-      <SubSystem>Windows</SubSystem>

+      <SubSystem>Console</SubSystem>

       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

       <AdditionalDependencies>kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;Bcrypt.lib;%(AdditionalDependencies)</AdditionalDependencies>

     </Link>

@@ -151,19 +141,17 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

       <Optimization>MaxSpeed</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>WIN32;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <UseFullPaths>true</UseFullPaths>

-      <PrecompiledHeaderFile>tests.pch.h</PrecompiledHeaderFile>

       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

-      <SubSystem>Windows</SubSystem>

+      <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

@@ -173,19 +161,17 @@
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">

     <ClCompile>

       <WarningLevel>Level3</WarningLevel>

-      <PrecompiledHeader>Use</PrecompiledHeader>

       <Optimization>MaxSpeed</Optimization>

       <FunctionLevelLinking>true</FunctionLevelLinking>

       <IntrinsicFunctions>true</IntrinsicFunctions>

       <AdditionalIncludeDirectories>..\include;$(VCInstallDir)UnitTest\include;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>

       <UseFullPaths>true</UseFullPaths>

-      <PrecompiledHeaderFile>tests.pch.h</PrecompiledHeaderFile>

       <AdditionalOptions>/std:c++latest %(AdditionalOptions)</AdditionalOptions>

       <MultiProcessorCompilation>true</MultiProcessorCompilation>

     </ClCompile>

     <Link>

-      <SubSystem>Windows</SubSystem>

+      <SubSystem>Console</SubSystem>

       <EnableCOMDATFolding>true</EnableCOMDATFolding>

       <OptimizeReferences>true</OptimizeReferences>

       <AdditionalLibraryDirectories>$(VCInstallDir)UnitTest\lib;$(VsInstallRoot)\VC\Auxiliary\VS\UnitTest\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>

diff --git a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
index 057c50a99..d9808ca89 100644
--- a/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
+++ b/toolsrc/vcpkgtest/vcpkgtest.vcxproj.filters
@@ -15,34 +15,37 @@
     </Filter>

   </ItemGroup>

   <ItemGroup>

-    <ClCompile Include="..\src\tests.arguments.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\arguments.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.dependencies.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\catch.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.packagespec.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\chrono.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.paragraph.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\dependencies.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.statusparagraphs.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\paragraph.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.plan.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\plan.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.update.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\specifier.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.pch.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\statusparagraphs.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.utils.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\supports.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

-    <ClCompile Include="..\src\tests.chrono.cpp">

+    <ClCompile Include="..\src\vcpkg-tests\update.cpp">

+      <Filter>Source Files</Filter>

+    </ClCompile>

+    <ClCompile Include="..\src\vcpkg-tests\util.cpp">

       <Filter>Source Files</Filter>

     </ClCompile>

     <ClCompile Include="..\src\tests.files.cpp">

@@ -53,10 +56,10 @@
     </ClCompile>

   </ItemGroup>

   <ItemGroup>

-    <ClInclude Include="..\include\tests.pch.h">

+    <ClInclude Include="..\include\vcpkg-tests\catch.h">

       <Filter>Header Files</Filter>

     </ClInclude>

-    <ClInclude Include="..\include\tests.utils.h">

+    <ClInclude Include="..\include\vcpkg-tests\util.h">

       <Filter>Header Files</Filter>

     </ClInclude>

   </ItemGroup>