Home Explore Help
Sign In
Wfj
/
poco
mirror of https://github.com/pocoproject/poco.git
2
0
Fork 0
Files Issues 0 Wiki
Browse Source

chore: fix vs project files

Günter Obiltschnig 2 years ago
parent
58b370bec0
commit
37e17092ff
100 changed files with 2459 additions and 799 deletions
Split View Show Diff Stats
  1. 15 8
      ActiveRecord/ActiveRecord_vs160.vcxproj
  2. 3 3
      ActiveRecord/ActiveRecord_vs160.vcxproj.filters
  3. 19 7
      ActiveRecord/Compiler/Compiler_vs160.vcxproj
  4. 2 2
      ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters
  5. 65 19
      ActiveRecord/testsuite/TestSuite_vs160.vcxproj
  6. 4 4
      ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters
  7. 15 8
      CppParser/CppParser_vs160.vcxproj
  8. 9 9
      CppParser/CppParser_vs160.vcxproj.filters
  9. 55 8
      CppParser/testsuite/TestSuite_vs160.vcxproj
  10. 11 11
      CppParser/testsuite/TestSuite_vs160.vcxproj.filters
  11. 15 8
      CppUnit/CppUnit_vs160.vcxproj
  12. 2 2
      CppUnit/CppUnit_vs160.vcxproj.filters
  13. 15 8
      Crypto/Crypto_vs160.vcxproj
  14. 18 18
      Crypto/Crypto_vs160.vcxproj.filters
  15. 47 8
      Crypto/samples/genrsakey/genrsakey_vs160.vcxproj
  16. 2 2
      Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters
  17. 63 8
      Crypto/testsuite/TestSuite_vs160.vcxproj
  18. 8 8
      Crypto/testsuite/TestSuite_vs160.vcxproj.filters
  19. 14 7
      Data/DataTest/DataTest_vs160.vcxproj
  20. 2 2
      Data/DataTest/DataTest_vs160.vcxproj.filters
  21. 1 1
      Data/Data_vs160.sln
  22. 15 8
      Data/Data_vs160.vcxproj
  23. 21 21
      Data/Data_vs160.vcxproj.filters
  24. 15 8
      Data/MySQL/MySQL_vs160.vcxproj
  25. 63 19
      Data/MySQL/testsuite/TestSuite_vs160.vcxproj
  26. 8 8
      Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters
  27. 15 8
      Data/ODBC/ODBC_vs160.vcxproj
  28. 3 3
      Data/ODBC/ODBC_vs160.vcxproj.filters
  29. 77 19
      Data/ODBC/testsuite/TestSuite_vs160.vcxproj
  30. 8 8
      Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters
  31. 15 8
      Data/PostgreSQL/PostgreSQL_vs160.vcxproj
  32. 63 19
      Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj
  33. 8 8
      Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters
  34. 15 8
      Data/SQLite/SQLite_vs160.vcxproj
  35. 6 6
      Data/SQLite/SQLite_vs160.vcxproj.filters
  36. 61 19
      Data/SQLite/testsuite/TestSuite_vs160.vcxproj
  37. 8 8
      Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters
  38. 57 19
      Data/samples/Binding/Binding_vs160.vcxproj
  39. 2 2
      Data/samples/Binding/Binding_vs160.vcxproj.filters
  40. 57 19
      Data/samples/RecordSet/RecordSet_vs160.vcxproj
  41. 2 2
      Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters
  42. 57 19
      Data/samples/RowFormatter/RowFormatter_vs160.vcxproj
  43. 2 2
      Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters
  44. 57 19
      Data/samples/Tuple/Tuple_vs160.vcxproj
  45. 2 2
      Data/samples/Tuple/Tuple_vs160.vcxproj.filters
  46. 57 19
      Data/samples/TypeHandler/TypeHandler_vs160.vcxproj
  47. 2 2
      Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters
  48. 57 19
      Data/samples/WebNotifier/WebNotifier_vs160.vcxproj
  49. 2 2
      Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters
  50. 89 31
      Data/testsuite/TestSuite_vs160.vcxproj
  51. 17 17
      Data/testsuite/TestSuite_vs160.vcxproj.filters
  52. 15 8
      Encodings/Encodings_vs160.vcxproj
  53. 3 3
      Encodings/Encodings_vs160.vcxproj.filters
  54. 47 8
      Encodings/samples/TextConverter/TextConverter_vs160.vcxproj
  55. 2 2
      Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters
  56. 51 8
      Encodings/testsuite/TestSuite_vs160.vcxproj
  57. 2 2
      Encodings/testsuite/TestSuite_vs160.vcxproj.filters
  58. 14 1
      Foundation/Foundation_vs160.vcxproj
  59. 2 0
      Foundation/Foundation_vs160.vcxproj.filters
  60. 54 30
      Foundation/testsuite/TestApp_vs160.vcxproj
  61. 4 0
      Foundation/testsuite/TestLibrary_vs160.vcxproj
  62. 15 1
      Foundation/testsuite/TestSuite_vs160.vcxproj
  63. 12 0
      Foundation/testsuite/TestSuite_vs160.vcxproj.filters
  64. 6 2
      Foundation/testsuite/TestSuite_vs170.vcxproj.filters
  65. 15 8
      JSON/JSON_vs160.vcxproj
  66. 2 2
      JSON/JSON_vs160.vcxproj.filters
  67. 59 8
      JSON/samples/Benchmark/Benchmark_vs160.vcxproj
  68. 2 2
      JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters
  69. 63 8
      JSON/testsuite/TestSuite_vs160.vcxproj
  70. 2 2
      JSON/testsuite/TestSuite_vs160.vcxproj.filters
  71. 15 8
      JWT/JWT_vs160.vcxproj
  72. 2 2
      JWT/JWT_vs160.vcxproj.filters
  73. 67 8
      JWT/testsuite/TestSuite_vs160.vcxproj
  74. 2 2
      JWT/testsuite/TestSuite_vs160.vcxproj.filters
  75. 15 8
      MongoDB/MongoDB_vs160.vcxproj
  76. 2 2
      MongoDB/MongoDB_vs160.vcxproj.filters
  77. 59 8
      MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj
  78. 2 2
      MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters
  79. 63 11
      MongoDB/testsuite/TestSuite_vs160.vcxproj
  80. 2 2
      MongoDB/testsuite/TestSuite_vs160.vcxproj.filters
  81. 15 8
      Net/Net_vs160.vcxproj
  82. 54 54
      Net/Net_vs160.vcxproj.filters
  83. 59 8
      Net/samples/EchoServer/EchoServer_vs160.vcxproj
  84. 2 2
      Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters
  85. 59 8
      Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj
  86. 2 2
      Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters
  87. 59 8
      Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj
  88. 1 1
      Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters
  89. 59 8
      Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj
  90. 2 2
      Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters
  91. 59 8
      Net/samples/Mail/Mail_vs160.vcxproj
  92. 1 1
      Net/samples/Mail/Mail_vs160.vcxproj.filters
  93. 59 8
      Net/samples/Ping/Ping_vs160.vcxproj
  94. 2 2
      Net/samples/Ping/Ping_vs160.vcxproj.filters
  95. 59 8
      Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj
  96. 1 1
      Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters
  97. 59 8
      Net/samples/TimeServer/TimeServer_vs160.vcxproj
  98. 2 2
      Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters
  99. 59 8
      Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj
  100. 1 1
      Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters

+ 15 - 8
ActiveRecord/ActiveRecord_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoActiveRecordd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoActiveRecordmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoActiveRecordmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\bin\PocoActiveRecordd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoActiveRecordd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoActiveRecordd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoActiveRecordmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoActiveRecordmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoActiveRecordmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\bin64\PocoActiveRecord64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoActiveRecord64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoActiveRecordd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoActiveRecordmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoActiveRecordmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 3 - 3
ActiveRecord/ActiveRecord_vs160.vcxproj.filters
View File 

@@ -2,13 +2,13 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="ActiveRecord">
 
-      <UniqueIdentifier>{21ea7671-1c32-4a3f-b9f7-6170960ef1ac}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e1ff1256-5ffb-4edf-b636-f0ae436cd880}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ActiveRecord\Header Files">
 
-      <UniqueIdentifier>{0da9c9e9-91ad-4a2d-bc9d-04cb5b7062ae}</UniqueIdentifier>
 
+      <UniqueIdentifier>{878bb6cf-d0f0-43f3-80be-a6c49e7fcdc0}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ActiveRecord\Source Files">
 
-      <UniqueIdentifier>{fd4fcc95-c1a1-4535-bc22-58f09ebe8669}</UniqueIdentifier>
 
+      <UniqueIdentifier>{4ee94537-e10b-4905-9e08-83a9aa0c19ac}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 19 - 7
ActiveRecord/Compiler/Compiler_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">poco-arcd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">poco-arcd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">poco-arcd</TargetName>
 
@@ -248,6 +248,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -257,7 +258,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -281,6 +282,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -311,6 +313,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -321,7 +324,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -345,6 +348,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -376,6 +380,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -386,7 +391,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -410,6 +415,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -441,6 +447,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -450,7 +457,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -474,6 +481,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -504,6 +512,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -514,7 +523,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -538,6 +547,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -569,6 +579,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -579,7 +590,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\poco-arcd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -603,6 +614,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 2 - 2
ActiveRecord/Compiler/Compiler_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{29e1ed49-5f12-41fa-94f4-8fe6b3ee5954}</UniqueIdentifier>
 
+      <UniqueIdentifier>{53cccc79-2fa5-454a-8962-a80b8e772eaa}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{ba5400bd-3c95-43bb-8daa-39bff07be443}</UniqueIdentifier>
 
+      <UniqueIdentifier>{809ee132-09bd-4dad-8c59-e88977d7f12c}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 65 - 19
ActiveRecord/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLParser;..\..\Data\SQLParser\src; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include; 	..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,18 +637,28 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\ActiveRecordTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ActiveRecordTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Employee.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Role.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 4 - 4
ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,16 +2,16 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{029152e5-3d3c-4359-8e19-e3339dfb916f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{18d9df2e-b44e-46a1-89f9-1f2f0d2e816f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{81913cce-c711-403e-8bcf-9bea3ce7162b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{5bf0e9d1-a181-47a6-828b-209f7d33b194}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Generated Header Files">
 
-      <UniqueIdentifier>{a659828c-15fc-4d14-b7c1-b96b779ad220}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b59d4ea7-d1c4-42f0-ac59-f4419cbaabdf}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Generated Source Files">
 
-      <UniqueIdentifier>{321ae715-2a94-4ecb-8368-473b38ae89eb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{680e519d-37d6-412a-aacc-21c82caa59d3}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
CppParser/CppParser_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCppParserd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCppParsermdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCppParsermtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\bin\PocoCppParserd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoCppParserd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoCppParserd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCppParsermd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\bin64\PocoCppParser64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoCppParser64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoCppParserd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoCppParsermdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 9 - 9
CppParser/CppParser_vs160.vcxproj.filters
View File 

@@ -2,31 +2,31 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="CppParser">
 
-      <UniqueIdentifier>{da4186ae-05f3-4abf-9fa2-2386db3876cc}</UniqueIdentifier>
 
+      <UniqueIdentifier>{78ecda8b-38b1-4bed-932f-02ebe18f2b52}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CppParser\Header Files">
 
-      <UniqueIdentifier>{4e9b5445-27e0-4fd0-824a-d6355c6724bc}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b38335e1-d932-4eec-ba2a-4a50fb8eef30}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CppParser\Source Files">
 
-      <UniqueIdentifier>{b5f7d3f9-a74b-4b59-b455-0d59c6200a98}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2415ef0b-be5f-4f5e-a150-f6e13a8d2a02}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Symbol Table">
 
-      <UniqueIdentifier>{eacfeb40-f333-426c-a5a5-c9ab85d209ea}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0d1aa205-1f5e-48d3-8f67-71125f193a0c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Symbol Table\Header Files">
 
-      <UniqueIdentifier>{f3023194-357d-4e15-a227-3099ba997037}</UniqueIdentifier>
 
+      <UniqueIdentifier>{406ad7af-4bef-4dbb-acc7-9abc8d0977cc}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Symbol Table\Source Files">
 
-      <UniqueIdentifier>{a1919762-b8ac-4d28-903d-511854a1a7b1}</UniqueIdentifier>
 
+      <UniqueIdentifier>{41388393-2d90-46aa-90de-24d4186cc3af}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes">
 
-      <UniqueIdentifier>{9106be0a-6821-40f4-b460-437e72cbadfe}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8afc7c3a-be7c-460c-9d74-8af0fab90754}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes\Header Files">
 
-      <UniqueIdentifier>{906e5fe8-c28f-4c31-9dee-f3f9bcbcde35}</UniqueIdentifier>
 
+      <UniqueIdentifier>{36ac1f5a-6d4c-46e6-be3e-16cadb0a20dc}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes\Source Files">
 
-      <UniqueIdentifier>{0f617a7a-cf68-4dbd-8de3-7a89a99756e5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e31474cf-8e07-4bbe-8bb1-d3a4a6156cfe}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 55 - 8
CppParser/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{C79112BD-EC91-11DA-A4CE-005056C00008}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -606,18 +643,28 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\AttributesParserTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\AttributesTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\CppParserTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\CppParserTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 11 - 11
CppParser/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,37 +2,37 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="CppParser">
 
-      <UniqueIdentifier>{7e82e351-8c9c-404d-b62f-7ff0b1cbded6}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b7eb186c-6d98-44ea-88d9-7ba64f2c2cbd}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CppParser\Header Files">
 
-      <UniqueIdentifier>{ba027956-cf2a-4462-81ba-6b97179f19ed}</UniqueIdentifier>
 
+      <UniqueIdentifier>{cac83a53-c5c1-49a5-ab07-1f5d017b8373}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CppParser\Source Files">
 
-      <UniqueIdentifier>{e5bfb176-2c0f-4abb-bd50-0a2ca6f6dda7}</UniqueIdentifier>
 
+      <UniqueIdentifier>{327f4385-9f15-4f53-9dc8-de2f33c439ba}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{24575ba0-d4a4-4d3e-96a7-4c65b822e026}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2d41c3cf-92ca-492a-a07c-dc9cbd0b4d3a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{62668e54-1a2e-48be-bb05-d70c64db290c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{dd772fd7-0956-4f15-ac7c-e8fe40f3795e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{cad5eb58-8ba7-47e7-83d6-fd28eff818c8}</UniqueIdentifier>
 
+      <UniqueIdentifier>{bd3f5103-bafb-46cb-a7be-f7c309546832}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{651bef21-f8c1-40eb-9ce9-a1b40de62613}</UniqueIdentifier>
 
+      <UniqueIdentifier>{59eb86f0-e471-45e2-87da-5da5830e3876}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{b6451503-ecc0-4709-a4fd-7d2fed9ee23b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{118b9dc2-cd9e-4a7a-9ffd-087058609b65}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes">
 
-      <UniqueIdentifier>{04d750cf-e74e-409e-959f-e7b4fab071a0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{20a55dfe-ea8e-4f16-8768-3805893a4f02}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes\Header Files">
 
-      <UniqueIdentifier>{d2e4aabd-17a8-46ad-ae3a-bb914a60f0eb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e01c68ae-0ee9-497d-9bc3-5b6ca974a267}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Attributes\Source Files">
 
-      <UniqueIdentifier>{a3613dea-1d13-44dd-9a59-df545a649c07}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c733f92c-ef7d-4467-8011-a7001a719bec}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
CppUnit/CppUnit_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">CppUnitd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">CppUnitmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">CppUnitmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\bin\CppUnitd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\CppUnitd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\CppUnitd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\CppUnitmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\CppUnitmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\CppUnitmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\bin64\CppUnit64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\CppUnit64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\CppUnitd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\CppUnitmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\CppUnitmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 2 - 2
CppUnit/CppUnit_vs160.vcxproj.filters
View File 

@@ -2,11 +2,11 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{963448fa-022d-4c44-9361-96ba38e785ba}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f9027807-6f7f-40c0-a1cd-9416954a6f21}</UniqueIdentifier>
 
       <Extensions>cpp;c;cxx;rc;def;r;odl;idl;hpj;bat</Extensions>
 
     </Filter>
 
     <Filter Include="Include Files">
 
-      <UniqueIdentifier>{c9d5e2ec-2012-46bb-b312-d85c687d338a}</UniqueIdentifier>
 
+      <UniqueIdentifier>{600d9ce8-b49c-402b-b4d8-f975f907ebcf}</UniqueIdentifier>
 
       <Extensions>*.h</Extensions>
 
     </Filter>
 
   </ItemGroup>

+ 15 - 8
Crypto/Crypto_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoCryptod</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoCryptomdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoCryptomtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\bin\PocoCryptod.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoCryptod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoCryptod.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCryptomtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -336,6 +338,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -357,7 +360,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCryptomdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -385,7 +388,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoCryptomd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -414,6 +417,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -423,7 +427,7 @@
 
       <OutputFile>..\bin64\PocoCrypto64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoCrypto64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoCryptod.lib</ImportLibrary>
 
@@ -449,6 +453,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -479,7 +484,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -510,6 +515,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -531,7 +537,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoCryptomdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -562,6 +568,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 18 - 18
Crypto/Crypto_vs160.vcxproj.filters
View File 

@@ -2,58 +2,58 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Cipher">
 
-      <UniqueIdentifier>{7e010cae-f020-472a-9415-8e2543ef6627}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1b341421-b0a6-41ba-b9e7-23a78d22e64e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Cipher\Header Files">
 
-      <UniqueIdentifier>{05818654-8d93-468d-8d69-b11c10c0b9ef}</UniqueIdentifier>
 
+      <UniqueIdentifier>{3410e096-721e-4bbb-95a9-c3399e4bc916}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Cipher\Source Files">
 
-      <UniqueIdentifier>{19e6289b-8a3c-44f3-ae04-d62f6f3f1b5c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{fe6936eb-e9ca-4766-aaa4-844dc49f49f9}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="RSA">
 
-      <UniqueIdentifier>{ce38da17-a330-495e-9f3e-1b13265936e2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0c0e5ba2-303f-47bd-8050-60d8624ad54b}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="RSA\Header Files">
 
-      <UniqueIdentifier>{5822cad2-ab82-412d-abf8-6a3d01487a69}</UniqueIdentifier>
 
+      <UniqueIdentifier>{deac82b6-db04-432c-9529-e509ba29ce3c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="RSA\Source Files">
 
-      <UniqueIdentifier>{7cb7227e-5207-4603-8e22-7bfabcb92419}</UniqueIdentifier>
 
+      <UniqueIdentifier>{73b6588c-1b71-4876-8688-3fef4d5d50f5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Certificate">
 
-      <UniqueIdentifier>{3fe6235b-ca65-4006-bd43-af0ec04bd7f1}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a176bed7-cbc3-43b5-9bad-5d141f68bcad}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Certificate\Header Files">
 
-      <UniqueIdentifier>{2918c4ac-4fed-4cf6-b543-ffc4dcfa4b82}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a3119f32-061e-49cb-8add-e43f347dca70}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Certificate\Source Files">
 
-      <UniqueIdentifier>{9e75a9b3-e8d3-48e8-ba2f-58d7bd2a6a9d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c2343031-10e4-42c1-9588-5f9a5465fcff}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CryptoCore">
 
-      <UniqueIdentifier>{4824d8a4-40bf-4a78-86db-73b06e2deb5e}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f60a6df2-2e50-4bd6-aa93-a10781df4a63}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CryptoCore\Header Files">
 
-      <UniqueIdentifier>{07188323-9cd6-44c4-86df-adaa06f7056b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{bd3c3a14-025d-473f-ab7d-caa706137c9c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="CryptoCore\Source Files">
 
-      <UniqueIdentifier>{7c066cff-b417-440f-a723-d0f884234e31}</UniqueIdentifier>
 
+      <UniqueIdentifier>{16e91055-e1a0-43ec-b101-278c3cc10e01}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Digest">
 
-      <UniqueIdentifier>{4131f2ad-b79f-468f-829c-cc6e694b9b09}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0c9aa960-60a9-4878-8944-397b68d63fbd}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Digest\Header Files">
 
-      <UniqueIdentifier>{67dfe23d-8945-4c6b-bc99-5c26d1c9e9fb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{3001a9e0-0691-4be4-acac-14c6e7e44c60}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Digest\Source Files">
 
-      <UniqueIdentifier>{96be4aeb-3299-4fb1-a7dd-d788584523b4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{de5ddc8e-00be-40a3-823f-f1a0392c609c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="EC">
 
-      <UniqueIdentifier>{6102403a-212b-497e-a639-ad4bbc94103d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b0fec04d-de08-48ec-ac41-87a5ddebfb09}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="EC\Header Files">
 
-      <UniqueIdentifier>{7f4dc99b-5489-41b5-bc75-5f720932de65}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d204272f-6c1d-4190-81e1-bc53453ef186}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="EC\Source Files">
 
-      <UniqueIdentifier>{49649e1a-09cf-45d1-92a9-a3aa6abe43b4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{169dabef-3127-4621-a773-c1cf094f877c}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 47 - 8
Crypto/samples/genrsakey/genrsakey_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>genrsakey</ProjectName>
 
     <ProjectGuid>{D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}</ProjectGuid>
 
     <RootNamespace>genrsakey</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">genrsakeyd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">genrsakeyd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">genrsakeyd</TargetName>
 
@@ -247,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\genrsakeyd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\genrsakey.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{314634df-6e17-459f-8cb0-043b9c63008d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{57c66ce0-14be-41b6-9ac1-70ff5c861a0d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{0bd5873e-700a-4d59-95f2-89c45d00cb85}</UniqueIdentifier>
 
+      <UniqueIdentifier>{957962bc-87ba-4593-8c97-67ce38990384}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 63 - 8
Crypto/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>16.0.32629.160</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -610,30 +647,48 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\CryptoTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\CryptoTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\DigestEngineTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ECTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\EnvelopeTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\EVPTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\PKCS12ContainerTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\RSATest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 8 - 8
Crypto/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,28 +2,28 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Crypto">
 
-      <UniqueIdentifier>{8e27cadf-c720-479f-92da-b1e97f437438}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1c8c4bc2-2664-41f8-a5ce-337f1754dd6d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Crypto\Header Files">
 
-      <UniqueIdentifier>{91a5793c-8b68-45d0-b350-877dd6cf2c02}</UniqueIdentifier>
 
+      <UniqueIdentifier>{507a694a-3f97-4615-b518-71a96c0f8af1}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Crypto\Source Files">
 
-      <UniqueIdentifier>{a14e5add-e33d-424b-be23-0b8371e22609}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0805e26c-6eac-4d28-9535-56b09fffdac3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{f231f366-be62-4292-ab26-f91a41191403}</UniqueIdentifier>
 
+      <UniqueIdentifier>{96c9803e-6512-48db-a9f6-2fc1d2b344de}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{ec44c7f3-b2a1-4b59-9081-8e61ddef1c44}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a884018a-76b4-44f4-a199-87c08d34040f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{728bece6-f76d-483c-a028-52f91599a7e7}</UniqueIdentifier>
 
+      <UniqueIdentifier>{20122988-a0fc-42a9-89e7-5c9b0783a76f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{57064194-c6d7-414b-9f0d-a1707f6e0c8d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e50bf5e7-1e0f-49cd-896c-32a553a84d75}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{60671a47-3546-4b5d-b1e9-275110dd36ca}</UniqueIdentifier>
 
+      <UniqueIdentifier>{aa64f38d-2dfb-48b3-8495-904c8ace997d}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 14 - 7
Data/DataTest/DataTest_vs160.vcxproj
View File 

@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\..\bin\PocoDataTestd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin\PocoDataTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib\PocoDataTestd.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataTestmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataTestmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataTestmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\..\bin64\PocoDataTest64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin64\PocoDataTest64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib64\PocoDataTestd.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataTestmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataTestmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 2 - 2
Data/DataTest/DataTest_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{bfaeab8a-6993-43f5-8480-8f3203553063}</UniqueIdentifier>
 
+      <UniqueIdentifier>{3d0da798-3bb5-48a5-ae71-60141f2d3277}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{ea7b7225-45df-4878-813b-4e01cdf3fe31}</UniqueIdentifier>
 
+      <UniqueIdentifier>{ea627452-9089-42dc-b0ae-54afbbeb03d0}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
Data/Data_vs160.sln
View File 

@@ -7,7 +7,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test
 
 		{240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5}
 
 	EndProjectSection
 
 EndProject
 
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "testsuite\DataTest\DataTest_vs160.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}"
 
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "DataTest\DataTest_vs160.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}"
 
 	ProjectSection(ProjectDependencies) = postProject
 
 		{240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5}
 
 		{1813A463-E349-4FEA-8A8E-4A41E41C0DC7} = {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}

+ 15 - 8
Data/Data_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDatad</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDatamdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDatamtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\bin\PocoDatad.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoDatad.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoDatad.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoDatamtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoDatamdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoDatamd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\bin64\PocoData64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoData64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoDatad.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoDatamtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoDatamdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/bigobj /Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 21 - 21
Data/Data_vs160.vcxproj.filters
View File 

@@ -2,67 +2,67 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="DataCore">
 
-      <UniqueIdentifier>{f67496db-5e4d-4de1-8a40-22d8a971e70f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{cb2cff8d-df03-460e-a8e8-5f75df6de03e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="DataCore\Header Files">
 
-      <UniqueIdentifier>{37d63788-6e99-4bc2-ac7d-df3d21fdeb84}</UniqueIdentifier>
 
+      <UniqueIdentifier>{39dacf38-8a48-41b9-b90d-741f627fb1d0}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="DataCore\Source Files">
 
-      <UniqueIdentifier>{cab3a63a-af79-4ada-ab81-6a4053f3a571}</UniqueIdentifier>
 
+      <UniqueIdentifier>{21eb13dd-d633-4c58-8172-e0046ad24c31}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling">
 
-      <UniqueIdentifier>{6f73da86-3251-4ad2-832e-8e00591dbdf0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8fb3827f-33be-4daf-8c14-ebed3bea96e5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling\Header Files">
 
-      <UniqueIdentifier>{464c1180-2454-428e-bc2c-8ff90408a770}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b39da8b5-3345-4522-8fcd-56ea15c0741f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling\Source Files">
 
-      <UniqueIdentifier>{22e18c41-d9e4-480d-b23b-35c27bccce72}</UniqueIdentifier>
 
+      <UniqueIdentifier>{540b4b42-d82d-4005-9abd-f4a5bd346235}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser">
 
-      <UniqueIdentifier>{5dd49dbc-28da-4f15-86ad-8a6ae9024d27}</UniqueIdentifier>
 
+      <UniqueIdentifier>{33e2aebf-4bf2-4651-a6fb-4597ee963a73}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\Header Files">
 
-      <UniqueIdentifier>{85cd8433-468c-4307-9688-26de2fd333d5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{6d62c21e-e848-4c39-9199-2f5e594b546c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\Source Files">
 
-      <UniqueIdentifier>{83340844-8264-4418-873b-72233686c996}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1e38adcb-f0b8-4ef7-abd2-4eb14baa1297}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\parser">
 
-      <UniqueIdentifier>{5ff3ad8a-0759-40ef-9b8b-77e8257986ff}</UniqueIdentifier>
 
+      <UniqueIdentifier>{23886b0c-0b0f-4c73-8d1a-ae976d5e83bb}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\parser\Header Files">
 
-      <UniqueIdentifier>{ee380eb8-ed0b-4479-a464-0ae71875e979}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f22290d4-2b0b-46db-ac61-446e3a361a9a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\parser\Source Files">
 
-      <UniqueIdentifier>{6357bcb3-22ce-4257-911d-026fa251d22b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{92ca4fbe-77c6-4945-915f-fa8f8d71102e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\sql">
 
-      <UniqueIdentifier>{77a5e5cf-089a-4e1f-ba28-1b7435afc70d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{62e6a21d-b3a0-43b8-90b8-5a3d1a578da9}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\sql\Header Files">
 
-      <UniqueIdentifier>{68edda08-bb81-4420-bc73-7d1d7ed4aedb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{85432299-06a5-4a73-a5f6-77381c344d85}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\sql\Source Files">
 
-      <UniqueIdentifier>{14d3b337-a039-4384-996d-832688c38750}</UniqueIdentifier>
 
+      <UniqueIdentifier>{40d59c41-5827-4244-a4b6-88c639f6cffe}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\util">
 
-      <UniqueIdentifier>{fb2d5165-8bce-4130-9875-76d78fbe6077}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0e840ec2-9c51-4a6f-93d5-9546cb005cdb}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\util\Header Files">
 
-      <UniqueIdentifier>{117a3df6-f433-4bfb-9d06-91c2eef96d17}</UniqueIdentifier>
 
+      <UniqueIdentifier>{202c598f-56ed-463d-a534-871d3c7eadb6}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\util\Source Files">
 
-      <UniqueIdentifier>{c9eddd0e-0d4a-43b8-8d64-ac42a5071b75}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d5f36096-6a9a-4641-8292-a5858bb1f1d5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging">
 
-      <UniqueIdentifier>{fffffe76-6e5a-4c56-8490-7b6572aeb408}</UniqueIdentifier>
 
+      <UniqueIdentifier>{490544d2-114b-41e4-836f-e0a902a40642}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging\Header Files">
 
-      <UniqueIdentifier>{575753d6-b376-4dc1-ab7a-08f2194ff1a1}</UniqueIdentifier>
 
+      <UniqueIdentifier>{6067c6e1-a29d-41f2-bfe9-14ae03d2d7aa}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging\Source Files">
 
-      <UniqueIdentifier>{92c18071-c3bf-4f6d-90fd-69cfd09579a5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{50f23d3b-3f56-41fa-b043-002d8c64b3b5}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Data/MySQL/MySQL_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataMySQLd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataMySQLmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataMySQLmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\..\bin\PocoDataMySQLd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin\PocoDataMySQLd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib\PocoDataMySQLd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataMySQLmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataMySQLmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataMySQLmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\..\bin64\PocoDataMySQL64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin64\PocoDataMySQL64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib64\PocoDataMySQLd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataMySQLmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataMySQLmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 63 - 19
Data/MySQL/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -606,15 +642,23 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\MySQLTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\MySQLTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLExecutor.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 8 - 8
Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,28 +2,28 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="MySQL">
 
-      <UniqueIdentifier>{a02c2fb6-9366-4fe2-9022-6dca2b18e75f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{924ec557-1753-4799-8cbe-7476a5c6999e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="MySQL\Header Files">
 
-      <UniqueIdentifier>{a83a2532-d02e-435a-8b10-3738ecdd189b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{97dd25a6-a0be-4f11-b2ca-2a0b10c1a351}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="MySQL\Source Files">
 
-      <UniqueIdentifier>{2786a6f3-0adf-4c57-905c-14985d7426df}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f37345d3-ebb6-4297-a469-386dfe2c1fa1}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{36db8336-1c50-4a71-a096-dd712a0ce2b5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{77a30e71-b38c-4bf3-8f28-f011cc06cb06}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{461c5b13-8706-427a-9a06-051ae968b0f0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e51ffe32-6130-4da7-98d2-8a29d8c2246b}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{bf188fdd-ea10-43f8-8b4b-3ade1fea8915}</UniqueIdentifier>
 
+      <UniqueIdentifier>{aaa4bd68-f97f-4928-9740-3a601a4c5940}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{5e83eb1b-5e35-4c81-ab54-bb516861d7c2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b4712375-ae85-470c-a63d-327b37c16b71}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{5af4c889-5733-42fe-b991-4675f5412663}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8254a402-3a54-49c2-83ed-7b7ab307d980}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Data/ODBC/ODBC_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataODBCd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataODBCmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataODBCmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\..\bin\PocoDataODBCd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin\PocoDataODBCd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib\PocoDataODBCd.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataODBCmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -336,6 +338,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -357,7 +360,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataODBCmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -385,7 +388,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataODBCmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -414,6 +417,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -423,7 +427,7 @@
 
       <OutputFile>..\..\bin64\PocoDataODBC64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin64\PocoDataODBC64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib64\PocoDataODBCd.lib</ImportLibrary>
 
@@ -449,6 +453,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -479,7 +484,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataODBCmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -510,6 +515,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -531,7 +537,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataODBCmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -562,6 +568,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 3 - 3
Data/ODBC/ODBC_vs160.vcxproj.filters
View File 

@@ -2,13 +2,13 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="ODBC">
 
-      <UniqueIdentifier>{5ddd7ed9-06dd-459c-9bcc-cc4eca9a296c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8b004104-3ffd-4dc8-8ac0-4ae84e742459}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ODBC\Header Files">
 
-      <UniqueIdentifier>{902075d0-3792-4698-b78e-b45f13fc3cf0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{37f249ab-fbe6-4178-9a6b-165b109834b4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ODBC\Source Files">
 
-      <UniqueIdentifier>{093cfbf6-c56b-4757-ad24-26d820002cbe}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1320226b-aa76-40c8-88ee-737825fa5f8d}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 77 - 19
Data/ODBC/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -613,36 +649,58 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCAccessTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCDB2Test.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCMySQLTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCOracleTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCPostgreSQLTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCSQLiteTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCSQLServerTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\ODBCTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLExecutor.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 8 - 8
Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,28 +2,28 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="ODBC">
 
-      <UniqueIdentifier>{b4e5b39e-6fb7-4804-a8f7-a9cebd0a1685}</UniqueIdentifier>
 
+      <UniqueIdentifier>{48efde3e-262d-4a9f-a880-85060871285d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ODBC\Header Files">
 
-      <UniqueIdentifier>{06029882-af09-469c-b1fe-eecbfa099a4b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e1d04e08-1065-4d23-9ed3-08e0f7326fb4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ODBC\Source Files">
 
-      <UniqueIdentifier>{0785c132-47d0-4eb6-ba16-e7ffbb041334}</UniqueIdentifier>
 
+      <UniqueIdentifier>{99f9a720-5b72-4ca1-9bb3-383414de1651}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{91928e83-625d-4c82-bce5-428c1ac4981b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8740d7a4-5d7e-4921-a24e-ae4ae1214918}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{44df0f18-94c4-4cdf-ac97-a7fa2f047b70}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2e457954-e262-47b4-8c7d-b2d453de1d5d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{57eef758-9d73-4dd4-8dfa-29fafdffc274}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b7934d67-65aa-4c86-9932-113feec23869}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{5147873f-6883-4ef3-8498-dac75690f01c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{94642818-83b0-4347-a2e1-c2015c8d2850}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{f3320cfe-a54b-483e-b1ac-02d825870e31}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d3f9ac9e-ef3c-4fcc-9e32-e1dc36b22432}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Data/PostgreSQL/PostgreSQL_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataPostgreSQLd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataPostgreSQLmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataPostgreSQLmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\..\bin\PocoDataPostgreSQLd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin\PocoDataPostgreSQLd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib\PocoDataPostgreSQLd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataPostgreSQLmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataPostgreSQLmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataPostgreSQLmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\..\bin64\PocoDataPostgreSQL64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin64\PocoDataPostgreSQL64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib64\PocoDataPostgreSQLd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataPostgreSQLmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataPostgreSQLmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 63 - 19
Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; 	..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -606,15 +642,23 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\PostgreSQLTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\PostgreSQLTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLExecutor.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 8 - 8
Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,28 +2,28 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="PostgreSQL">
 
-      <UniqueIdentifier>{40b7b518-0729-407f-aaa8-d729ff794b7c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a15667a0-1722-49f7-9028-3c5af817f80e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="PostgreSQL\Header Files">
 
-      <UniqueIdentifier>{74b86b6a-a134-45a7-a82a-6e689b0c15c1}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c010c8ca-541a-4f25-8c8f-69be6a00d7d3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="PostgreSQL\Source Files">
 
-      <UniqueIdentifier>{3b2fde8a-8897-49f9-9861-e9cc8eb2804b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{dfafa03d-5c73-406e-b7ab-d6095d97164b}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{81f98471-1fb0-4b94-aafd-9f3e92d361a2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{114b0949-48ab-4ecd-88a5-71ba581ed275}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{51fecf06-b911-4446-b43e-20c2b50d303a}</UniqueIdentifier>
 
+      <UniqueIdentifier>{79b8207a-fa47-4422-a6e1-be62752f430a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{ce4c1258-75b8-4fdb-89d0-69de8121d7d4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{df66b67c-1082-49d8-aa77-9652854e79ce}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{84217615-5ac7-4350-a9cd-2ec20457397d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{30018351-b2f8-45c4-b081-9855cf69a73d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{24455166-46c9-4af9-b9b2-05ff5c55c9c2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{9ca506c9-d65c-4ec0-b544-96a7f2e1ff11}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Data/SQLite/SQLite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoDataSQLited</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoDataSQLitemdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoDataSQLitemtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\..\bin\PocoDataSQLited.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin\PocoDataSQLited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib\PocoDataSQLited.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataSQLitemtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataSQLitemdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib\PocoDataSQLitemd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\..\bin64\PocoDataSQLite64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\..\bin64\PocoDataSQLite64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\..\lib64\PocoDataSQLited.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataSQLitemtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\..\lib64\PocoDataSQLitemdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <DisableSpecificWarnings>4996;4244;4018;%(DisableSpecificWarnings)</DisableSpecificWarnings>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 6 - 6
Data/SQLite/SQLite_vs160.vcxproj.filters
View File 

@@ -2,22 +2,22 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="SQLite">
 
-      <UniqueIdentifier>{35ac7a5f-3122-4b02-ba58-890ce6bffd47}</UniqueIdentifier>
 
+      <UniqueIdentifier>{fd9f7cd4-cb33-4153-9bfb-100f86c6fdc7}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLite\Header Files">
 
-      <UniqueIdentifier>{feea0252-6fc3-440f-b06d-da54042b86e3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{ff6535b5-a1e2-451f-82c2-bbfe316ddb2a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLite\Source Files">
 
-      <UniqueIdentifier>{890e89e4-3c52-4f35-a521-fd5e1c2a12bf}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d7b22751-409b-4cb7-ab78-c89745c2a70a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="3rdparty">
 
-      <UniqueIdentifier>{17d87956-cc8c-491c-846b-95f69c0b995f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0ee9caef-0389-4cd4-85f0-1a6f20f6c6a1}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="3rdparty\Header Files">
 
-      <UniqueIdentifier>{4e7eadc1-8dc4-41c8-a9a2-b618af8cfca0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e0cc3d83-d99c-49cb-8cfd-c8002fe1ddc8}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="3rdparty\Source Files">
 
-      <UniqueIdentifier>{29293288-da79-409b-8b4f-bcee1bf2e1b3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{be54820d-54b5-411d-9c18-1451dba024d7}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 61 - 19
Data/SQLite/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -605,12 +641,18 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLiteTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLiteTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 8 - 8
Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,28 +2,28 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="SQLite">
 
-      <UniqueIdentifier>{577e2c77-7603-417a-91b8-b65480a47cff}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b947611c-9004-493c-967a-caa6ef15244e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLite\Header Files">
 
-      <UniqueIdentifier>{93630c8c-e68d-457c-8383-f709db929d93}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b389e350-8391-47f5-bbe8-c424caed3a2b}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLite\Source Files">
 
-      <UniqueIdentifier>{9989beae-c400-4843-8f3a-52ab7b928d0c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{9fe973fd-eb8c-4fab-ad5f-f4486f206bd4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{313dbe1c-d8df-4c5b-9abb-ab9e28300048}</UniqueIdentifier>
 
+      <UniqueIdentifier>{cd5d0eff-85db-448b-85cf-ff5f3d1335bd}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{9b336120-a676-4408-b349-b2e7cb4f4e4b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c074c52b-4f61-4b3b-aafa-abdb99ad6835}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{ba9a1b30-2f4d-4f92-8839-83d69be829d9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{649c53dc-ceb0-46c9-af3d-59a860a9fb47}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{0be222c2-f6b0-4ff0-9f79-6f7bc32e926a}</UniqueIdentifier>
 
+      <UniqueIdentifier>{58088a5d-56bd-4f0d-9dc1-cd96d01f8b50}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{36ce391f-e038-4ac9-b71f-54d0c459d468}</UniqueIdentifier>
 
+      <UniqueIdentifier>{45b69f8d-ba6c-4a41-8398-3492c99da64a}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/Binding/Binding_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Bindingd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Bindingd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Bindingd</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\Bindingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Binding.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/Binding/Binding_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{7a189050-2048-4632-ba6c-46b07a479ed3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7db63845-ddd9-4c1d-b0a4-2c8a8c496dee}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{e103ec6c-2a14-4472-a070-ced6e1be4255}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a37b40b7-6e79-4d5a-8e48-8e89fc812af3}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/RecordSet/RecordSet_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">RecordSetd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">RecordSetd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">RecordSetd</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\RecordSetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\RecordSet.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{c6b24ce7-3335-43c1-bbe3-d7f06940eb31}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7f718ae4-4fd1-4a5f-9391-b91c85ffa2f5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{2750a7d3-75d7-423d-98cb-602f1e544742}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f755562f-6ac5-45f7-ae41-291b683aa88a}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/RowFormatter/RowFormatter_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">RowFormatterd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">RowFormatterd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">RowFormatterd</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\RowFormatterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\RowFormatter.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{376dbfba-c2f2-4580-b415-12d8f0d2be28}</UniqueIdentifier>
 
+      <UniqueIdentifier>{e8fd3902-0f2e-4d24-8875-5b11fe24c9ad}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{f57ec78e-c922-47ba-9d73-3fa18a9612fe}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8156dfb2-7719-4cd6-bd37-6199d5212f10}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/Tuple/Tuple_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Tupled</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Tupled</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Tupled</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\Tupled.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Tuple.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/Tuple/Tuple_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{daced653-361b-4687-9b08-af29969dc023}</UniqueIdentifier>
 
+      <UniqueIdentifier>{eeca3f66-a5ab-47b5-b81c-5a44a5755bd3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{3f70b07e-c518-4105-b9d7-5c2d93c622ea}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2cf46c17-bed9-41a6-b881-e9f675c62755}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/TypeHandler/TypeHandler_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TypeHandlerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TypeHandlerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TypeHandlerd</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TypeHandlerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\TypeHandler.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{69d64388-00f7-43b5-b051-7ae49f6d85d0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{468a4d19-1e0e-469a-baac-389509a364a5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{b50f674a-512d-41ff-8e82-2523bedf9781}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c36a0c8d-a274-4923-9454-07ca18b37d2f}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 57 - 19
Data/samples/WebNotifier/WebNotifier_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">WebNotifierd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">WebNotifierd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">WebNotifierd</TargetName>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -256,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -268,7 +271,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -280,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -296,7 +302,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -309,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -317,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -329,7 +338,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -341,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -357,7 +369,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -370,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -378,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -390,7 +405,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -402,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -418,7 +436,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -431,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -439,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -451,7 +472,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -463,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -479,7 +503,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -492,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -500,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -512,7 +539,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -524,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -540,7 +570,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -553,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -561,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\WebNotifierd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -573,7 +606,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>.\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -585,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -601,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\WebNotifier.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{f529f90f-8157-4358-ba52-bd499007d7dd}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7801ba72-87aa-4baf-b29b-d48867a82522}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{394800ac-0f2f-46d6-9e16-06ddd9a9072a}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c9a95d09-32e7-4f73-84ef-26cacd824aab}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 89 - 31
Data/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34202.158</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -235,7 +235,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -248,8 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -257,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -269,7 +272,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -281,8 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -298,7 +304,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -311,8 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -320,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -332,7 +341,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -344,8 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -361,7 +373,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -374,8 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -383,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -395,7 +410,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -407,8 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -424,7 +442,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -437,8 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -446,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -458,7 +479,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -470,8 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -487,7 +511,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -500,8 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -509,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -521,7 +548,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -533,8 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -550,7 +580,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -563,8 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -572,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +617,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;..\..\CppUnit\include;..\SqlParser;..\SqlParser\src;..\..\Foundation\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -596,8 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
-      <AdditionalOptions>/Zc:__cplusplus /std:c++17 %(AdditionalOptions)</AdditionalOptions>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -625,36 +661,58 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Binder.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Connector.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\DataTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\DataTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Extractor.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Preparator.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SessionImpl.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SessionPoolTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SQLParserTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\TestStatementImpl.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 17 - 17
Data/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,55 +2,55 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="DataCore">
 
-      <UniqueIdentifier>{efd284a0-836e-4ec5-839a-b0ce012b452c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{dfd921ee-f44a-4469-bd36-16e73a4782eb}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="DataCore\Header Files">
 
-      <UniqueIdentifier>{9d2c02b3-1a4c-4f82-b246-094be9675fb7}</UniqueIdentifier>
 
+      <UniqueIdentifier>{44f79575-87b7-457c-b17f-5c95658db37e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="DataCore\Source Files">
 
-      <UniqueIdentifier>{7419925d-2910-46ef-b66d-75be7083f76e}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d4ccd324-3061-4bfe-99f5-5d59560d0b79}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite">
 
-      <UniqueIdentifier>{7de21299-9fde-466e-9ce5-07fd9eca02b6}</UniqueIdentifier>
 
+      <UniqueIdentifier>{be3313fc-81dc-4ac7-99f8-34af544d5b8d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Header Files">
 
-      <UniqueIdentifier>{307e2d27-9ce4-4917-8065-d6b291d81880}</UniqueIdentifier>
 
+      <UniqueIdentifier>{5cbc6e2e-d7e9-4259-9099-df738908f69f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Suite\Source Files">
 
-      <UniqueIdentifier>{f17dd1ac-48fc-4a78-974f-0617bb547a84}</UniqueIdentifier>
 
+      <UniqueIdentifier>{678c9607-0589-4909-926b-acfbd4ee993e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver">
 
-      <UniqueIdentifier>{4500fec7-05ca-4079-b954-0fc6b926bf80}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b4eba29e-60d4-4c15-a067-54f08f43bcee}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="_Driver\Source Files">
 
-      <UniqueIdentifier>{0afe4a91-71c0-4750-a29f-f8aee0a2ed3d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{952418c0-8de9-4baa-9153-39e52c0bde8c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TestSession">
 
-      <UniqueIdentifier>{408adb2a-a0ba-406c-af0f-ba35c79de465}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8ae57633-9c90-49ca-9573-0414c03dadf3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TestSession\Header Files">
 
-      <UniqueIdentifier>{6a11898f-7e83-4885-91f7-b8666ec0bfae}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1b49dc10-5b24-413e-bbe6-e9b20ece7cb6}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TestSession\Source Files">
 
-      <UniqueIdentifier>{4c3df67f-20f5-41cd-a9a5-69838ddb5623}</UniqueIdentifier>
 
+      <UniqueIdentifier>{6a34879c-4503-407b-b114-4fce615298a3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling">
 
-      <UniqueIdentifier>{bda62c82-7799-4e32-aa59-794187c9254c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{4b4d8d5c-4bf4-48de-8382-fa995ceed795}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling\Header Files">
 
-      <UniqueIdentifier>{569ea43a-87d8-4662-87f9-e86ecdd62c85}</UniqueIdentifier>
 
+      <UniqueIdentifier>{5e2fdca1-603b-43ba-8fb9-13d339bb4a13}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SessionPooling\Source Files">
 
-      <UniqueIdentifier>{16747406-0a06-4a3e-be49-740d0436d7b6}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8f88f0b0-1765-44e6-8bb1-da8933cf1561}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser">
 
-      <UniqueIdentifier>{79a12ac6-a42c-44a9-9cce-5863936607d5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f4c50fd9-392e-451f-bc9d-68888d5eab85}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\Header Files">
 
-      <UniqueIdentifier>{07db900c-1cf4-45af-8977-fa95c862e73f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f59b0b24-007a-4a91-9b10-3183563e1c3d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="SQLParser\Source Files">
 
-      <UniqueIdentifier>{6037cc1b-d9ba-465c-9b57-fef469e15a68}</UniqueIdentifier>
 
+      <UniqueIdentifier>{129e1247-b096-45d4-87fa-077f3f6433df}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Encodings/Encodings_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoEncodingsd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoEncodingsmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoEncodingsmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -248,7 +249,7 @@
 
       <OutputFile>..\bin\PocoEncodingsd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoEncodingsd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoEncodingsd.lib</ImportLibrary>
 
@@ -274,6 +275,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -303,7 +305,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoEncodingsmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -334,6 +336,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -355,7 +358,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoEncodingsmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -383,7 +386,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoEncodingsmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -411,6 +414,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -419,7 +423,7 @@
 
       <OutputFile>..\bin64\PocoEncodings64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoEncodings64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoEncodingsd.lib</ImportLibrary>
 
@@ -445,6 +449,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -474,7 +479,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoEncodingsmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -505,6 +510,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>
 
@@ -526,7 +532,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoEncodingsmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -557,6 +563,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
       <LanguageStandard_C>stdc11</LanguageStandard_C>

+ 3 - 3
Encodings/Encodings_vs160.vcxproj.filters
View File 

@@ -2,13 +2,13 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Encodings">
 
-      <UniqueIdentifier>{c15768fc-708f-4d0b-a555-4fe5482bc8d4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d2eaf225-f3a3-445f-b77a-7ec8123b1ba5}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Encodings\Header Files">
 
-      <UniqueIdentifier>{1272131b-56f1-445c-b440-264342815032}</UniqueIdentifier>
 
+      <UniqueIdentifier>{91086300-388f-4f27-b8c0-b06c8137482a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Encodings\Source Files">
 
-      <UniqueIdentifier>{a53c22e2-a622-4e4f-9470-7580a30f9415}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a414b00d-415e-4006-80f3-0830a8901a9d}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 47 - 8
Encodings/samples/TextConverter/TextConverter_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TextConverter</ProjectName>
 
     <ProjectGuid>{3CCF9527-B5D9-3522-84C3-C8E5381D7661}</ProjectGuid>
 
     <RootNamespace>TextConverter</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TextConverterd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TextConverterd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TextConverterd</TargetName>
 
@@ -247,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TextConverterd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +637,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\TextConverter.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{27d300e2-17bc-416a-a753-93eb0d3938a9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{cc73a153-ea12-498d-9bf1-8cff466daca3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{fabfae72-dc55-423e-8e30-20c9befe2770}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c1d83b77-89fb-4666-be38-457ed90f6865}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 51 - 8
Encodings/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{7784E068-96B2-4DDC-BA8B-780206E06B30}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +259,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +283,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +315,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +326,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +350,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +382,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +393,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +417,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +449,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +460,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +484,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +516,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +527,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +551,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +583,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +594,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +618,10 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,12 +637,18 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\DoubleByteEncodingTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\EncodingsTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
Encodings/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{8943871c-0d0d-4893-8a8a-04422b5e8431}</UniqueIdentifier>
 
+      <UniqueIdentifier>{abc004ad-578b-4f51-ac60-c071f04c4028}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{ac2ef9f4-1883-48b7-9470-6669029937a4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{294b52e1-6341-4ca4-bd72-1c4f835531d3}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 14 - 1
Foundation/Foundation_vs160.vcxproj
View File 

@@ -55,6 +55,7 @@
 
     <ProjectGuid>{B01196CC-B693-4548-8464-2FF60499E73F}</ProjectGuid>
 
     <RootNamespace>Foundation</RootNamespace>
 
     <Keyword>Win32Proj</Keyword>
 
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
 
   </PropertyGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='release_static_md|Win32'" Label="Configuration">
 
@@ -241,6 +242,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -273,6 +275,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -305,6 +308,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -342,6 +346,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -374,6 +379,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib\PocoFoundationmtd.lib</OutputFile>
 
@@ -400,6 +406,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib64\PocoFoundationmtd.lib</OutputFile>
 
@@ -425,6 +432,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib\PocoFoundationmt.lib</OutputFile>
 
@@ -454,6 +462,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib64\PocoFoundationmt.lib</OutputFile>
 
@@ -478,6 +487,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib\PocoFoundationmdd.lib</OutputFile>
 
@@ -504,6 +514,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <OutputFile>..\lib64\PocoFoundationmdd.lib</OutputFile>
 
@@ -530,6 +541,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <AdditionalDependencies>
 
@@ -562,6 +574,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Lib>
 
       <AdditionalDependencies>
 
@@ -1859,4 +1872,4 @@
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <ImportGroup Label="ExtensionTargets" />
 
-</Project>
 
+</Project>

+ 2 - 0
Foundation/Foundation_vs160.vcxproj.filters
View File 

@@ -924,6 +924,8 @@
 
     <ClCompile Include="src\pcre2_xclass.c">
 
       <Filter>RegularExpression\PCRE2 Source Files</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="src\ActiveThreadPool.cpp" />
 
+    <ClCompile Include="src\VarVisitor.cpp" />
 
   </ItemGroup>
 
   <ItemGroup>
 
     <ClInclude Include="include\Poco\Any.h">

+ 54 - 30
Foundation/testsuite/TestApp_vs160.vcxproj
View File 

@@ -248,7 +248,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <MinimalRebuild>false</MinimalRebuild>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -263,10 +263,12 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -276,7 +278,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_shared|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 
@@ -288,12 +290,14 @@
 
       </PrecompiledHeader>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin64\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -306,7 +310,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -321,10 +325,12 @@
 
       </DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>
 
@@ -341,7 +347,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -354,12 +360,14 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>
 
       </DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>
 
@@ -375,7 +383,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -390,10 +398,12 @@
 
       </DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\static_md\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>
 
@@ -410,7 +420,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
 
@@ -423,12 +433,14 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>
 
       </DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\static_md\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>
 
@@ -440,7 +452,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <MinimalRebuild>false</MinimalRebuild>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -455,10 +467,12 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmdd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\static_md\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin\static_md\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -468,7 +482,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_md|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
       <RuntimeLibrary>MultiThreadedDebugDLL</RuntimeLibrary>
 
@@ -480,12 +494,14 @@
 
       </PrecompiledHeader>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmdd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\static_md\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin64\static_md\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -494,7 +510,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <MinimalRebuild>false</MinimalRebuild>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
@@ -509,10 +525,12 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmtd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\static_mt\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin\static_mt\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -522,7 +540,7 @@
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|x64'">
 
     <ClCompile>
 
       <Optimization>Disabled</Optimization>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <BasicRuntimeChecks>EnableFastChecks</BasicRuntimeChecks>
 
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
 
@@ -534,12 +552,14 @@
 
       </PrecompiledHeader>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmtd.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\static_mt\TestAppd.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
       <ProgramDatabaseFile>bin64\static_mt\TestAppd.pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
@@ -552,7 +572,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -567,10 +587,12 @@
 
       </DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmt.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin\static_mt\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>
 
@@ -587,7 +609,7 @@
 
       <IntrinsicFunctions>true</IntrinsicFunctions>
 
       <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
 
       <OmitFramePointers>true</OmitFramePointers>
 
-      <AdditionalIncludeDirectories>%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
+      <AdditionalIncludeDirectories>..\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
 
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions)</PreprocessorDefinitions>
 
       <StringPooling>true</StringPooling>
 
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
 
@@ -600,12 +622,14 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>
 
       </DebugInformationFormat>
 
-      <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
+      <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
+      <AdditionalDependencies>PocoFoundationmt.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
       <OutputFile>bin64\static_mt\TestApp.exe</OutputFile>
 
-      <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
+      <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <GenerateDebugInformation>false</GenerateDebugInformation>
 
       <ProgramDatabaseFile>
 
       </ProgramDatabaseFile>

+ 4 - 0
Foundation/testsuite/TestLibrary_vs160.vcxproj
View File 

@@ -107,6 +107,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -138,6 +139,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>PocoFoundationd.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -172,6 +174,7 @@
 
       </DebugInformationFormat>
 
       <AdditionalOptions>/FS</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -210,6 +213,7 @@
 
       </DebugInformationFormat>
 
       <AdditionalOptions>/FS /Zc:__cplusplus </AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>PocoFoundation.lib;%(AdditionalDependencies)</AdditionalDependencies>

+ 15 - 1
Foundation/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -250,6 +250,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -281,6 +282,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -312,6 +314,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -347,6 +350,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -376,6 +380,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -407,6 +412,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,6 +444,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -473,6 +480,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -502,6 +510,7 @@
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -533,6 +542,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -564,6 +574,7 @@
 
       <DebugInformationFormat />
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -599,6 +610,7 @@
 
       <CompileAs>Default</CompileAs>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -694,6 +706,7 @@
 
     <ClCompile Include="src\PBKDF2EngineTest.cpp" />
 
     <ClCompile Include="src\PriorityEventTest.cpp" />
 
     <ClCompile Include="src\PriorityNotificationQueueTest.cpp" />
 
+    <ClCompile Include="src\ProcessRunnerTest.cpp" />
 
     <ClCompile Include="src\ProcessesTestSuite.cpp" />
 
     <ClCompile Include="src\ProcessTest.cpp" />
 
     <ClCompile Include="src\RandomStreamTest.cpp" />
 
@@ -836,6 +849,7 @@
 
     <ClInclude Include="src\PBKDF2EngineTest.h" />
 
     <ClInclude Include="src\PriorityEventTest.h" />
 
     <ClInclude Include="src\PriorityNotificationQueueTest.h" />
 
+    <ClInclude Include="src\ProcessRunnerTest.h" />
 
     <ClInclude Include="src\ProcessesTestSuite.h" />
 
     <ClInclude Include="src\ProcessTest.h" />
 
     <ClInclude Include="src\RandomStreamTest.h" />
 
@@ -896,4 +910,4 @@
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 
   <ImportGroup Label="ExtensionTargets" />
 
-</Project>
 
+</Project>

+ 12 - 0
Foundation/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -519,6 +519,9 @@
 
     <ClCompile Include="src\NamedMutexTest.cpp">
 
       <Filter>Processes\Source Files</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="src\ProcessRunnerTest.cpp">
 
+      <Filter>Processes\Source Files</Filter>
 
+    </ClCompile>
 
     <ClCompile Include="src\ProcessesTestSuite.cpp">
 
       <Filter>Processes\Source Files</Filter>
 
     </ClCompile>
 
@@ -597,6 +600,9 @@
 
     <ClCompile Include="src\DataURIStreamTest.cpp">
 
       <Filter>URI\Source Files</Filter>
 
     </ClCompile>
 
+    <ClCompile Include="src\ActiveThreadPoolTest.cpp">
 
+      <Filter>Threading\Source Files</Filter>
 
+    </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>
 
     <ClInclude Include="src\AnyTest.h">
 
@@ -938,6 +944,9 @@
 
     <ClInclude Include="src\NamedMutexTest.h">
 
       <Filter>Processes\Header Files</Filter>
 
     </ClInclude>
 
+    <ClInclude Include="src\ProcessRunnerTest.h">
 
+      <Filter>Processes\Header Files</Filter>
 
+    </ClInclude>
 
     <ClInclude Include="src\ProcessesTestSuite.h">
 
       <Filter>Processes\Header Files</Filter>
 
     </ClInclude>
 
@@ -1016,5 +1025,8 @@
 
     <ClInclude Include="src\DataURIStreamTest.h">
 
       <Filter>URI\Header Files</Filter>
 
     </ClInclude>
 
+    <ClInclude Include="src\ActiveThreadPoolTest.h">
 
+      <Filter>Threading\Header Files</Filter>
 
+    </ClInclude>
 
   </ItemGroup>
 
 </Project>

+ 6 - 2
Foundation/testsuite/TestSuite_vs170.vcxproj.filters
View File 

@@ -600,7 +600,9 @@
 
     <ClCompile Include="src\DataURIStreamTest.cpp">
 
       <Filter>URI\Source Files</Filter>
 
     </ClCompile>
 
-    <ClCompile Include="src\ActiveThreadPoolTest.cpp" />
 
+    <ClCompile Include="src\ActiveThreadPoolTest.cpp">
 
+      <Filter>Threading\Source Files</Filter>
 
+    </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>
 
     <ClInclude Include="src\AnyTest.h">
 
@@ -1023,6 +1025,8 @@
 
     <ClInclude Include="src\DataURIStreamTest.h">
 
       <Filter>URI\Header Files</Filter>
 
     </ClInclude>
 
-    <ClInclude Include="src\ActiveThreadPoolTest.h" />
 
+    <ClInclude Include="src\ActiveThreadPoolTest.h">
 
+      <Filter>Threading\Header Files</Filter>
 
+    </ClInclude>
 
   </ItemGroup>
 
 </Project>

+ 15 - 8
JSON/JSON_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoJSONd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoJSONmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoJSONmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\bin\PocoJSONd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoJSONd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoJSONd.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJSONmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJSONmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJSONmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\bin64\PocoJSON64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoJSON64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoJSONd.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoJSONmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoJSONmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 2 - 2
JSON/JSON_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{71bcfd62-4793-41c9-8c35-416c2154e8e5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b0a7b744-1519-42d8-a7ce-bb056ad2a88f}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{9a161e20-adcc-49d6-8149-d8bae41992e0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{4e840e51-0586-4a15-9c80-43205763676d}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
JSON/samples/Benchmark/Benchmark_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>Benchmark</ProjectName>
 
     <ProjectGuid>{D0381ECF-E750-32DA-8EEF-92D56B172D15}</ProjectGuid>
 
     <RootNamespace>Benchmark</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Benchmarkd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Benchmarkd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Benchmarkd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\Benchmarkd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Benchmark.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{15a951d2-6f56-4286-a100-d644a3f4ec7d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{397eac41-b7ab-47e1-b57b-fb5bb3521473}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{56b22f3d-dae2-4ee9-ac4f-2469cc77c4b3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2f8635d8-04c4-4b32-8134-bb18911b1818}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 63 - 8
JSON/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,12 +649,18 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\JSONTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\JSONTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
JSON/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{126d7684-49e5-4909-a9dc-1176033b6d11}</UniqueIdentifier>
 
+      <UniqueIdentifier>{10f69dac-042c-43a9-9cf4-3f123b37d2a1}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{280da5fe-ea4b-44f6-b932-648f1825cc2f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{4ffee813-d2e4-4d56-afa3-a14a68fd514e}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
JWT/JWT_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoJWTd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoJWTmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoJWTmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\bin\PocoJWTd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoJWTd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoJWTd.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJWTmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJWTmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoJWTmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\bin64\PocoJWT64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoJWT64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoJWTd.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoJWTmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoJWTmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 2 - 2
JWT/JWT_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{d85fe858-540b-457d-8e5e-f6a160ed7ab9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{044d5f6d-92c1-4b43-afba-6aee1bf81417}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{72ad21f5-ade9-4f75-85ac-6326ff62a53f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a6c59773-f3e7-4d29-82f9-ba5b1b8e55ad}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 67 - 8
JWT/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,18 +649,28 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\JWTTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SerializerTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\SignerTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\TokenTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
JWT/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{3838ccc8-cb0d-4de8-b2cf-e5ed5039620b}</UniqueIdentifier>
 
+      <UniqueIdentifier>{3265aff2-ccb6-4d32-82f0-e03249251271}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{8af36a88-0470-457c-8a12-a3eb989cac3c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{9165f827-bdbc-407e-bdca-a4c1e6001e3c}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
MongoDB/MongoDB_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoMongoDBd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoMongoDBmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoMongoDBmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -249,7 +250,7 @@
 
       <OutputFile>..\bin\PocoMongoDBd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoMongoDBd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoMongoDBd.lib</ImportLibrary>
 
@@ -275,6 +276,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -305,7 +307,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoMongoDBmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -337,6 +339,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -359,7 +362,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoMongoDBmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -388,7 +391,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoMongoDBmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -417,6 +420,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -426,7 +430,7 @@
 
       <OutputFile>..\bin64\PocoMongoDB64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoMongoDB64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoMongoDBd.lib</ImportLibrary>
 
@@ -452,6 +456,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -482,7 +487,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoMongoDBmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -514,6 +519,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -536,7 +542,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoMongoDBmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -568,6 +574,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 2 - 2
MongoDB/MongoDB_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{fee64320-b7d4-4848-af58-024236e8152a}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f0921de7-217a-49ae-b2cb-69837f059462}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{55eff4b2-68f6-4297-898b-ee3a0106701c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{36075a44-87d3-470d-91b2-cc3024a1dd2c}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>SQLToMongo</ProjectName>
 
     <ProjectGuid>{638D0833-8E84-3A67-BD00-4611F99E65AF}</ProjectGuid>
 
     <RootNamespace>SQLToMongo</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">SQLToMongod</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">SQLToMongod</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">SQLToMongod</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\SQLToMongod.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\SQLToMongo.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{79ec692d-0727-4988-ac67-64d180094ea6}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c05166b4-d886-4e70-98d1-59664effbfa7}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{2a4d5d19-dcde-4aec-9537-7fe6f77c9381}</UniqueIdentifier>
 
+      <UniqueIdentifier>{13a64cd0-fac1-4a78-8bd6-2d88d9b4e61c}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 63 - 11
MongoDB/testsuite/TestSuite_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TestSuite</ProjectName>
 
     <ProjectGuid>{96CF3103-E49E-3F5E-A11D-6DBCDA043053}</ProjectGuid>
 
     <RootNamespace>TestSuite</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <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>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TestSuited.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,15 +649,18 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Driver.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\MongoDBTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
-    </ClCompile>
 
-    <ClCompile Include="src\MongoDBTestOpMsg.cpp">
 
-      <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <ClCompile Include="src\MongoDBTestSuite.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
MongoDB/testsuite/TestSuite_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{069413b5-4c2d-4dc8-a59d-769df94f4119}</UniqueIdentifier>
 
+      <UniqueIdentifier>{9b2d31e1-9118-4042-b864-90c6fed19a68}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Header Files">
 
-      <UniqueIdentifier>{66d016d4-8f2a-453b-b5bf-483f32dee7e8}</UniqueIdentifier>
 
+      <UniqueIdentifier>{8b58dc5c-f28a-4321-be77-5683a050cfdd}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 15 - 8
Net/Net_vs160.vcxproj
View File 

@@ -158,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>17.0.34322.80</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">PocoNetd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">PocoNetmdd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">PocoNetmtd</TargetName>
 
@@ -240,6 +240,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -250,7 +251,7 @@
 
       <OutputFile>..\bin\PocoNetd.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin\PocoNetd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib\PocoNetd.lib</ImportLibrary>
 
@@ -276,6 +277,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -307,7 +309,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoNetmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -339,6 +341,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -361,7 +364,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoNetmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -390,7 +393,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib\PocoNetmd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
@@ -420,6 +423,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -430,7 +434,7 @@
 
       <OutputFile>..\bin64\PocoNet64d.dll</OutputFile>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>..\bin64\PocoNet64d.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <AdditionalLibraryDirectories>..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SubSystem>Console</SubSystem>
 
       <ImportLibrary>..\lib64\PocoNetd.lib</ImportLibrary>
 
@@ -456,6 +460,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -487,7 +492,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoNetmtd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -519,6 +524,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>
 
@@ -541,7 +547,7 @@
 
       <ForceConformanceInForLoopScope>true</ForceConformanceInForLoopScope>
 
       <RuntimeTypeInfo>true</RuntimeTypeInfo>
 
       <PrecompiledHeader/>
 
-      <ProgramDataBaseFileName>..\lib64\PocoNetmdd.pdb</ProgramDataBaseFileName>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
@@ -573,6 +579,7 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
       <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
       <LanguageStandard>stdcpp17</LanguageStandard>

+ 54 - 54
Net/Net_vs160.vcxproj.filters
View File 

@@ -2,166 +2,166 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="NetCore">
 
-      <UniqueIdentifier>{1fcf95cc-188a-41b8-b24e-794397285fa5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{6586007c-ca3f-4f39-b0e7-4693fc952fab}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NetCore\Header Files">
 
-      <UniqueIdentifier>{2d882d99-e40a-4396-9cce-4f8aaf342e1e}</UniqueIdentifier>
 
+      <UniqueIdentifier>{547b1423-5e32-4001-a630-af236d1d3655}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NetCore\Source Files">
 
-      <UniqueIdentifier>{eb1dcb08-be2b-41fd-96e4-acb942c6b460}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2c3ec25b-78cb-491f-8bf2-c01f8b82e119}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Sockets">
 
-      <UniqueIdentifier>{b2d363d9-43eb-4ba1-8f72-875e7bab5a05}</UniqueIdentifier>
 
+      <UniqueIdentifier>{30e726ad-65cf-4ab0-8e9e-37711c75ea45}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Sockets\Header Files">
 
-      <UniqueIdentifier>{9aa6756c-2b5a-4ea2-9633-a5c9cba8c8b4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c946519a-2221-4333-b74f-3996d0902258}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Sockets\Source Files">
 
-      <UniqueIdentifier>{0da8dac7-4b24-4bc2-b5b2-d1553f8e7ecf}</UniqueIdentifier>
 
+      <UniqueIdentifier>{23e8dc14-00b0-4539-a047-95ebd609683d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Messages">
 
-      <UniqueIdentifier>{942984c9-ebfb-4502-962c-e3f3d9ea58b9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{1b750747-fb28-4f7b-bfcb-4db73b0d76ed}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Messages\Header Files">
 
-      <UniqueIdentifier>{06a33e9b-deb2-4d14-90b7-9d9666b0a272}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7c21e22f-fd5b-4ef3-807c-4693d84ff0db}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Messages\Source Files">
 
-      <UniqueIdentifier>{32a3e3bf-c789-4a0b-9f73-18aedb8fcfcf}</UniqueIdentifier>
 
+      <UniqueIdentifier>{bd0ccfa7-6333-4efd-8c76-62da58325c47}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTP">
 
-      <UniqueIdentifier>{78ce2f83-3c7d-4176-a2df-5013a0a4536c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b00ba381-9922-433e-b2dd-24830cd52443}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTP\Header Files">
 
-      <UniqueIdentifier>{48900136-77ed-415f-80cb-300f3ce80003}</UniqueIdentifier>
 
+      <UniqueIdentifier>{ef4fa3dc-d7f9-4b99-864f-2d91e4a4eaa0}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTP\Source Files">
 
-      <UniqueIdentifier>{25c7566e-a315-4156-aa84-b8a8893f08f2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2284cb87-011e-47d4-a999-c45acfbe8787}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TCPServer">
 
-      <UniqueIdentifier>{d1e068f9-546d-4fb4-892a-263881b22596}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d0b198a4-0654-4118-bcb6-9ebb86e6cb83}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TCPServer\Header Files">
 
-      <UniqueIdentifier>{ba666f1f-8ad2-48de-ac58-3f5880b21714}</UniqueIdentifier>
 
+      <UniqueIdentifier>{266c8f68-8372-4046-88db-917e0f291b2d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="TCPServer\Source Files">
 
-      <UniqueIdentifier>{53795782-82d9-42ea-acf2-a08119553b06}</UniqueIdentifier>
 
+      <UniqueIdentifier>{93264c0a-e4c9-4f3e-8bad-f93932a9a760}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPServer">
 
-      <UniqueIdentifier>{eb3bd24c-7aa0-4042-b39b-38d5f01bdc26}</UniqueIdentifier>
 
+      <UniqueIdentifier>{fa927c98-db31-42a0-ad56-8a57a9e77e4e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPServer\Header Files">
 
-      <UniqueIdentifier>{65f48f86-912c-4488-97f8-4b32ccab8c79}</UniqueIdentifier>
 
+      <UniqueIdentifier>{468cba2a-2b1d-43b1-8a43-e6de730fd8b2}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPServer\Source Files">
 
-      <UniqueIdentifier>{1a37f639-f157-47c9-b9e0-c183d8357de4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d1be417b-1f0c-40c0-ac02-dabd8d1f1219}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPClient">
 
-      <UniqueIdentifier>{625137c0-82a0-47ca-8a55-3eecc61bea1f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{93895a4f-fd23-47c0-8dfa-5768a938dc6c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPClient\Header Files">
 
-      <UniqueIdentifier>{11d91a05-5e11-40f5-b5c8-ad3df84635fb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{6eac7515-7fb4-4bdd-9a78-da0f74fb832e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTTPClient\Source Files">
 
-      <UniqueIdentifier>{bdccdf62-dce5-4c46-9f80-4596b114dac0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{5fb12433-84f9-4197-b8e2-89fa79a235c1}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTML">
 
-      <UniqueIdentifier>{fd75ab60-4cbf-4e43-a00f-8c8cdea685ee}</UniqueIdentifier>
 
+      <UniqueIdentifier>{3ed299f7-ad22-4b0a-8f56-d55e915f22b6}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTML\Header Files">
 
-      <UniqueIdentifier>{b7f79795-fbb2-439c-8def-64a7e46bb178}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a8e7f394-c278-4af4-950c-4afcf29abf80}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="HTML\Source Files">
 
-      <UniqueIdentifier>{0e97c997-43f7-4a8b-8d53-5b0d52e7eb41}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f193812c-3e8a-4be5-ae11-e9a0795f3be4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="FTPClient">
 
-      <UniqueIdentifier>{a79f4ef5-ac12-4b7c-9c4a-2d73304bdda9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0246692c-4842-4999-b34b-69b01408b6c4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="FTPClient\Header Files">
 
-      <UniqueIdentifier>{e16e91d6-4224-484d-95c9-2ad57ca40b79}</UniqueIdentifier>
 
+      <UniqueIdentifier>{703afbda-41f3-4f00-a7c2-b6e9c9aca1b4}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="FTPClient\Source Files">
 
-      <UniqueIdentifier>{78a9eae0-54b2-449c-81dd-9fd5a16cd1e2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0a90ed52-3eaa-41a0-912c-9657558be145}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Reactor">
 
-      <UniqueIdentifier>{84903cb4-9a9a-4255-bd80-49422998b2c8}</UniqueIdentifier>
 
+      <UniqueIdentifier>{da54b91d-e830-479c-b9c4-a4351c5318fe}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Reactor\Header Files">
 
-      <UniqueIdentifier>{47b04c1d-6327-4cc8-840f-3eb9072b2a12}</UniqueIdentifier>
 
+      <UniqueIdentifier>{31dd5b2d-90d2-4b81-a25d-56b09fe975d3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Reactor\Source Files">
 
-      <UniqueIdentifier>{ce3da7d9-0751-42cb-be8f-57c11d6fbfc4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{0a262473-922a-4008-8af3-e7a08410574e}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Mail">
 
-      <UniqueIdentifier>{9753e648-5ee9-4146-b77f-0e459591324d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{29164446-693d-4311-82cd-f562ae4c7c85}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Mail\Header Files">
 
-      <UniqueIdentifier>{0a93dffd-8c4a-4edb-abb8-a524b9cb40dd}</UniqueIdentifier>
 
+      <UniqueIdentifier>{38968f5a-123d-41bc-b946-9f70c4234101}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Mail\Source Files">
 
-      <UniqueIdentifier>{21410110-b4d6-4520-a6c4-e4bbf960ec04}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c02b32a6-3d5e-47a9-978c-aeb8d2e4a6b2}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ICMP">
 
-      <UniqueIdentifier>{11fbb0f9-2587-4c5b-a898-507e0897d3da}</UniqueIdentifier>
 
+      <UniqueIdentifier>{b215a7b1-023a-4e6e-bc96-9efcd29450fc}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ICMP\Header Files">
 
-      <UniqueIdentifier>{8b1825fa-f807-4a18-92bc-9660c33680fb}</UniqueIdentifier>
 
+      <UniqueIdentifier>{31ecbbc8-2926-48c0-8c6a-4d999a215c71}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="ICMP\Source Files">
 
-      <UniqueIdentifier>{6116ecaa-8f26-48db-8c24-53d7b8d36b40}</UniqueIdentifier>
 
+      <UniqueIdentifier>{05af34dc-aead-4fa3-b2fe-3af120f3315b}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTP">
 
-      <UniqueIdentifier>{b0fd619d-3464-4781-a280-f857f8041ac0}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d2774370-b567-456c-96e6-bd112abd5f92}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTP\Header Files">
 
-      <UniqueIdentifier>{a6fea55d-728d-4a7a-b633-a51157180418}</UniqueIdentifier>
 
+      <UniqueIdentifier>{bfec6508-1e91-4988-a4f7-0319076f79ef}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTP\Source Files">
 
-      <UniqueIdentifier>{2d28d83b-b58b-41be-832b-e530fdf971e7}</UniqueIdentifier>
 
+      <UniqueIdentifier>{35922673-1923-4fce-a598-106d22fadae6}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging">
 
-      <UniqueIdentifier>{046f821c-907e-4a8f-a03c-3bfd7872448c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{c79ecd0c-401c-4f03-a374-8bee20bc5749}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging\Header Files">
 
-      <UniqueIdentifier>{3923d4a4-5c4c-4a2e-adf0-7ec7eef2dd03}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a4967cc4-a1cc-4447-b008-71f7545c57f9}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Logging\Source Files">
 
-      <UniqueIdentifier>{656a3621-b2f5-45b1-b775-faa1a3b67fc9}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f4cb442a-c76e-4af4-b848-cf889f1da3c7}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="WebSocket">
 
-      <UniqueIdentifier>{0546832e-b113-458f-9db9-3db9e82fbb41}</UniqueIdentifier>
 
+      <UniqueIdentifier>{ed6c0de8-11ad-4bd6-a8be-698fccd9058d}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="WebSocket\Header Files">
 
-      <UniqueIdentifier>{d49b1cd1-508e-4479-ab85-a5ff79a4a8c7}</UniqueIdentifier>
 
+      <UniqueIdentifier>{cf1cf3f6-5cad-4813-ac18-07234e1e7d21}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="WebSocket\Source Files">
 
-      <UniqueIdentifier>{b610e037-00fd-4b22-b123-edbd7381029c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{2ca60ef4-2aec-4590-8f8f-96b888d14700}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="OAuth">
 
-      <UniqueIdentifier>{015e1e81-4e41-49e3-98c0-fbdbd8b5cbd2}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a1455a31-9406-46f8-9178-2ffcb70e9a85}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="OAuth\Header Files">
 
-      <UniqueIdentifier>{f68ec3df-519c-4f17-ba65-94eb081a3828}</UniqueIdentifier>
 
+      <UniqueIdentifier>{46da8814-e0d8-4281-9ef3-9ebbdebc2205}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="OAuth\Source Files">
 
-      <UniqueIdentifier>{a567ae0c-641a-4a56-8161-f8404caab345}</UniqueIdentifier>
 
+      <UniqueIdentifier>{688005cc-583b-43d9-99b8-c72729046ab3}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="UDP">
 
-      <UniqueIdentifier>{61c54ff0-49c4-4fb9-9f7c-1f2f3e8bb753}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d1477907-8069-4477-8700-0236b48f972a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="UDP\Source Files">
 
-      <UniqueIdentifier>{17cd6d4d-6687-40ca-9dac-d36110efcf64}</UniqueIdentifier>
 
+      <UniqueIdentifier>{07a6fba2-ca4e-4e26-839d-a9000190b95c}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="UDP\Header Files">
 
-      <UniqueIdentifier>{2cf2bb9e-c4f6-4aec-8404-a792b1c5674f}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7496c44f-1b9a-4b4a-aab5-121f27d8d173}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTLM">
 
-      <UniqueIdentifier>{f5f349da-4441-4f01-9e2c-ee774168e0e3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{61e1e9d1-e066-4553-a24f-73b81c6c68ef}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTLM\Header Files">
 
-      <UniqueIdentifier>{0ea8ee82-a76c-4cfd-ad4e-4d570efc8b09}</UniqueIdentifier>
 
+      <UniqueIdentifier>{a0624a14-a94b-4a04-beef-04c407cc3854}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="NTLM\Source Files">
 
-      <UniqueIdentifier>{0cfa6ff4-ffbf-4b4a-ba62-6451832772f3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{de8dae17-8c06-4b5b-aa00-46c9ded50bec}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/EchoServer/EchoServer_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>EchoServer</ProjectName>
 
     <ProjectGuid>{5074CE3E-05F5-31BA-BA79-1AD54C3416F7}</ProjectGuid>
 
     <RootNamespace>EchoServer</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">EchoServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">EchoServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">EchoServerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\EchoServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -603,6 +652,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\EchoServer.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Configuration Files">
 
-      <UniqueIdentifier>{08698060-b275-4025-82ff-e5239bbec8e5}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f8ec6c33-55b8-4c41-abea-1331fa246eba}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{0e8d9ff7-97c3-4f74-88a7-d388fc75c624}</UniqueIdentifier>
 
+      <UniqueIdentifier>{854255f5-31d9-4821-a308-2fc436fadd12}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>HTTPFormServer</ProjectName>
 
     <ProjectGuid>{19B162EB-DDAA-37BA-AE93-7FDED89274DE}</ProjectGuid>
 
     <RootNamespace>HTTPFormServer</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">HTTPFormServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">HTTPFormServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">HTTPFormServerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\HTTPFormServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -603,6 +652,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\HTTPFormServer.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Configuration Files">
 
-      <UniqueIdentifier>{93702a97-3813-4a02-8c2c-7bf1f81dd0ee}</UniqueIdentifier>
 
+      <UniqueIdentifier>{28d9ec32-2303-45cd-9b82-99d8e82d114a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{bd44615c-d51b-49f7-8253-0593838cdf70}</UniqueIdentifier>
 
+      <UniqueIdentifier>{7b664366-4efd-4f61-8e9a-d3402e5f9151}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>HTTPLoadTest</ProjectName>
 
     <ProjectGuid>{A140D236-D64B-370A-A7E7-3000725D9869}</ProjectGuid>
 
     <RootNamespace>HTTPLoadTest</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">HTTPLoadTestd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">HTTPLoadTestd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">HTTPLoadTestd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\HTTPLoadTestd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\HTTPLoadTest.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 1 - 1
Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters
View File 

@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{2dfa4964-0aca-4fa7-bb80-44d442b196ce}</UniqueIdentifier>
 
+      <UniqueIdentifier>{03b3bbaf-68d9-4642-b816-5aecd2346517}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>HTTPTimeServer</ProjectName>
 
     <ProjectGuid>{18A0143A-444A-38E3-838C-1ACFBE4EE18C}</ProjectGuid>
 
     <RootNamespace>HTTPTimeServer</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">HTTPTimeServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">HTTPTimeServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">HTTPTimeServerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\HTTPTimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -603,6 +652,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\HTTPTimeServer.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Configuration Files">
 
-      <UniqueIdentifier>{aad7f6cc-6d6c-4c52-885e-ed66f29b8c3d}</UniqueIdentifier>
 
+      <UniqueIdentifier>{f15659cc-e7e0-4f06-84e4-d2e78640f40a}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{9a60f0db-16ac-4654-b235-e7edab7b9027}</UniqueIdentifier>
 
+      <UniqueIdentifier>{fdd11454-e1d0-4044-a596-7998c65f4581}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/Mail/Mail_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>Mail</ProjectName>
 
     <ProjectGuid>{BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}</ProjectGuid>
 
     <RootNamespace>Mail</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Maild</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Maild</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Maild</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\Maild.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Mail.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 1 - 1
Net/samples/Mail/Mail_vs160.vcxproj.filters
View File 

@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{6f539781-c6d9-4fa9-80f6-55102aa077c4}</UniqueIdentifier>
 
+      <UniqueIdentifier>{32ea00e5-48d2-4cf3-873a-cb3473cb873f}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/Ping/Ping_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>Ping</ProjectName>
 
     <ProjectGuid>{154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}</ProjectGuid>
 
     <RootNamespace>Ping</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">Pingd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">Pingd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">Pingd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\Pingd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -603,6 +652,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\Ping.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 2 - 2
Net/samples/Ping/Ping_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Configuration Files">
 
-      <UniqueIdentifier>{036f25a1-997e-4ff8-a1e6-10f34393ab84}</UniqueIdentifier>
 
+      <UniqueIdentifier>{9e79747a-4765-4a08-8a8c-a807b440a4bd}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{77b52943-6e46-4bc3-9c37-fe25ca2352bd}</UniqueIdentifier>
 
+      <UniqueIdentifier>{4debcd31-cc79-4aad-a363-5ab92c651b86}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>SMTPLogger</ProjectName>
 
     <ProjectGuid>{83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}</ProjectGuid>
 
     <RootNamespace>SMTPLogger</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">SMTPLoggerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">SMTPLoggerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">SMTPLoggerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\SMTPLoggerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\SMTPLogger.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 1 - 1
Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters
View File 

@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{4bb40fa4-84f8-4b8f-9ebf-f3fc44fe548c}</UniqueIdentifier>
 
+      <UniqueIdentifier>{31dd20ff-dada-4133-83ea-18077e42ad51}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/TimeServer/TimeServer_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>TimeServer</ProjectName>
 
     <ProjectGuid>{59EDFD20-9968-30F7-9532-44C08DA58C6E}</ProjectGuid>
 
     <RootNamespace>TimeServer</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">TimeServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">TimeServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">TimeServerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\TimeServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\TimeServer.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <ItemGroup>

+ 2 - 2
Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters
View File 

@@ -2,10 +2,10 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{10c8bf4e-a3e8-433e-bdb0-9484a1b89a50}</UniqueIdentifier>
 
+      <UniqueIdentifier>{d0dfb7c6-c519-4fac-ae8d-e755125276ce}</UniqueIdentifier>
 
     </Filter>
 
     <Filter Include="Configuration Files">
 
-      <UniqueIdentifier>{1e050e87-6535-4f44-b7cc-150fdcdfcdff}</UniqueIdentifier>
 
+      <UniqueIdentifier>{5494fc19-b6f8-4590-a41e-e26a9314f302}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

+ 59 - 8
Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj
View File 

@@ -1,5 +1,5 @@
 
 <?xml version="1.0" encoding="UTF-8"?>
 
-<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+<Project DefaultTargets="Build" ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup Label="ProjectConfigurations">
 
     <ProjectConfiguration Include="debug_shared|Win32">
 
       <Configuration>debug_shared</Configuration>
 
@@ -51,6 +51,7 @@
 
     </ProjectConfiguration>
 
   </ItemGroup>
 
   <PropertyGroup Label="Globals">
 
+    <VCProjectVersion>17.0</VCProjectVersion>
 
     <ProjectName>WebSocketServer</ProjectName>
 
     <ProjectGuid>{0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}</ProjectGuid>
 
     <RootNamespace>WebSocketServer</RootNamespace>
 
@@ -157,7 +158,7 @@
 
   </ImportGroup>
 
   <PropertyGroup Label="UserMacros"/>
 
   <PropertyGroup>
 
-    <_ProjectFileVersion>15.0.28307.799</_ProjectFileVersion>
 
+    <_ProjectFileVersion>17.0.34511.75</_ProjectFileVersion>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_shared|Win32'">WebSocketServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_md|Win32'">WebSocketServerd</TargetName>
 
     <TargetName Condition="'$(Configuration)|$(Platform)'=='debug_static_mt|Win32'">WebSocketServerd</TargetName>
 
@@ -247,7 +248,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -255,7 +260,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -279,7 +284,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -308,7 +317,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -316,7 +329,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_mt\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -340,7 +353,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -369,7 +386,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -377,7 +398,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin\static_md\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX86</TargetMachine>
 
     </Link>
 
@@ -401,7 +422,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -430,7 +455,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -438,7 +467,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -462,7 +491,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -491,7 +524,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -499,7 +536,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_mt\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -523,7 +560,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -552,7 +593,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -560,7 +605,7 @@
 
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
 
       <SuppressStartupBanner>true</SuppressStartupBanner>
 
       <GenerateDebugInformation>true</GenerateDebugInformation>
 
-      <ProgramDatabaseFile>bin64\static_md\WebSocketServerd.pdb</ProgramDatabaseFile>
 
+      <ProgramDatabaseFile>$(OutDir)$(TargetName).pdb</ProgramDatabaseFile>
 
       <SubSystem>Console</SubSystem>
 
       <TargetMachine>MachineX64</TargetMachine>
 
     </Link>
 
@@ -584,7 +629,11 @@
 
       <WarningLevel>Level3</WarningLevel>
 
       <DebugInformationFormat/>
 
       <CompileAs>Default</CompileAs>
 
+      <ProgramDataBaseFileName>$(OutDir)$(TargetName).pdb</ProgramDataBaseFileName>
 
+      <AdditionalOptions>/Zc:__cplusplus %(AdditionalOptions)</AdditionalOptions>
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
     <Link>
 
       <AdditionalDependencies>iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)</AdditionalDependencies>
 
@@ -600,6 +649,8 @@
 
   <ItemGroup>
 
     <ClCompile Include="src\WebSocketServer.cpp">
 
       <MultiProcessorCompilation>true</MultiProcessorCompilation>
 
+      <LanguageStandard>stdcpp17</LanguageStandard>
 
+      <LanguageStandard_C>stdc11</LanguageStandard_C>
 
     </ClCompile>
 
   </ItemGroup>
 
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets"/>

+ 1 - 1
Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters
View File 

@@ -2,7 +2,7 @@
 
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
   <ItemGroup>
 
     <Filter Include="Source Files">
 
-      <UniqueIdentifier>{74be8a0e-683c-418b-ab29-0b52b83dc5d3}</UniqueIdentifier>
 
+      <UniqueIdentifier>{16bc7bb6-cdcb-4cbd-83da-1e265fb8bc61}</UniqueIdentifier>
 
     </Filter>
 
   </ItemGroup>
 
   <ItemGroup>

Some files were not shown because too many files changed in this diff