From 19eecbaafb02923ecafb28aea755427d9bbc459e Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sun, 10 Jun 2018 19:46:19 +0200 Subject: [PATCH 01/21] Remove WinTestRunner --- CppParser/CppParser_CE_vs90.vcproj | 4 +- CppParser/CppParser_vs100.vcxproj.filters | 18 +- CppParser/CppParser_vs110.vcxproj | 2 +- CppParser/CppParser_vs110.vcxproj.filters | 18 +- CppParser/CppParser_vs120.vcxproj.filters | 18 +- CppParser/CppParser_vs140.vcxproj | 2 +- CppParser/CppParser_vs140.vcxproj.filters | 18 +- CppParser/CppParser_vs150.vcxproj | 2 +- CppParser/CppParser_vs150.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs100.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs110.vcxproj | 2 +- CppParser/CppParser_x64_vs110.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs120.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs140.vcxproj | 2 +- CppParser/CppParser_x64_vs140.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs150.vcxproj | 2 +- CppParser/CppParser_x64_vs150.vcxproj.filters | 18 +- CppParser/testsuite/TestSuite_CE_vs90.vcproj | 16 +- CppParser/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 24 +- CppParser/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 24 +- CppParser/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs90.vcproj | 50 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 24 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 24 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_x64_vs90.vcproj | 50 +- CppUnit/CppUnit.progen | 2 +- CppUnit/CppUnit_CE_vs90.sln | 23 - CppUnit/CppUnit_WEC2013_vs110.sln | 23 - CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_WEC2013_vs120.sln | 23 - CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_vs100.sln | 47 +- CppUnit/CppUnit_vs100.vcxproj.filters | 4 +- CppUnit/CppUnit_vs110.sln | 23 - CppUnit/CppUnit_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_vs120.sln | 28 +- CppUnit/CppUnit_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_vs140.sln | 28 +- CppUnit/CppUnit_vs140.vcxproj.filters | 4 +- CppUnit/CppUnit_vs150.sln | 31 +- CppUnit/CppUnit_vs150.vcxproj.filters | 4 +- CppUnit/CppUnit_vs90.sln | 47 +- CppUnit/CppUnit_vs90.vcproj | 16 +- CppUnit/CppUnit_x64_vs100.sln | 47 +- CppUnit/CppUnit_x64_vs100.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs110.sln | 23 - CppUnit/CppUnit_x64_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs120.sln | 28 +- CppUnit/CppUnit_x64_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs140.sln | 28 +- CppUnit/CppUnit_x64_vs140.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs150.sln | 31 +- CppUnit/CppUnit_x64_vs150.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs90.sln | 47 +- CppUnit/WinTestRunner/CMakeLists.txt | 36 - CppUnit/WinTestRunner/WinTestRunner.progen | 16 - .../WinTestRunner/WinTestRunner_vs100.vcxproj | 433 ---- .../WinTestRunner_vs100.vcxproj.filters | 61 - .../WinTestRunner/WinTestRunner_vs110.vcxproj | 439 ---- .../WinTestRunner_vs110.vcxproj.filters | 61 - .../WinTestRunner/WinTestRunner_vs90.vcproj | 674 ------ .../WinTestRunner_x64_vs100.vcxproj | 433 ---- .../WinTestRunner_x64_vs100.vcxproj.filters | 61 - .../WinTestRunner_x64_vs110.vcxproj | 439 ---- .../WinTestRunner_x64_vs110.vcxproj.filters | 61 - .../WinTestRunner_x64_vs90.vcproj | 674 ------ CppUnit/WinTestRunner/build.gradle | 33 - .../include/WinTestRunner/WinTestRunner.h | 75 - CppUnit/WinTestRunner/res/Resource.h | 27 - CppUnit/WinTestRunner/res/TestRunner.rc2 | 13 - CppUnit/WinTestRunner/res/WinTestRunner.rc | 175 -- CppUnit/WinTestRunner/src/ActiveTest.cpp | 42 - CppUnit/WinTestRunner/src/ActiveTest.h | 87 - CppUnit/WinTestRunner/src/DLLMain.cpp | 48 - CppUnit/WinTestRunner/src/GUITestResult.cpp | 50 - CppUnit/WinTestRunner/src/GUITestResult.h | 81 - CppUnit/WinTestRunner/src/ProgressBar.cpp | 138 -- CppUnit/WinTestRunner/src/ProgressBar.h | 72 - .../src/SynchronizedTestResult.h | 106 - .../WinTestRunner/src/TestResultDecorator.h | 102 - CppUnit/WinTestRunner/src/TestRunnerDlg.cpp | 437 ---- CppUnit/WinTestRunner/src/TestRunnerDlg.h | 92 - CppUnit/WinTestRunner/src/WinTestRunner.cpp | 106 - Crypto/testsuite/TestSuite_CE_VS90.vcproj | 12 +- Crypto/testsuite/TestSuite_VS90.vcproj | 50 +- Crypto/testsuite/TestSuite_vs100.vcxproj | 38 +- Crypto/testsuite/TestSuite_vs110.vcxproj | 38 +- Crypto/testsuite/TestSuite_vs120.vcxproj | 12 +- Crypto/testsuite/TestSuite_vs140.vcxproj | 12 +- Crypto/testsuite/TestSuite_vs150.vcxproj | 12 +- Crypto/testsuite/TestSuite_x64_vs100.vcxproj | 38 +- Crypto/testsuite/TestSuite_x64_vs110.vcxproj | 38 +- Crypto/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- Crypto/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- Crypto/testsuite/TestSuite_x64_vs150.vcxproj | 12 +- Crypto/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Data/Data_WEC2013_vs110.vcxproj | 285 +-- Data/Data_WEC2013_vs110.vcxproj.filters | 18 +- Data/Data_WEC2013_vs120.vcxproj | 285 +-- Data/Data_WEC2013_vs120.vcxproj.filters | 18 +- Data/Data_vs100.vcxproj.filters | 18 +- Data/Data_vs110.vcxproj | 2 +- Data/Data_vs110.vcxproj.filters | 18 +- Data/Data_vs120.vcxproj.filters | 18 +- Data/Data_vs140.vcxproj | 2 +- Data/Data_vs140.vcxproj.filters | 18 +- Data/Data_vs150.vcxproj | 2 +- Data/Data_vs150.vcxproj.filters | 18 +- Data/Data_x64_vs100.vcxproj.filters | 18 +- Data/Data_x64_vs110.vcxproj | 2 +- Data/Data_x64_vs110.vcxproj.filters | 18 +- Data/Data_x64_vs120.vcxproj.filters | 18 +- Data/Data_x64_vs140.vcxproj | 2 +- Data/Data_x64_vs140.vcxproj.filters | 18 +- Data/Data_x64_vs150.vcxproj | 2 +- Data/Data_x64_vs150.vcxproj.filters | 18 +- Data/Data_x64_vs90.vcproj | 683 ++---- Data/MySQL/MySQL_vs150.vcxproj | 2 +- Data/MySQL/MySQL_x64_vs150.vcxproj | 2 +- Data/MySQL/testsuite/TestSuite_VS90.vcproj | 50 +- Data/MySQL/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 18 +- Data/MySQL/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 18 +- Data/MySQL/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../MySQL/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Data/ODBC/ODBC_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs110.vcxproj | 2 +- Data/ODBC/ODBC_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs120.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs140.vcxproj | 2 +- Data/ODBC/ODBC_vs140.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs150.vcxproj | 2 +- Data/ODBC/ODBC_vs150.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs110.vcxproj | 2 +- Data/ODBC/ODBC_x64_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs120.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs140.vcxproj | 2 +- Data/ODBC/ODBC_x64_vs140.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs150.vcxproj | 2 +- Data/ODBC/ODBC_x64_vs150.vcxproj.filters | 6 +- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 50 +- Data/ODBC/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 18 +- Data/ODBC/testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 18 +- Data/ODBC/testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Data/PostgreSQL/PostgreSQL_vs150.vcxproj | 2 +- Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj | 2 +- Data/PostgreSQL/PostgreSQL_x64_vs90.sln | 62 +- .../testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_VS90.vcproj | 50 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 18 +- .../testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 18 +- .../testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs90.vcproj | 50 +- Data/SQLite/SQLite_WEC2013_vs110.vcxproj | 285 +-- .../SQLite_WEC2013_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_WEC2013_vs120.vcxproj | 285 +-- .../SQLite_WEC2013_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs100.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs110.vcxproj | 2 +- Data/SQLite/SQLite_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs140.vcxproj | 2 +- Data/SQLite/SQLite_vs140.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs150.vcxproj | 2 +- Data/SQLite/SQLite_vs150.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs100.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs110.vcxproj | 2 +- Data/SQLite/SQLite_x64_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs140.vcxproj | 2 +- Data/SQLite/SQLite_x64_vs140.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs150.vcxproj | 2 +- Data/SQLite/SQLite_x64_vs150.vcxproj.filters | 12 +- .../SQLite/testsuite/TestSuite_CE_vs90.vcproj | 10 +- Data/SQLite/testsuite/TestSuite_VS90.vcproj | 50 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 18 +- Data/SQLite/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 18 +- Data/SQLite/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 18 +- Data/SQLite/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs90.vcproj | 50 +- Data/testsuite/TestSuite_CE_vs90.vcproj | 10 +- Data/testsuite/TestSuite_VS90.vcproj | 50 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 30 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 30 +- Data/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 30 +- Data/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 30 +- Data/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 30 +- Data/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 30 +- Data/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Encodings/Encodings_WEC2013_vs110.vcxproj | 2 +- .../Encodings_WEC2013_vs110.vcxproj.filters | 6 +- Encodings/Encodings_WEC2013_vs120.vcxproj | 288 +-- .../Encodings_WEC2013_vs120.vcxproj.filters | 6 +- Encodings/Encodings_vs100.vcxproj.filters | 6 +- Encodings/Encodings_vs110.vcxproj | 2 +- Encodings/Encodings_vs110.vcxproj.filters | 6 +- Encodings/Encodings_vs120.vcxproj.filters | 6 +- Encodings/Encodings_vs140.vcxproj | 2 +- Encodings/Encodings_vs140.vcxproj.filters | 6 +- Encodings/Encodings_vs150.vcxproj | 2 +- Encodings/Encodings_vs150.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs100.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs110.vcxproj | 2 +- Encodings/Encodings_x64_vs110.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs120.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs140.vcxproj | 2 +- Encodings/Encodings_x64_vs140.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs150.vcxproj | 2 +- Encodings/Encodings_x64_vs150.vcxproj.filters | 6 +- Encodings/testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 6 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 6 +- Encodings/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 6 +- Encodings/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 6 +- Encodings/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs90.vcproj | 50 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 6 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 6 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Foundation/Foundation_WEC2013_vs110.vcxproj | 1851 +++++----------- .../Foundation_WEC2013_vs110.vcxproj.filters | 355 ++-- Foundation/Foundation_WEC2013_vs120.vcxproj | 1853 +++++------------ .../Foundation_WEC2013_vs120.vcxproj.filters | 355 ++-- Foundation/Foundation_vs100.sln | 42 +- Foundation/Foundation_vs100.vcxproj.filters | 124 +- Foundation/Foundation_vs110.vcxproj.filters | 124 +- Foundation/Foundation_vs120.vcxproj | 1170 +++++------ Foundation/Foundation_vs120.vcxproj.filters | 124 +- Foundation/Foundation_vs140.sln | 66 +- Foundation/Foundation_vs140.vcxproj | 2 +- Foundation/Foundation_vs140.vcxproj.filters | 124 +- Foundation/Foundation_vs150.sln | 69 +- Foundation/Foundation_vs150.vcxproj | 2 +- Foundation/Foundation_vs150.vcxproj.filters | 124 +- Foundation/Foundation_vs90.sln | 42 +- .../Foundation_x64_vs100.vcxproj.filters | 124 +- .../Foundation_x64_vs110.vcxproj.filters | 124 +- Foundation/Foundation_x64_vs120.vcxproj | 1170 +++++------ .../Foundation_x64_vs120.vcxproj.filters | 124 +- Foundation/Foundation_x64_vs140.vcxproj | 2 +- .../Foundation_x64_vs140.vcxproj.filters | 124 +- Foundation/Foundation_x64_vs150.vcxproj | 2 +- .../Foundation_x64_vs150.vcxproj.filters | 124 +- Foundation/Foundation_x64_vs90.sln | 42 +- Foundation/testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 120 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 120 +- Foundation/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 120 +- Foundation/testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 120 +- Foundation/testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 118 +- Foundation/testsuite/TestSuite_vs90.vcproj | 50 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 120 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 120 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 118 +- .../testsuite/TestSuite_x64_vs90.vcproj | 50 +- JSON/JSON_WEC2013_vs110.vcxproj | 2 +- JSON/JSON_WEC2013_vs110.vcxproj.filters | 4 +- JSON/JSON_WEC2013_vs120.vcxproj | 274 +-- JSON/JSON_WEC2013_vs120.vcxproj.filters | 4 +- JSON/JSON_vs100.vcxproj.filters | 4 +- JSON/JSON_vs110.vcxproj | 2 +- JSON/JSON_vs110.vcxproj.filters | 4 +- JSON/JSON_vs120.vcxproj.filters | 4 +- JSON/JSON_vs140.vcxproj | 2 +- JSON/JSON_vs140.vcxproj.filters | 4 +- JSON/JSON_vs150.vcxproj | 2 +- JSON/JSON_vs150.vcxproj.filters | 4 +- JSON/JSON_x64_vs100.vcxproj.filters | 4 +- JSON/JSON_x64_vs110.vcxproj | 2 +- JSON/JSON_x64_vs110.vcxproj.filters | 4 +- JSON/JSON_x64_vs120.vcxproj.filters | 4 +- JSON/JSON_x64_vs140.vcxproj | 2 +- JSON/JSON_x64_vs140.vcxproj.filters | 4 +- JSON/JSON_x64_vs150.vcxproj | 2 +- JSON/JSON_x64_vs150.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 6 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 6 +- JSON/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 6 +- JSON/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 6 +- JSON/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs90.vcproj | 50 +- JSON/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 6 +- JSON/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 6 +- JSON/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs90.vcproj | 50 +- MongoDB/MongoDB_CE_vs90.vcproj | 4 +- MongoDB/MongoDB_vs100.vcxproj.filters | 4 +- MongoDB/MongoDB_vs110.vcxproj | 2 +- MongoDB/MongoDB_vs110.vcxproj.filters | 4 +- MongoDB/MongoDB_vs120.vcxproj.filters | 4 +- MongoDB/MongoDB_vs140.vcxproj | 2 +- MongoDB/MongoDB_vs140.vcxproj.filters | 4 +- MongoDB/MongoDB_vs150.vcxproj | 2 +- MongoDB/MongoDB_vs150.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs100.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs110.vcxproj | 2 +- MongoDB/MongoDB_x64_vs110.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs120.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs140.vcxproj | 2 +- MongoDB/MongoDB_x64_vs140.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs150.vcxproj | 2 +- MongoDB/MongoDB_x64_vs150.vcxproj.filters | 4 +- MongoDB/samples/samples_vs90.sln | 44 +- MongoDB/testsuite/TestSuite_CE_vs90.vcproj | 16 +- MongoDB/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 6 +- MongoDB/testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 6 +- MongoDB/testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs90.vcproj | 50 +- MongoDB/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 6 +- MongoDB/testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 6 +- MongoDB/testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Net/Net_WEC2013_vs110.vcxproj.filters | 102 +- Net/Net_WEC2013_vs120.vcxproj.filters | 102 +- Net/Net_vs100.vcxproj.filters | 102 +- Net/Net_vs110.vcxproj.filters | 102 +- Net/Net_vs120.vcxproj.filters | 102 +- Net/Net_vs140.vcxproj.filters | 102 +- Net/Net_vs150.vcxproj | 2 +- Net/Net_vs150.vcxproj.filters | 102 +- Net/Net_x64_vs100.vcxproj.filters | 102 +- Net/Net_x64_vs110.vcxproj.filters | 102 +- Net/Net_x64_vs120.vcxproj.filters | 102 +- Net/Net_x64_vs140.vcxproj.filters | 102 +- Net/Net_x64_vs150.vcxproj | 2 +- Net/Net_x64_vs150.vcxproj.filters | 102 +- Net/testsuite/TestSuite_CE_vs90.vcproj | 14 +- Net/testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 114 +- Net/testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 114 +- Net/testsuite/TestSuite_vs100.vcxproj | 50 +- Net/testsuite/TestSuite_vs100.vcxproj.filters | 114 +- Net/testsuite/TestSuite_vs110.vcxproj | 50 +- Net/testsuite/TestSuite_vs110.vcxproj.filters | 114 +- Net/testsuite/TestSuite_vs120.vcxproj | 24 +- Net/testsuite/TestSuite_vs120.vcxproj.filters | 112 +- Net/testsuite/TestSuite_vs140.vcxproj | 24 +- Net/testsuite/TestSuite_vs140.vcxproj.filters | 112 +- Net/testsuite/TestSuite_vs150.vcxproj | 24 +- Net/testsuite/TestSuite_vs150.vcxproj.filters | 112 +- Net/testsuite/TestSuite_vs90.vcproj | 50 +- Net/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 114 +- Net/testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 114 +- Net/testsuite/TestSuite_x64_vs120.vcxproj | 24 +- .../TestSuite_x64_vs120.vcxproj.filters | 112 +- Net/testsuite/TestSuite_x64_vs140.vcxproj | 24 +- .../TestSuite_x64_vs140.vcxproj.filters | 112 +- Net/testsuite/TestSuite_x64_vs150.vcxproj | 24 +- .../TestSuite_x64_vs150.vcxproj.filters | 112 +- Net/testsuite/TestSuite_x64_vs90.vcproj | 50 +- ...tSSL_OpenSSL_WEC2013_vs110.vcxproj.filters | 24 +- ...tSSL_OpenSSL_WEC2013_vs120.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_vs100.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_vs110.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_vs120.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_vs140.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj | 2 +- .../NetSSL_OpenSSL_vs150.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs100.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs110.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs120.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs140.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs150.vcxproj | 2 +- .../NetSSL_OpenSSL_x64_vs150.vcxproj.filters | 24 +- .../testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 42 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 42 +- .../testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 42 +- .../testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 42 +- .../testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs90.vcproj | 50 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 42 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 42 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs90.vcproj | 50 +- NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj | 281 +-- .../NetSSL_Win_WEC2013_vs110.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj | 281 +-- .../NetSSL_Win_WEC2013_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs110.vcxproj | 2 +- NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs140.vcxproj | 2 +- NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs150.vcxproj | 2 +- NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters | 24 +- .../NetSSL_Win_x64_vs100.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj | 2 +- .../NetSSL_Win_x64_vs110.vcxproj.filters | 24 +- .../NetSSL_Win_x64_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj | 2 +- .../NetSSL_Win_x64_vs140.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj | 2 +- .../NetSSL_Win_x64_vs150.vcxproj.filters | 24 +- NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 36 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 36 +- NetSSL_Win/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 36 +- NetSSL_Win/testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 36 +- NetSSL_Win/testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs90.vcproj | 50 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 36 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 36 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs90.vcproj | 50 +- PDF/PDF_vs100.vcxproj.filters | 24 +- PDF/PDF_vs110.vcxproj | 2 +- PDF/PDF_vs110.vcxproj.filters | 24 +- PDF/PDF_vs120.vcxproj.filters | 24 +- PDF/PDF_vs140.vcxproj | 2 +- PDF/PDF_vs140.vcxproj.filters | 24 +- PDF/PDF_vs150.vcxproj | 2 +- PDF/PDF_vs150.vcxproj.filters | 24 +- PDF/PDF_x64_vs100.vcxproj.filters | 24 +- PDF/PDF_x64_vs110.vcxproj | 2 +- PDF/PDF_x64_vs110.vcxproj.filters | 24 +- PDF/PDF_x64_vs120.vcxproj.filters | 24 +- PDF/PDF_x64_vs140.vcxproj | 2 +- PDF/PDF_x64_vs140.vcxproj.filters | 24 +- PDF/PDF_x64_vs150.vcxproj | 2 +- PDF/PDF_x64_vs150.vcxproj.filters | 24 +- PDF/samples/Image/Image_vs90.vcproj | 4 +- PDF/samples/Image/Image_x64_vs90.vcproj | 4 +- PDF/samples/Template/Template_vs90.vcproj | 4 +- PDF/samples/Template/Template_x64_vs90.vcproj | 4 +- PDF/samples/Text/Text_vs90.vcproj | 4 +- PDF/samples/Text/Text_x64_vs90.vcproj | 4 +- PDF/testsuite/TestSuite_vs100.vcxproj | 50 +- PDF/testsuite/TestSuite_vs100.vcxproj.filters | 18 +- PDF/testsuite/TestSuite_vs110.vcxproj | 44 +- PDF/testsuite/TestSuite_vs110.vcxproj.filters | 18 +- PDF/testsuite/TestSuite_vs120.vcxproj | 18 +- PDF/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs140.vcxproj | 18 +- PDF/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs150.vcxproj | 18 +- PDF/testsuite/TestSuite_vs150.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs90.vcproj | 50 +- PDF/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- PDF/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- PDF/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs90.vcproj | 50 +- .../Win32/testsuite/debug_shared.template | 8 +- .../Win32/testsuite/debug_static_md.template | 8 +- .../Win32/testsuite/debug_static_mt.template | 8 +- .../Win32/testsuite/release_shared.template | 8 +- .../testsuite/release_static_md.template | 8 +- .../testsuite/release_static_mt.template | 8 +- .../vs100/x64/testsuite/debug_shared.template | 8 +- .../x64/testsuite/debug_static_md.template | 8 +- .../x64/testsuite/debug_static_mt.template | 8 +- .../x64/testsuite/release_shared.template | 8 +- .../x64/testsuite/release_static_md.template | 8 +- .../x64/testsuite/release_static_mt.template | 8 +- .../Win32/testsuite/debug_shared.template | 8 +- .../Win32/testsuite/debug_static_md.template | 8 +- .../Win32/testsuite/debug_static_mt.template | 8 +- .../Win32/testsuite/release_shared.template | 8 +- .../testsuite/release_static_md.template | 8 +- .../testsuite/release_static_mt.template | 8 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs110/x64/testsuite/debug_shared.template | 8 +- .../x64/testsuite/debug_static_md.template | 8 +- .../x64/testsuite/debug_static_mt.template | 8 +- .../x64/testsuite/release_shared.template | 8 +- .../x64/testsuite/release_static_md.template | 8 +- .../x64/testsuite/release_static_mt.template | 8 +- .../Win32/testsuite/debug_shared.template | 4 +- .../Win32/testsuite/debug_static_md.template | 4 +- .../Win32/testsuite/debug_static_mt.template | 4 +- .../Win32/testsuite/release_shared.template | 4 +- .../testsuite/release_static_md.template | 4 +- .../testsuite/release_static_mt.template | 4 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs120/x64/testsuite/debug_shared.template | 4 +- .../x64/testsuite/debug_static_md.template | 4 +- .../x64/testsuite/debug_static_mt.template | 4 +- .../x64/testsuite/release_shared.template | 4 +- .../x64/testsuite/release_static_md.template | 4 +- .../x64/testsuite/release_static_mt.template | 4 +- .../Win32/testsuite/debug_shared.template | 4 +- .../Win32/testsuite/debug_static_md.template | 4 +- .../Win32/testsuite/debug_static_mt.template | 4 +- .../Win32/testsuite/release_shared.template | 4 +- .../testsuite/release_static_md.template | 4 +- .../testsuite/release_static_mt.template | 4 +- .../vs140/x64/testsuite/debug_shared.template | 4 +- .../x64/testsuite/debug_static_md.template | 4 +- .../x64/testsuite/debug_static_mt.template | 4 +- .../x64/testsuite/release_shared.template | 4 +- .../x64/testsuite/release_static_md.template | 4 +- .../x64/testsuite/release_static_mt.template | 4 +- .../Win32/testsuite/debug_shared.template | 4 +- .../Win32/testsuite/debug_static_md.template | 4 +- .../Win32/testsuite/debug_static_mt.template | 4 +- .../Win32/testsuite/release_shared.template | 4 +- .../testsuite/release_static_md.template | 4 +- .../testsuite/release_static_mt.template | 4 +- .../vs150/x64/testsuite/debug_shared.template | 4 +- .../x64/testsuite/debug_static_md.template | 4 +- .../x64/testsuite/debug_static_mt.template | 4 +- .../x64/testsuite/release_shared.template | 4 +- .../x64/testsuite/release_static_md.template | 4 +- .../x64/testsuite/release_static_mt.template | 4 +- .../Win32/testsuite/debug_shared.template | 8 +- .../Win32/testsuite/debug_static_md.template | 8 +- .../Win32/testsuite/debug_static_mt.template | 8 +- .../Win32/testsuite/release_shared.template | 8 +- .../testsuite/release_static_md.template | 8 +- .../testsuite/release_static_mt.template | 8 +- .../WinCE/testsuite/debug_shared.template | 2 +- .../WinCE/testsuite/debug_static_md.template | 2 +- .../WinCE/testsuite/debug_static_mt.template | 2 +- .../WinCE/testsuite/release_shared.template | 2 +- .../testsuite/release_static_md.template | 2 +- .../testsuite/release_static_mt.template | 2 +- .../vs90/x64/testsuite/debug_shared.template | 8 +- .../x64/testsuite/debug_static_md.template | 8 +- .../x64/testsuite/debug_static_mt.template | 8 +- .../x64/testsuite/release_shared.template | 8 +- .../x64/testsuite/release_static_md.template | 8 +- .../x64/testsuite/release_static_mt.template | 8 +- Redis/Redis_vs100.vcxproj.filters | 4 +- Redis/Redis_vs110.vcxproj | 1 + Redis/Redis_vs110.vcxproj.filters | 4 +- Redis/Redis_vs120.vcxproj | 87 +- Redis/Redis_vs120.vcxproj.filters | 7 +- Redis/Redis_vs140.sln | 2 +- Redis/Redis_vs140.vcxproj | 87 +- Redis/Redis_vs140.vcxproj.filters | 7 +- Redis/Redis_vs150.vcxproj | 85 +- Redis/Redis_vs150.vcxproj.filters | 7 +- Redis/Redis_vs90.vcproj | 2 + Redis/Redis_x64_vs100.vcxproj | 1 - Redis/Redis_x64_vs100.vcxproj.filters | 4 +- Redis/Redis_x64_vs110.vcxproj.filters | 4 +- Redis/Redis_x64_vs120.vcxproj | 87 +- Redis/Redis_x64_vs120.vcxproj.filters | 7 +- Redis/Redis_x64_vs140.sln | 2 +- Redis/Redis_x64_vs140.vcxproj | 87 +- Redis/Redis_x64_vs140.vcxproj.filters | 7 +- Redis/Redis_x64_vs150.vcxproj | 85 +- Redis/Redis_x64_vs150.vcxproj.filters | 7 +- Redis/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 6 +- Redis/testsuite/TestSuite_vs110.vcxproj | 50 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 6 +- Redis/testsuite/TestSuite_vs120.vcxproj | 20 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs140.vcxproj | 20 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs150.vcxproj | 20 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs90.vcproj | 50 +- Redis/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 6 +- Redis/testsuite/TestSuite_x64_vs110.vcxproj | 50 +- .../TestSuite_x64_vs110.vcxproj.filters | 6 +- Redis/testsuite/TestSuite_x64_vs120.vcxproj | 20 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs140.vcxproj | 20 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs150.vcxproj | 20 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs90.vcproj | 50 +- SevenZip/SevenZip_CE_vs90.vcproj | 4 +- SevenZip/SevenZip_vs90.vcproj | 4 +- SevenZip/SevenZip_x64_vs90.vcproj | 4 +- SevenZip/samples/un7zip/un7zip_CE_vs90.vcproj | 4 +- SevenZip/samples/un7zip/un7zip_vs90.vcproj | 4 +- .../samples/un7zip/un7zip_x64_vs90.vcproj | 4 +- Util/Util_WEC2013_vs110.vcxproj | 288 +-- Util/Util_WEC2013_vs110.vcxproj.filters | 36 +- Util/Util_WEC2013_vs120.vcxproj | 288 +-- Util/Util_WEC2013_vs120.vcxproj.filters | 36 +- Util/Util_vs100.vcxproj.filters | 36 +- Util/Util_vs110.vcxproj | 2 +- Util/Util_vs110.vcxproj.filters | 36 +- Util/Util_vs120.vcxproj.filters | 36 +- Util/Util_vs140.vcxproj | 2 +- Util/Util_vs140.vcxproj.filters | 36 +- Util/Util_vs150.vcxproj | 2 +- Util/Util_vs150.vcxproj.filters | 36 +- Util/Util_x64_vs100.vcxproj.filters | 36 +- Util/Util_x64_vs110.vcxproj | 2 +- Util/Util_x64_vs110.vcxproj.filters | 36 +- Util/Util_x64_vs120.vcxproj.filters | 36 +- Util/Util_x64_vs140.vcxproj | 2 +- Util/Util_x64_vs140.vcxproj.filters | 36 +- Util/Util_x64_vs150.vcxproj | 2 +- Util/Util_x64_vs150.vcxproj.filters | 36 +- Util/samples/Units/Units_CE_vs90.vcproj | 4 +- Util/samples/Units/Units_vs90.vcproj | 4 +- Util/samples/Units/Units_x64_vs90.vcproj | 4 +- Util/testsuite/TestSuite_CE_vs90.vcproj | 10 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 42 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 42 +- Util/testsuite/TestSuite_vs100.vcxproj | 50 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 42 +- Util/testsuite/TestSuite_vs110.vcxproj | 44 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 42 +- Util/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs90.vcproj | 50 +- Util/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 42 +- Util/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 42 +- Util/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs90.vcproj | 50 +- XML/XML_WEC2013_vs110.vcxproj | 315 +-- XML/XML_WEC2013_vs110.vcxproj.filters | 24 +- XML/XML_WEC2013_vs120.vcxproj | 315 +-- XML/XML_WEC2013_vs120.vcxproj.filters | 24 +- XML/XML_vs100.vcxproj.filters | 24 +- XML/XML_vs110.vcxproj | 2 +- XML/XML_vs110.vcxproj.filters | 24 +- XML/XML_vs120.vcxproj.filters | 24 +- XML/XML_vs140.vcxproj | 2 +- XML/XML_vs140.vcxproj.filters | 24 +- XML/XML_vs150.vcxproj | 2 +- XML/XML_vs150.vcxproj.filters | 24 +- XML/XML_x64_vs100.vcxproj.filters | 24 +- XML/XML_x64_vs110.vcxproj | 2 +- XML/XML_x64_vs110.vcxproj.filters | 24 +- XML/XML_x64_vs120.vcxproj.filters | 24 +- XML/XML_x64_vs140.vcxproj | 2 +- XML/XML_x64_vs140.vcxproj.filters | 24 +- XML/XML_x64_vs150.vcxproj | 2 +- XML/XML_x64_vs150.vcxproj.filters | 24 +- XML/testsuite/TestSuite_CE_vs90.vcproj | 10 +- XML/testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 30 +- XML/testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 30 +- XML/testsuite/TestSuite_vs100.vcxproj | 50 +- XML/testsuite/TestSuite_vs100.vcxproj.filters | 30 +- XML/testsuite/TestSuite_vs110.vcxproj | 44 +- XML/testsuite/TestSuite_vs110.vcxproj.filters | 30 +- XML/testsuite/TestSuite_vs120.vcxproj | 18 +- XML/testsuite/TestSuite_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs140.vcxproj | 18 +- XML/testsuite/TestSuite_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs150.vcxproj | 18 +- XML/testsuite/TestSuite_vs150.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs90.vcproj | 50 +- XML/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 30 +- XML/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 30 +- XML/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs90.vcproj | 50 +- Zip/Zip_WEC2013_vs110.vcxproj | 294 +-- Zip/Zip_WEC2013_vs110.vcxproj.filters | 12 +- Zip/Zip_WEC2013_vs120.vcxproj | 294 +-- Zip/Zip_WEC2013_vs120.vcxproj.filters | 12 +- Zip/Zip_vs100.vcxproj.filters | 12 +- Zip/Zip_vs110.vcxproj | 2 +- Zip/Zip_vs110.vcxproj.filters | 12 +- Zip/Zip_vs120.vcxproj.filters | 12 +- Zip/Zip_vs140.vcxproj | 2 +- Zip/Zip_vs140.vcxproj.filters | 12 +- Zip/Zip_vs150.vcxproj | 2 +- Zip/Zip_vs150.vcxproj.filters | 12 +- Zip/Zip_x64_vs100.vcxproj.filters | 12 +- Zip/Zip_x64_vs110.vcxproj | 2 +- Zip/Zip_x64_vs110.vcxproj.filters | 12 +- Zip/Zip_x64_vs120.vcxproj.filters | 12 +- Zip/Zip_x64_vs140.vcxproj | 2 +- Zip/Zip_x64_vs140.vcxproj.filters | 12 +- Zip/Zip_x64_vs150.vcxproj | 2 +- Zip/Zip_x64_vs150.vcxproj.filters | 12 +- Zip/testsuite/TestSuite_CE_vs90.vcproj | 10 +- Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj | 2 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_vs100.vcxproj | 50 +- Zip/testsuite/TestSuite_vs100.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_vs110.vcxproj | 44 +- Zip/testsuite/TestSuite_vs110.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_vs120.vcxproj | 18 +- Zip/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs140.vcxproj | 18 +- Zip/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs150.vcxproj | 18 +- Zip/testsuite/TestSuite_vs150.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs90.vcproj | 50 +- Zip/testsuite/TestSuite_x64_vs100.vcxproj | 50 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_x64_vs110.vcxproj | 44 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- Zip/testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs90.vcproj | 50 +- 941 files changed, 13499 insertions(+), 24478 deletions(-) delete mode 100644 CppUnit/WinTestRunner/CMakeLists.txt delete mode 100644 CppUnit/WinTestRunner/WinTestRunner.progen delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj.filters delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj.filters delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters delete mode 100644 CppUnit/WinTestRunner/WinTestRunner_x64_vs90.vcproj delete mode 100644 CppUnit/WinTestRunner/build.gradle delete mode 100644 CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h delete mode 100644 CppUnit/WinTestRunner/res/Resource.h delete mode 100644 CppUnit/WinTestRunner/res/TestRunner.rc2 delete mode 100644 CppUnit/WinTestRunner/res/WinTestRunner.rc delete mode 100644 CppUnit/WinTestRunner/src/ActiveTest.cpp delete mode 100644 CppUnit/WinTestRunner/src/ActiveTest.h delete mode 100644 CppUnit/WinTestRunner/src/DLLMain.cpp delete mode 100644 CppUnit/WinTestRunner/src/GUITestResult.cpp delete mode 100644 CppUnit/WinTestRunner/src/GUITestResult.h delete mode 100644 CppUnit/WinTestRunner/src/ProgressBar.cpp delete mode 100644 CppUnit/WinTestRunner/src/ProgressBar.h delete mode 100644 CppUnit/WinTestRunner/src/SynchronizedTestResult.h delete mode 100644 CppUnit/WinTestRunner/src/TestResultDecorator.h delete mode 100644 CppUnit/WinTestRunner/src/TestRunnerDlg.cpp delete mode 100644 CppUnit/WinTestRunner/src/TestRunnerDlg.h delete mode 100644 CppUnit/WinTestRunner/src/WinTestRunner.cpp diff --git a/CppParser/CppParser_CE_vs90.vcproj b/CppParser/CppParser_CE_vs90.vcproj index 27bed8550..5d1fa5932 100644 --- a/CppParser/CppParser_CE_vs90.vcproj +++ b/CppParser/CppParser_CE_vs90.vcproj @@ -55,7 +55,7 @@ - {8fc4bfb4-7d83-4c67-87b7-0c05e13864f9} + {0eb97c38-4dbf-45af-9442-7b8278de256b} - {eecadd07-6751-49ef-8b02-51f407a21584} + {949bb527-b465-411b-aa5a-d1a013a0bc6b} - {3ec4104c-a6d3-403f-ab4a-6f59a064cd7e} + {b210495a-be06-4b02-bbd9-83b2bdb8bc2b} - {8d185c5d-0799-445c-a1bb-a4b7ac390655} + {a991fd89-4895-4187-bc24-b02f46db425f} - {2c0d6f7b-b014-4096-a18e-2e6bb87cca4b} + {a07dff1a-3cca-447f-b569-075990fbe249} - {9384d3a1-869e-4805-b32e-5a2a245e63b5} + {9e713466-c18a-4cee-8dbd-9fc88c9039aa} - {e4bbe87d-7bd8-4dbc-bef5-92dbf0af019c} + {f549edba-353e-4ff7-8864-185c7cd62838} - {dae43bb9-ebf4-4cf9-bfab-7b23bf448697} + {14935db5-dc75-4472-87a2-df05a258e3b7} - {3722ef61-b936-46ab-bd88-68480ac09c53} + {40a88f96-ed97-4650-8884-e6eea55757fa} diff --git a/CppParser/CppParser_vs110.vcxproj b/CppParser/CppParser_vs110.vcxproj index 0fe01842c..218694fd1 100644 --- a/CppParser/CppParser_vs110.vcxproj +++ b/CppParser/CppParser_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoCppParserd PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_vs110.vcxproj.filters b/CppParser/CppParser_vs110.vcxproj.filters index 3fb0c7ae2..a5ed25604 100644 --- a/CppParser/CppParser_vs110.vcxproj.filters +++ b/CppParser/CppParser_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {fbe31db5-7a65-4e14-bf78-b5522a4918b5} + {78a27494-64ed-47f9-a691-1bda07c9dd94} - {0db370aa-b6e0-4084-ab71-6664ab51b74e} + {5db5a208-dd5a-41f8-b50e-7342cd4d70e1} - {1105f37d-4dde-4700-ae6f-bcc605316bc7} + {ae7e8b17-3d54-4fb8-a862-c423b5abfe63} - {ea117f86-aeaf-4721-b2bc-12f82632a2d8} + {bb5e1fad-f6df-4f1e-9273-45d2e2f619cb} - {9ee7a83f-284f-4e6a-bc5a-a507eda93520} + {7ccf016f-c8e1-40aa-8779-6216cbf8e6e1} - {63525e68-4531-4a9c-a6ee-f910fb64af95} + {2924fcf1-e290-406c-b954-072fa33a45ac} - {b3ab1930-467c-4029-b69d-af8179efe917} + {ab97c710-df13-4ec3-aa5a-76eec940ad54} - {a957a75d-6b0b-4961-9ef0-49036ab33894} + {16412b8e-83bd-4ea6-a15b-3a3400046c7a} - {c33fee7c-6135-4bb5-8fbb-4e897e48fa80} + {b35137ca-29f0-4409-ae85-ebd098dce99e} diff --git a/CppParser/CppParser_vs120.vcxproj.filters b/CppParser/CppParser_vs120.vcxproj.filters index 2f06a7113..dd33951b3 100644 --- a/CppParser/CppParser_vs120.vcxproj.filters +++ b/CppParser/CppParser_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {7487ddba-f1d5-495d-b32b-68601a9dab1a} + {9b60e8e0-d465-4411-982c-bcaa524afdc3} - {8bc7f631-9384-4a0a-8800-54d313f41b3b} + {43bb19cc-e598-4965-9153-0cca28299b72} - {ef94c4a6-ba11-4cba-90a4-601f54630e89} + {c8b11ad1-e653-4482-adf2-a3e218780c98} - {a2ad522f-744f-4176-942a-0fb35c7fd86d} + {d74ed20e-3de5-4b9f-b2d6-adfff5f3b723} - {a1ea794b-469a-4cae-a8cd-2b69253fb73f} + {203dd30f-0f27-4e23-97ff-5c3fdc243e7f} - {5c21c15f-7599-4e41-88e3-40a1eafc94b3} + {8ce7aac3-184b-4416-a08d-dd084e35b004} - {580bf6c5-379b-4f0c-a052-b6389834afaf} + {41fa7ce8-411d-4095-a876-bfa85d49aa58} - {a4f468cf-c1f7-40ae-9d42-4d315a9492d9} + {03ad2a9f-e4da-4567-95e6-e0d41111c549} - {1a575e3a-6dcb-4245-8d5c-d5b787a0b9f3} + {156241b8-f780-43be-a5b5-ace7932fc9ac} diff --git a/CppParser/CppParser_vs140.vcxproj b/CppParser/CppParser_vs140.vcxproj index 36d446c3a..bd3a2d6bc 100644 --- a/CppParser/CppParser_vs140.vcxproj +++ b/CppParser/CppParser_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoCppParserd PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_vs140.vcxproj.filters b/CppParser/CppParser_vs140.vcxproj.filters index 9d6f293a2..5c13b8725 100644 --- a/CppParser/CppParser_vs140.vcxproj.filters +++ b/CppParser/CppParser_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {4187737f-2ab8-4d4c-bf80-5e4ca0ec952d} + {9c1f2752-16b7-40e5-afa1-b73079f8fcd5} - {37dfce6d-40b8-4e52-b0a1-0833099faadc} + {a46a53b6-ca33-4819-958a-b662fb7bb577} - {8783dc43-2f76-4939-9b5d-986d8c716d39} + {cc7e10e3-33cb-4b78-83d1-e24c2960f537} - {776ef0ed-d9c8-4402-aa52-1f7ef690c561} + {8def99f7-23bd-4fa3-bf1b-b39187386f55} - {3ac2363c-a383-4707-8b43-da139157d83d} + {d554025a-a7d0-4413-b184-addcf68d6c05} - {bf9ef9f5-e569-40af-9622-2e03f79a7c00} + {6e9bb1e7-4d83-454f-89e2-b5dec1ac74fc} - {7fdc8b81-eb2c-4682-a623-eb0a5c7bae53} + {b9887352-55d3-42e7-94c8-dcbf58092651} - {1e3dc571-a898-46ab-96f9-09c089b6aa4d} + {43a1f1a5-c08e-4bff-b055-9b65c8b1f0fd} - {9b93d5b7-ac44-48f2-84e7-6a680559483b} + {ebe03907-717b-4270-b9cb-f150cc137032} diff --git a/CppParser/CppParser_vs150.vcxproj b/CppParser/CppParser_vs150.vcxproj index 4b5699a09..55bec284b 100644 --- a/CppParser/CppParser_vs150.vcxproj +++ b/CppParser/CppParser_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoCppParserd PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_vs150.vcxproj.filters b/CppParser/CppParser_vs150.vcxproj.filters index 9d6f293a2..715c29af2 100644 --- a/CppParser/CppParser_vs150.vcxproj.filters +++ b/CppParser/CppParser_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {4187737f-2ab8-4d4c-bf80-5e4ca0ec952d} + {78eacddc-f529-454b-acdb-b801bd3aedbd} - {37dfce6d-40b8-4e52-b0a1-0833099faadc} + {d941d576-14f6-4843-a4c9-59a517d77cce} - {8783dc43-2f76-4939-9b5d-986d8c716d39} + {339e073d-4572-4152-808e-b13e60cd406d} - {776ef0ed-d9c8-4402-aa52-1f7ef690c561} + {2351d6b9-dea8-4605-818f-bad799794faa} - {3ac2363c-a383-4707-8b43-da139157d83d} + {b1e9e71d-f8ac-4a75-b879-423d9e18aecc} - {bf9ef9f5-e569-40af-9622-2e03f79a7c00} + {c28b6fe0-e217-440f-8d33-072fcac04f88} - {7fdc8b81-eb2c-4682-a623-eb0a5c7bae53} + {ca54d561-99db-4061-b1bf-6995713f9e1e} - {1e3dc571-a898-46ab-96f9-09c089b6aa4d} + {ee137253-2409-48ca-971b-9170ffc38e05} - {9b93d5b7-ac44-48f2-84e7-6a680559483b} + {5d50efde-7aa8-4c88-89c6-cc12e82af293} diff --git a/CppParser/CppParser_x64_vs100.vcxproj.filters b/CppParser/CppParser_x64_vs100.vcxproj.filters index 61522ea4e..74f283a65 100644 --- a/CppParser/CppParser_x64_vs100.vcxproj.filters +++ b/CppParser/CppParser_x64_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {64aacbb4-5665-47b3-99de-30d2290eab41} + {a006d611-c65e-4b56-bca3-80868363d6a4} - {f6fac554-950f-49c8-afde-90d5a4c37f88} + {81fd3102-97fd-41f0-a379-c673c2c5e960} - {8294379e-6bc5-46ca-a30a-60952cfb3f95} + {6b5636fa-a89d-47b2-a7a0-1daf40db9f88} - {d2a30143-2ee1-4b6e-bd19-195615129e37} + {588efe86-0fe0-4e32-a98c-16ece36e592e} - {ab6012c6-db97-464e-9150-4799a0268ac0} + {bfe38019-4410-44ad-9d4f-bece79bf39f6} - {05a8e672-d86f-4822-85ed-2c2f32f46eb3} + {b6002fb0-f25a-4632-840a-1593d508b557} - {bae9e2a9-ba20-4f5d-8064-522f5cfc13b8} + {fac5a3e1-f114-4d29-b16c-0cca9f9e3abc} - {bfae0602-82f1-4a4d-b0e0-1731054b140f} + {38c96733-8fd8-41ab-83a2-b92e73ad0c66} - {4a7c2953-dee0-4d58-a56c-77568b6b9b24} + {c733d58f-d7d1-4810-8622-46f3b6c038f5} diff --git a/CppParser/CppParser_x64_vs110.vcxproj b/CppParser/CppParser_x64_vs110.vcxproj index ed63bdeb7..d3f58a120 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj +++ b/CppParser/CppParser_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoCppParser64d PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_x64_vs110.vcxproj.filters b/CppParser/CppParser_x64_vs110.vcxproj.filters index 02147a0b0..f60d52976 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj.filters +++ b/CppParser/CppParser_x64_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {bebfb583-cdc1-4685-a722-ecc905321e43} + {b67970ae-88cb-42d3-9a29-86ddae5af3f9} - {eb735478-caed-4c26-abda-f4a9e38c25cc} + {81016236-b836-43f5-a1e3-91e2660d3458} - {423ba04a-94ee-49c7-9034-ebe5eae4cf0e} + {23ea0ac5-a548-4a79-a226-d087c0e12b58} - {c658dd43-88d4-44fe-8c81-300b2ee720f5} + {753f0972-dd37-419e-811a-66f09e90624d} - {dc8cd7c6-5ee9-4036-9421-ed475b36e1a9} + {6581798a-bb6f-42b8-b742-5e698cccae22} - {92c95ba9-7295-4f70-be26-a32af2a7bdda} + {173b74f2-e786-424b-ba34-e1708d49c7da} - {de11323c-afe0-465c-a8e3-860a46b2575f} + {c6e08665-af75-4f20-a81b-3a10ce8fc6ad} - {e98a7207-4503-4c2f-9ca8-6a9c3c2f295f} + {9534bd03-3b81-4ca9-bb4d-5c11a9f2d2cc} - {64231620-bdb7-4913-bafc-46a72fb5e367} + {e2086eea-21f7-4b6f-b2e8-227847fd8fbd} diff --git a/CppParser/CppParser_x64_vs120.vcxproj.filters b/CppParser/CppParser_x64_vs120.vcxproj.filters index 572afc106..20621defe 100644 --- a/CppParser/CppParser_x64_vs120.vcxproj.filters +++ b/CppParser/CppParser_x64_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {ea72e1d4-510d-41d4-8f20-4d5fdefb3c86} + {cf39614f-e54c-4665-8403-fd1c818700a9} - {048eba57-2918-412d-9361-af650ff315c3} + {7fa40b2b-2660-4da8-b71c-4ed9d8b0c931} - {64d80b79-8a06-4f07-8181-e0a0a1461f45} + {88c21f24-b449-41af-8693-f571bb2b9f60} - {6791fb01-e24f-4e75-a906-7112eebfeddd} + {cf25fd71-a42c-4e5e-a5d0-82445b676db4} - {73b88747-5284-493a-a6fe-a01d404c088f} + {a59d6ded-69aa-4e56-abbb-e9cdb4f96a20} - {59439be2-4f72-44cf-b0f0-b8c103e30d69} + {1733c477-4c54-4991-8282-074671acac72} - {470ba159-b459-42d5-937d-1d654b40b7e3} + {a853a432-0de4-4de3-bdc3-f2649f0e9d07} - {e7747dde-49cb-4c22-b0b4-fc234d4f1468} + {396ea917-131a-4ceb-a1c4-68c8ec24bf7e} - {e02057fe-a4c9-4f64-9a56-f72f400f1afd} + {399c47eb-66b6-4bbf-9047-c0d111eff5ec} diff --git a/CppParser/CppParser_x64_vs140.vcxproj b/CppParser/CppParser_x64_vs140.vcxproj index 534cd60f3..e7dcfe2b4 100644 --- a/CppParser/CppParser_x64_vs140.vcxproj +++ b/CppParser/CppParser_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoCppParser64d PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_x64_vs140.vcxproj.filters b/CppParser/CppParser_x64_vs140.vcxproj.filters index 616d7ba57..bde64b4af 100644 --- a/CppParser/CppParser_x64_vs140.vcxproj.filters +++ b/CppParser/CppParser_x64_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {78d3a23b-b22d-4c91-878e-d1c451965063} + {ba7a771e-76c6-4f3f-b809-99a2bc4dd4c2} - {fb4beed2-f8ff-47dc-9b48-fc36af447520} + {d91ffdcb-400f-4a0c-aeb6-3586afeeb30e} - {b4a75d10-431d-4d92-bb3b-73e15649a5b0} + {3130d802-06fc-437e-afe4-dd7827e70528} - {8415a498-a3fd-4958-b580-1b15d700b61f} + {5f8a6985-c457-418f-a3b4-47e6e0586b0e} - {6f5e56f0-b220-45f4-8329-41e9175ffb47} + {02bf932c-57a8-4321-8346-e0789f568488} - {ab599e59-7863-41f5-9cb8-4a1ce3fc31a0} + {cf20ad15-775d-4f0e-aef3-059cb8f2c192} - {c34f76c4-780f-46ea-9cf8-f37e32097fbd} + {fc23fc43-f0c0-4671-89be-14fb737b18a3} - {95f7a99e-8537-487f-acea-4d3b71722d38} + {bf5c728e-c0e9-44e2-89ab-0321d5762469} - {37970278-9bf2-4685-910d-a04c8480d8e4} + {df4401f3-4a2e-4aed-8dec-88b8ce75a488} diff --git a/CppParser/CppParser_x64_vs150.vcxproj b/CppParser/CppParser_x64_vs150.vcxproj index 7fc1d6e59..4a298bf5d 100644 --- a/CppParser/CppParser_x64_vs150.vcxproj +++ b/CppParser/CppParser_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoCppParser64d PocoCppParsermdd PocoCppParsermtd diff --git a/CppParser/CppParser_x64_vs150.vcxproj.filters b/CppParser/CppParser_x64_vs150.vcxproj.filters index 616d7ba57..c4dcffc8c 100644 --- a/CppParser/CppParser_x64_vs150.vcxproj.filters +++ b/CppParser/CppParser_x64_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {78d3a23b-b22d-4c91-878e-d1c451965063} + {78c28e04-25f8-4ab4-971b-92f2a32fa68f} - {fb4beed2-f8ff-47dc-9b48-fc36af447520} + {187fb0ba-6650-4656-b0b8-994801914bbb} - {b4a75d10-431d-4d92-bb3b-73e15649a5b0} + {712a514f-4d45-440a-b3dc-ec39a23fc967} - {8415a498-a3fd-4958-b580-1b15d700b61f} + {40349073-db77-4396-98ad-4dfb275c62b9} - {6f5e56f0-b220-45f4-8329-41e9175ffb47} + {226ef096-8e48-4cab-be75-690cabfed8e6} - {ab599e59-7863-41f5-9cb8-4a1ce3fc31a0} + {7a61c8d0-1001-420f-9623-dd6a153703d5} - {c34f76c4-780f-46ea-9cf8-f37e32097fbd} + {f036e4c3-3f08-491a-b79a-03e1454cb2db} - {95f7a99e-8537-487f-acea-4d3b71722d38} + {1cb4f22e-9342-4a0f-8275-235e2b8b82c5} - {37970278-9bf2-4685-910d-a04c8480d8e4} + {063b864d-f218-46b8-a270-127ab690d8d4} diff --git a/CppParser/testsuite/TestSuite_CE_vs90.vcproj b/CppParser/testsuite/TestSuite_CE_vs90.vcproj index 818595e5d..d4ed89548 100644 --- a/CppParser/testsuite/TestSuite_CE_vs90.vcproj +++ b/CppParser/testsuite/TestSuite_CE_vs90.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;" StringPooling="true" MinimalRebuild="false" @@ -56,7 +56,7 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +320,7 @@ - + diff --git a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters index a77974173..558ed4139 100644 --- a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,37 +2,37 @@ - {b88b831a-72d3-40cc-8164-f951fb438490} + {12525684-4e3b-4f46-af7b-08935724f322} - {2b254d41-cecb-43dc-8935-a188ea6b0969} + {dfa870e9-8223-430a-b2da-fb6c18fbcf00} - {00b2f39b-606e-4bfb-8556-cfa66c07861d} + {49de42d9-0b63-45af-b123-01179fa05ba4} - {afe17afa-b403-4e8a-8c2e-721ae1325695} + {7bc41ad3-9d4f-45b1-a0db-a28f11ec9614} - {7dd2942f-1090-4be3-a680-7d8d918d11da} + {98afe064-74cb-49fe-aa8f-5862c7e39c16} - {be7833a3-c2a0-4824-afa3-240c62dfb3b1} + {a4cc9f15-a263-4315-89eb-4791d94b2a3a} - {c8012bc4-54d1-431d-9742-69947f25048b} + {626eac99-adb6-4912-aca7-f5b65054745d} - {7c3583ad-2be2-40de-ab0f-1d32d876c298} + {c0deff20-ecc8-438a-9991-582541a73a28} - {f43097ad-fe8c-4206-a258-3cc1bcee8801} + {c8f7a51d-3179-4c21-8983-56a300b9932c} - {3f2b5f13-132b-4429-9e8e-cd1ed3e7cd71} + {4a8249b4-3b5c-4e9e-9549-bb9b5c573aee} - {a5cfd9a6-8360-43df-b8ef-165e197d3ffc} + {7e063fe3-0f77-4ae6-b04e-697f4eecd9d2} @@ -56,7 +56,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj b/CppParser/testsuite/TestSuite_vs110.vcxproj index 0049a325c..d8663cd26 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +314,7 @@ - + diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters index aa9f354bf..211365a6d 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,37 +2,37 @@ - {204ca4fe-87da-44e7-9893-347a5e2569a2} + {31204117-5493-45fd-9845-fa8c470d0047} - {2cc28402-10e5-4849-82bf-60ac77fba28d} + {27658e81-5c18-4ec3-9fde-1ededdff34e1} - {a794ab9f-430a-419c-9f3f-0c8ab3bdc159} + {d426c76a-c133-46f8-8275-158a652fb98a} - {c70af72c-11d0-4a1f-a015-004418d51a2e} + {f97caf6d-40c1-4e73-a817-090789cc90fe} - {7fc90293-17ae-4676-a57e-e9a7cc109825} + {3776a08e-ab13-46f8-bd94-d28eb38dd884} - {2eb425c0-fec8-4f7c-9b4b-9b5ffbf5052d} + {2736152c-29d7-4526-8cda-27d9cc9fec9f} - {56eeb4a7-5172-4ef1-a992-3f4b8300ca31} + {13ae5a5b-0173-41d0-89f4-98081b39e300} - {ebc99eec-9998-464c-8193-efd217c359b3} + {3a75fcad-c9b6-4d68-80bb-3b586c883fe8} - {81b05b59-8e31-463c-8348-4f0d0bce1fb9} + {6cd323ee-f31e-494f-ba07-a5182d945e91} - {fcd6a4cf-b44b-49e0-b241-257e5b5750a0} + {90b38fb2-6b13-4462-b235-2c7a42958ee7} - {21a76ef5-09f6-4263-8420-94bad3a8bc1a} + {dd73cc9d-f3cd-4508-87f5-6373c2abdde3} @@ -56,7 +56,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj b/CppParser/testsuite/TestSuite_vs120.vcxproj index 7fafb4d0a..8d37db440 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters index 1d4ef9246..382a2b6a9 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,37 +2,37 @@ - {e2921822-fea0-4890-9c91-f13a995da4a0} + {fa030816-76c1-4cba-82ab-02de8a24ca2c} - {d5785efb-b71a-47a2-9ead-536f00c3c3bb} + {3a928e5e-8709-4272-aecf-28c74a91a766} - {0db53ff3-95f2-400f-9f67-e2baeebd8957} + {5f73425d-aebe-4616-8dfe-a0a891abab32} - {c98a7857-10bf-4177-84f8-d040b0df7616} + {5247bd7c-eee1-42ed-97be-2c9801ee8758} - {ac6373e2-a8c6-440c-b9a7-b2c2791c98de} + {f818596a-5858-4d27-88e8-6295ce9f4a85} - {da297de5-da2f-4b8c-9c31-314a35cf1b43} + {57f15327-55c0-4d6a-8191-1cc6d15e6fcb} - {69c247af-c4c9-4fa1-8e13-64a741961eca} + {532d9c91-5465-4740-abea-e4cd3c1de246} - {bb041b9e-7c19-45b3-b313-7e2e183adb5d} + {b396d7eb-4389-44b0-a2ee-1853582e18cf} - {205986f8-2032-4a7d-b5fb-72188f06af15} + {572c427d-02de-42f6-9ab4-81f850667829} - {8cf44d5a-23bd-4dee-b52e-05946e6f320e} + {7821b69c-a7bb-47c2-82f3-7262e3e9ae8c} - {cb8fdd6d-553c-4936-8cec-670018b336ad} + {3a5b95a6-7271-44c0-8cf6-34ebe0be04cc} diff --git a/CppParser/testsuite/TestSuite_vs140.vcxproj b/CppParser/testsuite/TestSuite_vs140.vcxproj index 6bf7264f1..c87d130c5 100644 --- a/CppParser/testsuite/TestSuite_vs140.vcxproj +++ b/CppParser/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs140.vcxproj.filters b/CppParser/testsuite/TestSuite_vs140.vcxproj.filters index 294f1eb38..6dad707e1 100644 --- a/CppParser/testsuite/TestSuite_vs140.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,37 +2,37 @@ - {df9f7a3a-db0c-41bc-8255-78b66ef7d418} + {cf45e2eb-4521-4be4-a5ec-b0e433cb577f} - {252c7d00-a717-4fae-99cd-af337f50e0bb} + {94e5bd07-914e-46c2-82df-ee5abccc7074} - {199510e7-467f-4066-9a6a-384570984bca} + {0bf7a40d-187a-47fa-b58e-4b5bdf73b527} - {f06e5f72-9754-48ff-abe6-7b270265aa45} + {479fe752-9ed2-4514-ac00-9cce1f5f3991} - {10328465-3a09-4f8e-8302-9e5fe2a075c9} + {7bf60f5c-57d4-42bc-aeb2-1e0c2aa8fee5} - {f06a1733-b2c7-416c-965c-fc14a3a13d54} + {aa937c24-c553-415b-b78a-c9f32e9e8140} - {ba3d920b-293d-421a-b1a8-7e0f81eeef14} + {1fa9e911-a7a0-45a0-809a-1a4bd8b789d6} - {a7b974ec-3169-442a-ad1c-f38e4df7a549} + {8b13c9b8-bcad-4100-8661-c5dc78a60ae6} - {dc08c24f-063f-4d71-9cd2-4b7bd2a1f785} + {f0673a6f-919d-42ef-80c9-3588daf07ee2} - {6fe9b21f-e45e-4217-b31e-07fa99cec588} + {afd810cd-5ccf-46a3-b6f8-7cd169d47796} - {bf215f99-cb39-46f4-8751-f2dd96c5dadf} + {18f749fd-c462-418b-a5ff-550e95026bd9} diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj b/CppParser/testsuite/TestSuite_vs150.vcxproj index 6f9eccc2d..3e6c6c25f 100644 --- a/CppParser/testsuite/TestSuite_vs150.vcxproj +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters index d533408dd..18a0244e9 100644 --- a/CppParser/testsuite/TestSuite_vs150.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,37 +2,37 @@ - {ee799fab-54f7-4194-809b-cd47ec52a408} + {bd9026ce-be93-4974-9d7e-9f94cfd91884} - {308b8447-0873-48bf-8f1c-29aae47d1858} + {a17b3dad-a785-488f-a79c-6d1d8e4befb6} - {4c035fdc-3541-4a9f-ba6f-866e31853c97} + {a5052ae4-90e9-4b39-b9b7-b7d205533939} - {d55b1714-4611-4b84-8cd2-9ceafa922553} + {a390ba4f-12e5-49bb-8109-af6c77cf6ee4} - {d4053973-3447-451a-8f5a-98bcbb7dd071} + {ea9daa19-202f-4e72-815f-c0ea12fb8276} - {a7c9d942-9d22-4b76-9c9b-8217cc9e4b51} + {da6604d5-94b8-4087-99f6-2875533bc122} - {71ff2b43-0dde-4c6a-a454-29b457372283} + {25a94f4f-e0d5-45ae-843c-067eefa64de3} - {def8b2b9-34fa-496c-8f94-48c0a315d2a7} + {3c67425f-f9d5-482f-b2f4-377d80114515} - {18a465c7-74e6-453c-981e-556d46a39c7d} + {cbae641e-67a9-4070-847d-7f643076375b} - {2d84ac78-d016-4de8-bf27-99fc7e7fbbd6} + {68d29e25-6f90-487a-9cfa-56220e1ee925} - {d6d6bd24-74f3-4e8d-8936-c66f2ea9ef8b} + {5a705ccd-a18e-4004-9588-303c83b0c0d9} diff --git a/CppParser/testsuite/TestSuite_vs90.vcproj b/CppParser/testsuite/TestSuite_vs90.vcproj index 8b3bf38b1..d4a339a23 100644 --- a/CppParser/testsuite/TestSuite_vs90.vcproj +++ b/CppParser/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +320,7 @@ - + diff --git a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters index 14eb853ef..a52d573a0 100644 --- a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,37 +2,37 @@ - {aff01f05-eb3d-4481-a60f-992fccbb416b} + {317cef4e-52a4-45ba-b01d-21aa85dbf662} - {fb1fb0fb-17c8-4801-92b4-2ff777ca2552} + {0dcd625b-d1ac-4b15-a7e4-6e22a4fc0728} - {56dde612-c0a4-4e4c-86aa-09c03d1a88cc} + {7c6dd3ed-e2ce-494e-8f5c-f50bbe52bf37} - {7d6ad93d-ff6a-4eb0-aba2-8b2a2ae0c2e6} + {a1007277-9c86-402d-a434-29f56c5de503} - {2f129c67-e548-430d-b978-ec3526dfe218} + {eec64439-a2bd-49a2-8d56-f006c9ee12ba} - {d4081f8a-9ef3-4f5e-881c-5c894a0a693d} + {1fc7cb63-9594-40df-a64f-fb76fc670438} - {434a1177-390b-4b65-8be6-a3c4fcb6561f} + {af131a8b-2543-49bd-9049-8aaedb8f056e} - {43c271f7-faac-4b24-a042-0d5cb0c62c23} + {e33249e6-bcfa-4896-bcb4-62c321b78b4c} - {cbe05a84-5f6f-4d4a-94c4-510aee8b1d89} + {76e27865-a1a8-4038-8f0a-51ca00aca43a} - {3e786243-822b-47c1-9233-d866881164f2} + {198d4414-402d-4dcd-8e66-8a78ce046001} - {b8f7b1c2-6042-40b7-8dfa-962742ec04c3} + {c7ba0d9a-6b08-488a-a09a-c64b6d9b7e06} @@ -56,7 +56,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj index 90cfe8821..ed8a29ef3 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +314,7 @@ - + diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters index 71b3851f2..88db7cac9 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,37 +2,37 @@ - {777134c0-4b44-44db-83b0-ed6be9283236} + {ae20d8de-c0ba-4878-baf6-8046bcd1a984} - {624c69f1-c204-4171-b5cd-db9fe51d1f9e} + {ba1a9ffc-2327-4368-9af2-a73a5a93b111} - {22f6e07b-7880-4c19-b385-3dddb9dcbdd9} + {47c73566-518b-4ae7-a566-e881267edc2b} - {e207e699-4234-4d97-b438-5a6d17dc5f6e} + {283921fb-392d-4da8-82db-76589f379246} - {839eca5e-9bc5-419f-8543-d2d532dd47ec} + {edc3296b-0f2a-4871-ae40-c085cf0c4dc4} - {1e18b0d8-ff08-43c7-a228-49821e349cb7} + {efe991f8-30f9-4029-9f7b-6056eca4d2cb} - {fe5ac07b-7e29-45d8-b9ee-7e1861919b0b} + {6006fef9-c607-4d0d-9e9c-afda48861bea} - {daec52af-ba05-48d5-af68-d82f6a4a2419} + {85af86e3-5ece-44bf-99c5-47bf8de34baf} - {f2423503-a315-45f9-92a9-535d6b258761} + {1ce69f68-b503-4c4c-85fc-66693b1f1060} - {2c5a4c46-3e2f-4a80-bef5-8a0f57debfde} + {9687d5d6-4ce9-4914-ba47-c732b5f1989b} - {b2548d0e-dd8f-455e-b864-e2679ba5d446} + {75274cc8-35e7-4530-b2e0-944f838196a8} @@ -56,7 +56,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj index 0601c7ede..2f0a4fa79 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters index c77b7533b..bb48ed2ef 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,37 +2,37 @@ - {302fbea1-3041-4539-8049-0004d2d89351} + {d10dae84-f59f-4849-9969-4bef048d95b0} - {73705a8f-880f-407b-a1f4-782c1dddad10} + {1692ebb1-1648-4fb5-af36-aecec6ead337} - {bf8a41e7-4f3a-4bb3-80e9-b83786749b96} + {ad5f7657-0408-4610-a9aa-8f3eb8a6117c} - {71ebece0-0f0f-4dd7-8b99-ae2334ca01c3} + {9aadd6f1-b1fa-4ca1-a23f-9511ab4049a7} - {93114513-7fe1-4c68-ad79-3f3d5a72a743} + {8af6ade5-2c51-4a28-902a-a0b6ada9d60a} - {53c6ed73-8643-4a39-b088-54be70b7d968} + {674b1f23-d356-412c-9d3c-7f576f0c8094} - {e825b3d8-1afc-43c2-a607-b465f63a29f6} + {9297bb9c-e75f-4334-b3d7-cd8dd0d5b2f3} - {23f99694-9415-49ae-9541-a2d54960732c} + {cd5a025d-8bc4-424f-9e5e-fcf9860ecf1f} - {f655b1ab-287c-47e2-b23d-bb6f9035b513} + {292bb15e-2afe-4a2b-b7e8-065daca05e78} - {2e75c8c7-382c-4c3c-8989-06d5f7fb430e} + {ff59f28a-0e74-464b-a5ae-5bc1bbd09cd8} - {36c88e55-34c3-40bb-ae1c-c88583e293b8} + {b0c16590-2be9-4270-8c08-74d144dff493} diff --git a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj index a619fe350..50c81648e 100644 --- a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters index dbc51eabd..4f9445fd3 100644 --- a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,37 +2,37 @@ - {ff85271e-bdba-44da-ac86-376359cab212} + {ec486185-12dd-4cdc-a393-7e61032f8d7e} - {aae373fd-5e7d-4434-bb3d-f0734295b31e} + {4f7c8842-74b8-495f-aa31-b0b8ba576b37} - {28ae3171-89b5-4a66-a79d-d71e95e572a3} + {7552bb24-7f6a-407d-ac98-2cec0df4894f} - {87c045ea-7c5a-4217-b0fe-1c56bc34a9cb} + {ede5dccf-6c1f-4f30-a938-49fcd1a492ac} - {4cd39d39-3380-43c3-8d00-25a8ca16d671} + {0fb7fc50-4bd5-4cc9-ab46-fdc84b88080f} - {2229b7c2-2b79-4a5b-a4e6-6be50cebe005} + {a28a0f56-77bf-4eb5-af7d-bf8a5469c166} - {de8c9f30-d413-4fe3-95c7-345d88fcb9f4} + {403a9f20-ae3a-47ac-a73f-25545a343670} - {f8b37363-c67e-4d80-9253-c4b02dbdfadf} + {82bb008c-40b7-4f85-889f-66a00335d85a} - {c7331ad4-9625-4f54-b922-48922814497e} + {dbb04a6e-3817-4b95-8da3-e1f448e2f57e} - {261ccbb3-02fd-4b79-8094-2958aa8c2668} + {41f605b8-a256-4d9b-875c-c3e473afecf6} - {e10f5c55-bcd6-4d3b-8bff-284347e3a620} + {9e7c6fb7-847d-436e-9e29-3e408efdb6b5} diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj index 6858195b9..e129cc49f 100644 --- a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters index fabc659c0..7ea305d77 100644 --- a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,37 +2,37 @@ - {cc79aa29-98f2-414c-960e-89221cd279c2} + {0f88bcde-5b08-45a4-8f5e-20c74793c04c} - {f77498ac-4f16-45d4-ab05-a0ad3aaba5e4} + {95a00fea-8391-4808-8bbc-b8ebc7656950} - {0eb412d3-2eb9-4cd2-85a1-c24a1ed83437} + {fbcb37da-495e-49bc-a21d-b6988346feaa} - {cbdc2027-1d0f-40a7-86f9-483819c97ffa} + {ef0109d9-f0bb-493f-b6f8-bd12cd8c774f} - {5325f8c2-3452-48ef-9195-ae389c264bd7} + {baedb689-2f84-477f-901f-a72fc40aaa4c} - {fd666013-a945-45f1-8d28-5c2e21f225d9} + {62b91e00-bd26-4e4c-bebf-4ad5618089e2} - {2d4aa099-9593-4b80-82e2-cea91c05a04e} + {f16982c1-6832-4dc9-ba25-174b9b894f1c} - {c6e8848c-189e-4ff3-a791-fe365584ed6c} + {7bf3a84d-3848-4d6c-a07e-038efdec63ea} - {e6c12bbf-1bde-49f7-ba44-3086b14d163f} + {a05fcc7a-6275-43f2-a25e-c7ef7bcb5b43} - {558d50d1-ee97-44d2-8c6b-d68ab529b550} + {f4be8a8e-93a4-48e0-809a-73da57b44a20} - {f655eaf7-7066-4fb9-bc47-a36b57ca3a6e} + {0af612cc-a7b6-4df7-85c4-623cdc49d142} diff --git a/CppParser/testsuite/TestSuite_x64_vs90.vcproj b/CppParser/testsuite/TestSuite_x64_vs90.vcproj index 1b8a147e0..261f7e464 100644 --- a/CppParser/testsuite/TestSuite_x64_vs90.vcproj +++ b/CppParser/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - {2394511f-f081-4d52-b80d-5f646626fc3f} + {5068bf7a-e3f9-4b5b-81a6-bf6c73715c19} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {351f7c01-0e0c-4167-8ec0-6792fefc36ce} + {bdf568a1-2f3b-4ee0-ba60-f453c50a1977} *.h diff --git a/CppUnit/CppUnit_WEC2013_vs120.sln b/CppUnit/CppUnit_WEC2013_vs120.sln index cb67e48e2..8612f9c6b 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.sln +++ b/CppUnit/CppUnit_WEC2013_vs120.sln @@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_WEC2013_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_WEC2013_vs120.vcxproj", "{505010B7-46C7-44BA-9F9D-E77429AF5CB9}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|SDK_AM335X_SK_WEC2013_V310 = debug_shared|SDK_AM335X_SK_WEC2013_V310 @@ -35,24 +30,6 @@ Global {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_shared|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_static_mt|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = debug_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|SDK_AM335X_SK_WEC2013_V310.ActiveCfg = release_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Build.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|SDK_AM335X_SK_WEC2013_V310.Deploy.0 = release_static_md|SDK_AM335X_SK_WEC2013_V310 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters index 1b084ff2e..43a156fd8 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {4c6266f1-ace1-401a-93d7-18dbefca221f} + {7ff65f52-aacb-41be-a14f-08e3abe42247} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {c6007af6-4f94-4f80-ae94-284beaa03c44} + {402d14bd-2120-42c2-bcdd-1f2e1d3e77cd} *.h diff --git a/CppUnit/CppUnit_vs100.sln b/CppUnit/CppUnit_vs100.sln index c6a009fbf..313cea3d7 100644 --- a/CppUnit/CppUnit_vs100.sln +++ b/CppUnit/CppUnit_vs100.sln @@ -2,57 +2,34 @@ Microsoft Visual Studio Solution File, Format Version 11.00 # Visual Studio 2010 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs100.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs100.vcxproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs100.vcxproj.filters b/CppUnit/CppUnit_vs100.vcxproj.filters index eee843f07..119b02977 100644 --- a/CppUnit/CppUnit_vs100.vcxproj.filters +++ b/CppUnit/CppUnit_vs100.vcxproj.filters @@ -2,11 +2,11 @@ - {30dc4b5f-90b7-4f5c-a16c-9150bb3d6773} + {c1387c65-ac26-4385-bc07-a168aceff7dd} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {96838cf8-7fc5-47fb-98fc-1c7080088769} + {e9bba7e5-dbf4-476e-9045-ec955d7fd638} *.h diff --git a/CppUnit/CppUnit_vs110.sln b/CppUnit/CppUnit_vs110.sln index 502f233bc..2965505a2 100644 --- a/CppUnit/CppUnit_vs110.sln +++ b/CppUnit/CppUnit_vs110.sln @@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs110.vcxproj", "{505010B7-46C7-44BA-9F9D-E77429AF5CB9}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 @@ -35,24 +30,6 @@ Global {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|Win32.Build.0 = release_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs110.vcxproj.filters b/CppUnit/CppUnit_vs110.vcxproj.filters index 2f34a7da7..f10f81f9a 100644 --- a/CppUnit/CppUnit_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {7870bd4e-ae4f-45a2-9bdc-d169ceb1b455} + {dc6bdd9f-52ec-4d7a-b5ac-3e937dc94b79} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {63e29ad0-db23-4388-828e-8a99fff9f02b} + {01ac17bd-90ef-4154-a30a-968ae65c19fe} *.h diff --git a/CppUnit/CppUnit_vs120.sln b/CppUnit/CppUnit_vs120.sln index b4c660883..47ec8aa03 100644 --- a/CppUnit/CppUnit_vs120.sln +++ b/CppUnit/CppUnit_vs120.sln @@ -1,37 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs120.vcxproj.filters b/CppUnit/CppUnit_vs120.vcxproj.filters index 467aa08ff..a2d754c4c 100644 --- a/CppUnit/CppUnit_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {2c651ecb-fe7f-4e42-9040-6b550cb8b42e} + {9bedd994-f514-4478-a961-61d76b24983d} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {44e49fd9-1f0e-4687-8df9-316d153c132b} + {4df2bafe-a87c-46c6-9b2b-fbedbb52a416} *.h diff --git a/CppUnit/CppUnit_vs140.sln b/CppUnit/CppUnit_vs140.sln index df275b813..8be65794f 100644 --- a/CppUnit/CppUnit_vs140.sln +++ b/CppUnit/CppUnit_vs140.sln @@ -1,37 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs140.vcxproj.filters b/CppUnit/CppUnit_vs140.vcxproj.filters index ed13b892b..ae1df4716 100644 --- a/CppUnit/CppUnit_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {62f3cdd6-6cb4-408a-879c-df5282693ab4} + {5e0763e0-80b2-4c07-99ca-adb783b8ef87} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {8575f3e9-3020-4484-8abf-b48d6dde4cc2} + {4ca676c2-95bb-4610-87a7-559295f0c313} *.h diff --git a/CppUnit/CppUnit_vs150.sln b/CppUnit/CppUnit_vs150.sln index cefb260cd..af77591ad 100644 --- a/CppUnit/CppUnit_vs150.sln +++ b/CppUnit/CppUnit_vs150.sln @@ -1,42 +1,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2018 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2017 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs150.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {4ED47665-6C28-42C6-A97F-9A7CEE621536} - EndGlobalSection EndGlobal diff --git a/CppUnit/CppUnit_vs150.vcxproj.filters b/CppUnit/CppUnit_vs150.vcxproj.filters index 148276012..4cf16f85d 100644 --- a/CppUnit/CppUnit_vs150.vcxproj.filters +++ b/CppUnit/CppUnit_vs150.vcxproj.filters @@ -2,11 +2,11 @@ - {880b0f09-2d85-4884-b001-d9766311c923} + {ea13b8c9-03c8-4651-8d7b-f5ac04f481cf} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {c395bad3-a79c-4134-868b-a2b8d09ed91a} + {3bb62e45-30ce-4ff7-ab69-684fe0460244} *.h diff --git a/CppUnit/CppUnit_vs90.sln b/CppUnit/CppUnit_vs90.sln index b31562510..b1717ae06 100644 --- a/CppUnit/CppUnit_vs90.sln +++ b/CppUnit/CppUnit_vs90.sln @@ -2,57 +2,34 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_vs90.vcproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_vs90.vcproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Build.0 = debug_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.ActiveCfg = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Build.0 = release_shared|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Build.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_vs90.vcproj b/CppUnit/CppUnit_vs90.vcproj index e806ceb7f..53464f68c 100644 --- a/CppUnit/CppUnit_vs90.vcproj +++ b/CppUnit/CppUnit_vs90.vcproj @@ -31,8 +31,8 @@ - {9af5e0fc-8331-4621-9a06-49f172e7a7e8} + {b27f67de-af6f-4c4e-b126-877d373bc66b} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {8403ff69-3986-4596-a994-09038f1f7c1d} + {2dcafb5d-0650-44a9-aaee-b4b717d80180} *.h diff --git a/CppUnit/CppUnit_x64_vs110.sln b/CppUnit/CppUnit_x64_vs110.sln index c2b17b8d3..9cb622c68 100644 --- a/CppUnit/CppUnit_x64_vs110.sln +++ b/CppUnit/CppUnit_x64_vs110.sln @@ -2,11 +2,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2012 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs110.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs110.vcxproj", "{505010B7-46C7-44BA-9F9D-E77429AF5CB9}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 @@ -35,24 +30,6 @@ Global {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|x64.Build.0 = debug_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|x64.ActiveCfg = release_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|x64.Build.0 = release_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_shared|x64.Deploy.0 = release_shared|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|x64.Build.0 = release_static_md|x64 - {505010B7-46C7-44BA-9F9D-E77429AF5CB9}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj.filters b/CppUnit/CppUnit_x64_vs110.vcxproj.filters index 7fe1445b6..4312f2f8d 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {9dd3175c-4127-4740-bf6c-8259309025f7} + {f848470e-6c13-4424-a4bd-64c8235ac88a} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {879aaa1e-72a8-4849-a691-f66047f48473} + {4edfde9d-f960-4343-9c8c-78334d60fab2} *.h diff --git a/CppUnit/CppUnit_x64_vs120.sln b/CppUnit/CppUnit_x64_vs120.sln index 51007bb07..3599dbf7c 100644 --- a/CppUnit/CppUnit_x64_vs120.sln +++ b/CppUnit/CppUnit_x64_vs120.sln @@ -1,37 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2013 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs120.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj.filters b/CppUnit/CppUnit_x64_vs120.vcxproj.filters index 38f58003d..31a7be9f0 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {e89d7e49-ef5f-488e-9cf7-f2a7703baf04} + {f05a4ed2-2720-4c63-b6e2-0e0fc1c9547b} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {2ffd6844-8f7e-477f-aa41-20f88fcbe44f} + {5c594ed2-ab6c-41b1-8def-b77591e54dfa} *.h diff --git a/CppUnit/CppUnit_x64_vs140.sln b/CppUnit/CppUnit_x64_vs140.sln index bc7c0a8ba..0f5939572 100644 --- a/CppUnit/CppUnit_x64_vs140.sln +++ b/CppUnit/CppUnit_x64_vs140.sln @@ -1,37 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs140.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj.filters b/CppUnit/CppUnit_x64_vs140.vcxproj.filters index 7968b9b3b..0b544f612 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {1ef3bcd0-adae-4cd3-b96f-5ccd568d7866} + {38b4f1a7-f6c4-456a-ba2b-669fcb2d8c1e} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {51ddb147-fb9f-4b6d-924e-5880cd9202b4} + {44179780-6c7b-40ce-9087-348dcb717cad} *.h diff --git a/CppUnit/CppUnit_x64_vs150.sln b/CppUnit/CppUnit_x64_vs150.sln index 618586848..19a3766f4 100644 --- a/CppUnit/CppUnit_x64_vs150.sln +++ b/CppUnit/CppUnit_x64_vs150.sln @@ -1,42 +1,37 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27703.2018 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2017 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs150.vcxproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {EFF49D37-FDE6-46E0-A7FB-580870E620FD} - EndGlobalSection EndGlobal diff --git a/CppUnit/CppUnit_x64_vs150.vcxproj.filters b/CppUnit/CppUnit_x64_vs150.vcxproj.filters index 54b6480c5..b671c5a45 100644 --- a/CppUnit/CppUnit_x64_vs150.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs150.vcxproj.filters @@ -2,11 +2,11 @@ - {0541cac9-e546-4a01-976b-9ca20ea1670e} + {02e6adf3-c6ba-40fa-ab87-b1c0d2cf0710} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {3ca3ec84-b393-4783-8381-4e4734951739} + {970a5156-f1e4-4bb7-91b1-01a85cde02f3} *.h diff --git a/CppUnit/CppUnit_x64_vs90.sln b/CppUnit/CppUnit_x64_vs90.sln index d533770b5..e3e631ad1 100644 --- a/CppUnit/CppUnit_x64_vs90.sln +++ b/CppUnit/CppUnit_x64_vs90.sln @@ -2,57 +2,34 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CppUnit", "CppUnit_x64_vs90.vcproj", "{138BB448-808A-4FE5-A66D-78D1F8770F59}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WinTestRunner", "WinTestRunner\WinTestRunner_x64_vs90.vcproj", "{BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}" - ProjectSection(ProjectDependencies) = postProject - {138BB448-808A-4FE5-A66D-78D1F8770F59} = {138BB448-808A-4FE5-A66D-78D1F8770F59} - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.ActiveCfg = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Build.0 = debug_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.ActiveCfg = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Build.0 = release_shared|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_shared|x64.Deploy.0 = release_shared|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 - {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Build.0 = release_static_mt|x64 {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Build.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.ActiveCfg = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Build.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_shared|x64.Deploy.0 = release_shared|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Build.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Build.0 = release_static_md|x64 + {138BB448-808A-4FE5-A66D-78D1F8770F59}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/CppUnit/WinTestRunner/CMakeLists.txt b/CppUnit/WinTestRunner/CMakeLists.txt deleted file mode 100644 index c48b98e77..000000000 --- a/CppUnit/WinTestRunner/CMakeLists.txt +++ /dev/null @@ -1,36 +0,0 @@ -# Sources -file(GLOB SRCS_G "src/*.cpp") -POCO_SOURCES_AUTO( WIN_SRCS ${SRCS_G}) - -# Headers -file(GLOB_RECURSE HDRS_G "include/*.h" ) -POCO_HEADERS_AUTO( WIN_SRCS ${HDRS_G}) - -file(GLOB_RECURSE HDRS_G "src/*.h" ) -POCO_HEADERS_AUTO( WIN_SRCS ${HDRS_G}) - -add_library(WinTestRunner ${WIN_SRCS} ) -set_target_properties(WinTestRunner - PROPERTIES - VERSION "1" SOVERSION "1" - DEFINE_SYMBOL WinTestRunner_EXPORTS) -target_link_libraries(WinTestRunner PUBLIC CppUnit) -target_include_directories(WinTestRunner - PUBLIC - $ - $ - PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src - ) -# TODO: Is this flag _AFXDLL always required? -target_compile_definitions(WinTestRunner - PRIVATE - _AFXDLL - ) -#TODO: Use instead of the flag _AFXDLL above: find_package(MFC) - - -if(WIN32) - target_link_libraries(WinTestRunner PUBLIC winmm) -endif(WIN32) - - diff --git a/CppUnit/WinTestRunner/WinTestRunner.progen b/CppUnit/WinTestRunner/WinTestRunner.progen deleted file mode 100644 index 9d4842162..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner.progen +++ /dev/null @@ -1,16 +0,0 @@ -vc.project.guid = 505010B7-46C7-44BA-9F9D-E77429AF5CB9 -vc.project.name = WinTestRunner -vc.project.target = ${vc.project.name} -vc.project.type = library -vc.project.pocobase = ..\\.. -vc.project.outdir = ${vc.project.pocobase} -vc.project.platforms = Win32, x64, WinCE -vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md -vc.project.prototype = ${vc.project.name}_vs90.vcproj -vc.project.compiler.include = -vc.project.compiler.defines = -vc.project.compiler.defines.shared = ${vc.project.name}_EXPORTS -vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} -vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} -vc.solution.create = false -vc.solution.include = diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj deleted file mode 100644 index 8ce86a874..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj +++ /dev/null @@ -1,433 +0,0 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - - - StaticLibrary - Static - MultiByte - - - StaticLibrary - Dynamic - MultiByte - - - StaticLibrary - Dynamic - MultiByte - - - DynamicLibrary - Dynamic - MultiByte - - - DynamicLibrary - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - WinTestRunnerd - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - ..\..\bin\WinTestRunner.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib\WinTestRunner.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin\WinTestRunnerd.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - true - ..\..\bin\WinTestRunnerd.pdb - Windows - ..\..\lib\WinTestRunnerd.lib - MachineX86 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermdd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermtd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermt.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj.filters deleted file mode 100644 index 4f586ae3e..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_vs100.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {24a6f8c4-75a8-42be-afd6-586f23d02e79} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {8916ac8c-0791-483a-a494-0c7a0c9b6f8f} - *.h - - - {bcd6db0a-4bfb-4d8d-bf3b-efdbcc45d3b2} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj deleted file mode 100644 index b80d4f672..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj +++ /dev/null @@ -1,439 +0,0 @@ - - - - - debug_shared - Win32 - - - debug_static_md - Win32 - - - debug_static_mt - Win32 - - - release_shared - Win32 - - - release_static_md - Win32 - - - release_static_mt - Win32 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin\ - obj\$(Configuration)\ - false - ..\..\bin\ - obj\$(Configuration)\ - true - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - ..\..\lib\ - obj\$(Configuration)\ - WinTestRunnerd - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - ..\..\bin\WinTestRunner.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib\WinTestRunner.lib - MachineX86 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin\WinTestRunnerd.dll - true - ..\..\lib;%(AdditionalLibraryDirectories) - true - ..\..\bin\WinTestRunnerd.pdb - Windows - ..\..\lib\WinTestRunnerd.lib - MachineX86 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermdd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib\WinTestRunnermtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermtd.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib\WinTestRunnermt.lib - MachineX86 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib\ - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters deleted file mode 100644 index 4f586ae3e..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_vs110.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {24a6f8c4-75a8-42be-afd6-586f23d02e79} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {8916ac8c-0791-483a-a494-0c7a0c9b6f8f} - *.h - - - {bcd6db0a-4bfb-4d8d-bf3b-efdbcc45d3b2} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj b/CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj deleted file mode 100644 index 524dcdedb..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_vs90.vcproj +++ /dev/null @@ -1,674 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj deleted file mode 100644 index 18de91ee5..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj +++ /dev/null @@ -1,433 +0,0 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - - - StaticLibrary - Static - MultiByte - - - StaticLibrary - Dynamic - MultiByte - - - StaticLibrary - Dynamic - MultiByte - - - DynamicLibrary - Dynamic - MultiByte - - - DynamicLibrary - Dynamic - MultiByte - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\bin64\ - obj64\$(Configuration)\ - true - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - WinTestRunner64d - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - ..\..\bin64\WinTestRunner64.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib64\WinTestRunner.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin64\WinTestRunner64d.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - true - ..\..\bin64\WinTestRunner64d.pdb - Windows - ..\..\lib64\WinTestRunnerd.lib - MachineX64 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermdd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermtd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermt.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj.filters deleted file mode 100644 index a51a3912c..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs100.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {287a609c-665e-4810-863e-0737d5c606db} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e90e89b4-cc09-45a8-ac7a-2afec3ded013} - *.h - - - {30a11146-41a7-4d34-b980-7d573885cf6e} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj deleted file mode 100644 index 575038ba2..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj +++ /dev/null @@ -1,439 +0,0 @@ - - - - - debug_shared - x64 - - - debug_static_md - x64 - - - debug_static_mt - x64 - - - release_shared - x64 - - - release_static_md - x64 - - - release_static_mt - x64 - - - - WinTestRunner - {BA620CC4-0E7D-4B9D-88E2-6DBE5C51FCBD} - WinTestRunner - MFCProj - - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Static - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - StaticLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - DynamicLibrary - Dynamic - MultiByte - v110 - - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>10.0.30319.1 - ..\..\bin64\ - obj64\$(Configuration)\ - false - ..\..\bin\ - obj64\$(Configuration)\ - true - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - ..\..\lib64\ - obj64\$(Configuration)\ - WinTestRunner64d - WinTestRunnermdd - WinTestRunnermtd - WinTestRunner - WinTestRunnermd - WinTestRunnermt - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - ..\..\bin64\WinTestRunner64.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - - - Windows - ..\..\lib64\WinTestRunner.lib - MachineX64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WinTestRunner_EXPORTS;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - winmm.lib;%(AdditionalDependencies) - NotSet - ..\..\bin64\WinTestRunner64d.dll - true - ..\..\lib64;%(AdditionalLibraryDirectories) - true - ..\..\bin64\WinTestRunner64d.pdb - Windows - ..\..\lib64\WinTestRunnerd.lib - MachineX64 - - - - - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermdd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermdd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreadedDLL - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - _DEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - Disabled - Default - false - include;..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - - - - $(IntDir) - ..\..\lib64\WinTestRunnermtd.pdb - Level3 - true - ProgramDatabase - Default - false - - - _DEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermtd.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - NDEBUG;%(PreprocessorDefinitions) - true - true - Win32 - .\lib64\wintestrunner.tlb - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - include;..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;POCO_STATIC;WINVER=0x0500;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - MultiThreaded - false - true - true - true - - - - - $(IntDir) - $(IntDir)vc70.pdb - Level3 - true - Default - - - NDEBUG;%(PreprocessorDefinitions) - 0x0000 - - - ..\..\lib64\WinTestRunnermt.lib - MachineX64 - - - Copying resources... - copy "$(IntDir)$(ProjectName).res" ..\..\lib64 - - - - - - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters b/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters deleted file mode 100644 index a51a3912c..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs110.vcxproj.filters +++ /dev/null @@ -1,61 +0,0 @@ - - - - - {287a609c-665e-4810-863e-0737d5c606db} - cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - - - {e90e89b4-cc09-45a8-ac7a-2afec3ded013} - *.h - - - {30a11146-41a7-4d34-b980-7d573885cf6e} - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Include Files - - - Resource Files - - - - - Resource Files - - - \ No newline at end of file diff --git a/CppUnit/WinTestRunner/WinTestRunner_x64_vs90.vcproj b/CppUnit/WinTestRunner/WinTestRunner_x64_vs90.vcproj deleted file mode 100644 index fe7ea5262..000000000 --- a/CppUnit/WinTestRunner/WinTestRunner_x64_vs90.vcproj +++ /dev/null @@ -1,674 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/CppUnit/WinTestRunner/build.gradle b/CppUnit/WinTestRunner/build.gradle deleted file mode 100644 index c19921c99..000000000 --- a/CppUnit/WinTestRunner/build.gradle +++ /dev/null @@ -1,33 +0,0 @@ -project(":CppUnit/WinTestRunner") { - model { - components { - PocoWinTestRunner(NativeExecutableSpec) { - sources { - cpp { - source { - srcDir 'src' - include '**/*.cpp' - } - exportedHeaders { - srcDir 'include' - } - } - } - } - } - binaries { - all { - } - withType(SharedLibraryBinarySpec) { - lib project: ':CppUnit', library: 'PocoCppUnit', linkage: 'shared' - if (toolChain in VisualCpp) { - cppCompiler.define "WinTestRunner_EXPORTS" - } - } - withType(StaticLibraryBinarySpec) { - lib project: ':CppUnit', library: 'PocoCppUnit', linkage: 'static' - } - } - } -} - diff --git a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h b/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h deleted file mode 100644 index d557441cc..000000000 --- a/CppUnit/WinTestRunner/include/WinTestRunner/WinTestRunner.h +++ /dev/null @@ -1,75 +0,0 @@ -// -// WinTestRunner.h -// -// Application shell for CppUnit's TestRunner dialog. -// - - -#ifndef WinTestRunner_H_INCLUDED -#define WinTestRunner_H_INCLUDED - - -#if !defined(POCO_STATIC) -#if defined(WinTestRunner_EXPORTS) -#define WinTestRunner_API __declspec(dllexport) -#else -#define WinTestRunner_API __declspec(dllimport) -#endif -#else -#define WinTestRunner_API -#endif - - -#include "CppUnit/CppUnit.h" -#include -#include - - -namespace CppUnit { - - -class Test; - - -class WinTestRunner_API WinTestRunner -{ -public: - WinTestRunner(); - ~WinTestRunner(); - - void run(); - void addTest(Test* pTest); - -private: - std::vector _tests; -}; - - -class WinTestRunner_API WinTestRunnerApp: public CWinApp - /// A simple application class that hosts the TestRunner dialog. - /// Create a subclass and override the TestMain() method. - /// - /// WinTestRunnerApp supports a batch mode, which runs the - /// test using the standard text-based TestRunner from CppUnit. - /// To enable batch mode, start the application with the "/b" - /// or "/B" argument. Optionally, a filename may be specified - /// where the test output will be written to: "/b:" or - /// "/B:". - /// - /// When run in batch mode, the exit code of the application - /// will denote test success (0) or failure (1). -{ -public: - virtual BOOL InitInstance(); - - virtual void TestMain() = 0; - - DECLARE_MESSAGE_MAP() -}; - - -} // namespace CppUnit - - -#endif // WinTestRunner_H_INCLUDED - diff --git a/CppUnit/WinTestRunner/res/Resource.h b/CppUnit/WinTestRunner/res/Resource.h deleted file mode 100644 index cd0bf3528..000000000 --- a/CppUnit/WinTestRunner/res/Resource.h +++ /dev/null @@ -1,27 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by TestRunner.rc -// -#define IDD_DIALOG_TESTRUNNER 129 -#define IDC_LIST 1000 -#define ID_RUN 1001 -#define ID_STOP 1002 -#define IDC_PROGRESS 1003 -#define IDC_INDICATOR 1004 -#define IDC_COMBO_TEST 1005 -#define IDC_STATIC_RUNS 1007 -#define IDC_STATIC_ERRORS 1008 -#define IDC_STATIC_FAILURES 1009 -#define IDC_EDIT_TIME 1010 -#define IDC_CHK_AUTORUN 1013 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 131 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1014 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/CppUnit/WinTestRunner/res/TestRunner.rc2 b/CppUnit/WinTestRunner/res/TestRunner.rc2 deleted file mode 100644 index 55dca09fa..000000000 --- a/CppUnit/WinTestRunner/res/TestRunner.rc2 +++ /dev/null @@ -1,13 +0,0 @@ -// -// TESTRUNNER.RC2 - resources Microsoft Visual C++ does not edit directly -// - -#ifdef APSTUDIO_INVOKED - #error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// Add manually edited resources here... - -///////////////////////////////////////////////////////////////////////////// diff --git a/CppUnit/WinTestRunner/res/WinTestRunner.rc b/CppUnit/WinTestRunner/res/WinTestRunner.rc deleted file mode 100644 index c4056f269..000000000 --- a/CppUnit/WinTestRunner/res/WinTestRunner.rc +++ /dev/null @@ -1,175 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// English (U.S.) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "#define _AFX_NO_SPLITTER_RESOURCES\r\n" - "#define _AFX_NO_OLE_RESOURCES\r\n" - "#define _AFX_NO_TRACKER_RESOURCES\r\n" - "#define _AFX_NO_PROPERTY_RESOURCES\r\n" - "\r\n" - "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" - "LANGUAGE 9, 1\r\n" - "#pragma code_page(1252)\r\n" - "#endif\r\n" - "#include ""..\\res\\WinTestRunner.rc2"" // non-Microsoft Visual C++ edited resources\r\n" - "#include ""afxres.rc"" // Standard components\r\n" - "#endif\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Version -// - -VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,0,1 - PRODUCTVERSION 1,0,0,1 - FILEFLAGSMASK 0x3fL -#ifdef _DEBUG - FILEFLAGS 0x1L -#else - FILEFLAGS 0x0L -#endif - FILEOS 0x4L - FILETYPE 0x2L - FILESUBTYPE 0x0L -BEGIN - BLOCK "StringFileInfo" - BEGIN - BLOCK "040904b0" - BEGIN - VALUE "FileDescription", "CppUnit WinTestRunner DLL" - VALUE "FileVersion", "1, 0, 0, 1" - VALUE "InternalName", "WinTestRunner" - VALUE "LegalCopyright", "Copyright (c) 2005" - VALUE "OriginalFilename", "TestRunner.dll" - VALUE "ProductName", "CppUnit WinTestRunner Dynamic Link Library" - VALUE "ProductVersion", "1, 0, 0, 1" - END - END - BLOCK "VarFileInfo" - BEGIN - VALUE "Translation", 0x409, 1200 - END -END - - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_DIALOG_TESTRUNNER DIALOGEX 0, 0, 512, 300 -STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "CppUnit WinTestRunner" -FONT 8, "MS Sans Serif", 0, 0, 0x0 -BEGIN - COMBOBOX IDC_COMBO_TEST,7,20,424,273,CBS_DROPDOWNLIST | - WS_VSCROLL | WS_TABSTOP - DEFPUSHBUTTON "Run",ID_RUN,455,7,50,14 - DEFPUSHBUTTON "Stop",ID_STOP,455,24,50,14 - CONTROL "List1",IDC_LIST,"SysListView32",LVS_REPORT | WS_BORDER | - WS_TABSTOP,7,110,498,160 - PUSHBUTTON "Close",IDOK,455,279,50,14 - LTEXT "Test Name:",IDC_STATIC,7,9,179,9 - LTEXT "Progress:",IDC_STATIC,7,55,49,9 - LTEXT "Errors and Failures:",IDC_STATIC,7,99,67,9 - LTEXT "Runs:",IDC_STATIC,457,54,26,10 - LTEXT "Failures:",IDC_STATIC,457,80,26,10 - LTEXT "Errors:",IDC_STATIC,457,67,26,10 - RTEXT "0",IDC_STATIC_RUNS,487,54,16,10 - RTEXT "0",IDC_STATIC_ERRORS,487,67,16,10 - RTEXT "0",IDC_STATIC_FAILURES,487,80,16,10 - EDITTEXT IDC_EDIT_TIME,7,281,440,12,ES_AUTOHSCROLL | ES_READONLY | - NOT WS_BORDER - LTEXT "",IDC_PROGRESS,7,67,424,20,SS_SUNKEN | NOT WS_VISIBLE - CONTROL "Auto Run",IDC_CHK_AUTORUN,"Button",BS_AUTOCHECKBOX | - BS_LEFTTEXT | WS_TABSTOP,383,38,46,10 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_DIALOG_TESTRUNNER, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 505 - TOPMARGIN, 7 - BOTTOMMARGIN, 293 - END -END -#endif // APSTUDIO_INVOKED - -#endif // English (U.S.) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// -#define _AFX_NO_SPLITTER_RESOURCES -#define _AFX_NO_OLE_RESOURCES -#define _AFX_NO_TRACKER_RESOURCES -#define _AFX_NO_PROPERTY_RESOURCES - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 -LANGUAGE 9, 1 -#pragma code_page(1252) -#endif -#include "afxres.rc" // Standard components -#endif -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/CppUnit/WinTestRunner/src/ActiveTest.cpp b/CppUnit/WinTestRunner/src/ActiveTest.cpp deleted file mode 100644 index cd84bb329..000000000 --- a/CppUnit/WinTestRunner/src/ActiveTest.cpp +++ /dev/null @@ -1,42 +0,0 @@ -// -// ActiveTest.cpp -// - - -#include -#include "ActiveTest.h" - - -namespace CppUnit { - - -// Spawn a thread to a test -void ActiveTest::run(TestResult* result) -{ - CWinThread* thread; - - setTestResult(result); - _runCompleted.ResetEvent(); - - thread = AfxBeginThread(threadFunction, this, THREAD_PRIORITY_NORMAL, 0, CREATE_SUSPENDED); - DuplicateHandle(GetCurrentProcess(), thread->m_hThread, GetCurrentProcess(), &_threadHandle, 0, FALSE, DUPLICATE_SAME_ACCESS); - - thread->ResumeThread(); -} - - -// Simple execution thread. Assuming that an ActiveTest instance -// only creates one of these at a time. -UINT ActiveTest::threadFunction(LPVOID thisInstance) -{ - ActiveTest* test = (ActiveTest*) thisInstance; - - test->run(); - test->_runCompleted.SetEvent(); - - return 0; -} - - -} // namespace CppUnit - diff --git a/CppUnit/WinTestRunner/src/ActiveTest.h b/CppUnit/WinTestRunner/src/ActiveTest.h deleted file mode 100644 index 8f293ab15..000000000 --- a/CppUnit/WinTestRunner/src/ActiveTest.h +++ /dev/null @@ -1,87 +0,0 @@ -// -// ActiveTest.h -// - - -#ifndef ActiveTest_INCLUDED -#define ActiveTest_INCLUDED - - -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestDecorator.h" -#include - - -namespace CppUnit { - - -/* A Microsoft-specific active test - * - * An active test manages its own - * thread of execution. This one - * is very simple and only sufficient - * for the limited use we put it through - * in the TestRunner. It spawns a thread - * on run (TestResult *) and signals - * completion of the test. - * - * We assume that only one thread - * will be active at once for each - * instance. - * - */ -class ActiveTest: public TestDecorator -{ -public: - ActiveTest(Test* test); - ~ActiveTest(); - - void run(TestResult* result); - -protected: - HANDLE _threadHandle; - CEvent _runCompleted; - TestResult* _currentTestResult; - - void run (); - void setTestResult(TestResult* result); - static UINT threadFunction(LPVOID thisInstance); -}; - - -// Construct the active test -inline ActiveTest::ActiveTest(Test *test): TestDecorator(test) -{ - _currentTestResult = NULL; - _threadHandle = INVALID_HANDLE_VALUE; -} - - -// Pend until the test has completed -inline ActiveTest::~ActiveTest() -{ - CSingleLock(&_runCompleted, TRUE); - CloseHandle(_threadHandle); -} - - -// Set the test result that we are to run -inline void ActiveTest::setTestResult(TestResult* result) -{ - _currentTestResult = result; -} - - -// Run our test result -inline void ActiveTest::run() -{ - TestDecorator::run(_currentTestResult); -} - - -} // namespace CppUnit - - -#endif // ActiveTest_INCLUDED - - diff --git a/CppUnit/WinTestRunner/src/DLLMain.cpp b/CppUnit/WinTestRunner/src/DLLMain.cpp deleted file mode 100644 index cb75d7809..000000000 --- a/CppUnit/WinTestRunner/src/DLLMain.cpp +++ /dev/null @@ -1,48 +0,0 @@ -// -// DLLMain.cpp -// - - -#include -#include - - -static AFX_EXTENSION_MODULE TestRunnerDLL = { NULL, NULL }; - - -extern "C" int APIENTRY -DllMain(HINSTANCE hInstance, DWORD dwReason, LPVOID lpReserved) -{ - // Remove this if you use lpReserved - UNREFERENCED_PARAMETER(lpReserved); - - if (dwReason == DLL_PROCESS_ATTACH) - { - TRACE0("WinTestRunner.DLL Initializing\n"); - - // Extension DLL one-time initialization - if (!AfxInitExtensionModule(TestRunnerDLL, hInstance)) - return 0; - - // Insert this DLL into the resource chain - // NOTE: If this Extension DLL is being implicitly linked to by - // an MFC Regular DLL (such as an ActiveX Control) - // instead of an MFC application, then you will want to - // remove this line from DllMain and put it in a separate - // function exported from this Extension DLL. The Regular DLL - // that uses this Extension DLL should then explicitly call that - // function to initialize this Extension DLL. Otherwise, - // the CDynLinkLibrary object will not be attached to the - // Regular DLL's resource chain, and serious problems will - // result. - - new CDynLinkLibrary(TestRunnerDLL); - } - else if (dwReason == DLL_PROCESS_DETACH) - { - TRACE0("WinTestRunner.DLL Terminating\n"); - // Terminate the library before destructors are called - AfxTermExtensionModule(TestRunnerDLL); - } - return 1; // ok -} diff --git a/CppUnit/WinTestRunner/src/GUITestResult.cpp b/CppUnit/WinTestRunner/src/GUITestResult.cpp deleted file mode 100644 index 4531dabe1..000000000 --- a/CppUnit/WinTestRunner/src/GUITestResult.cpp +++ /dev/null @@ -1,50 +0,0 @@ -// -// GUITestResult.cpp -// - - -#include "TestRunnerDlg.h" -#include "GUITestResult.h" - - -namespace CppUnit { - - -void GUITestResult::addError(Test *test, CppUnitException *e) -{ - ExclusiveZone zone(_syncObject); - - TestResult::addError(test, e); - _runner->addError(this, test, e); -} - - -void GUITestResult::addFailure(Test *test, CppUnitException *e) -{ - ExclusiveZone zone(_syncObject); - - TestResult::addFailure(test, e); - _runner->addFailure(this, test, e); -} - - -void GUITestResult::startTest(Test *test) -{ - ExclusiveZone zone(_syncObject); - - TestResult::startTest(test); - _runner->startTest(test); -} - - -void GUITestResult::endTest(Test *test) -{ - ExclusiveZone zone(_syncObject); - - TestResult::endTest(test); - _runner->endTest(this, test); -} - - -} // namespace CppUnit - diff --git a/CppUnit/WinTestRunner/src/GUITestResult.h b/CppUnit/WinTestRunner/src/GUITestResult.h deleted file mode 100644 index a38f5c653..000000000 --- a/CppUnit/WinTestRunner/src/GUITestResult.h +++ /dev/null @@ -1,81 +0,0 @@ -// -// GUITestResult.h -// - - -#ifndef GuiTestResult_INCLUDED -#define GuiTestResult_INCLUDED - - -#include "CppUnit/CppUnit.h" -#include "CppUnit/TestResult.h" -#include - - -namespace CppUnit { - - -class TestRunnerDlg; - - -class GUITestResult: public TestResult -{ -public: - GUITestResult(TestRunnerDlg* runner); - ~GUITestResult(); - - void addError(Test* test, CppUnitException* e); - void addFailure(Test* test, CppUnitException* e); - - void startTest(Test* test); - void endTest(Test* test); - void stop(); - -protected: - class LightweightSynchronizationObject: public TestResult::SynchronizationObject - { - public: - void lock() - { - _syncObject.Lock(); - } - - void unlock() - { - _syncObject.Unlock(); - } - - private: - CCriticalSection _syncObject; - }; - -private: - TestRunnerDlg *_runner; -}; - - - -// Construct with lightweight synchronization -inline GUITestResult::GUITestResult(TestRunnerDlg* runner): _runner(runner) -{ - setSynchronizationObject(new LightweightSynchronizationObject()); -} - - -// Destructor -inline GUITestResult::~GUITestResult() -{ -} - - -// Override without protection to prevent deadlock -inline void GUITestResult::stop() -{ - _stop = true; -} - - -} // namespace CppUnit - - -#endif // GuiTestResult_INCLUDED diff --git a/CppUnit/WinTestRunner/src/ProgressBar.cpp b/CppUnit/WinTestRunner/src/ProgressBar.cpp deleted file mode 100644 index 3a2bca891..000000000 --- a/CppUnit/WinTestRunner/src/ProgressBar.cpp +++ /dev/null @@ -1,138 +0,0 @@ -// -// ProgressBar.cpp -// - - -#include "ProgressBar.h" - - -namespace CppUnit { - - -// Paint the progress bar in response to a paint message -void ProgressBar::paint(CDC& dc) -{ - paintBackground (dc); - paintStatus (dc); -} - - -// Paint the background of the progress bar region -void ProgressBar::paintBackground (CDC& dc) -{ - CBrush brshBackground; - CPen penGray (PS_SOLID, 1, RGB (128, 128, 128)); - CPen penWhite (PS_SOLID, 1, RGB (255, 255, 255)); - - VERIFY (brshBackground.CreateSolidBrush (::GetSysColor (COLOR_BTNFACE))); - - dc.FillRect (_bounds, &brshBackground); - - CPen *pOldPen; - - pOldPen = dc.SelectObject (&penGray); - { - dc.MoveTo (_bounds.left, _bounds.top); - dc.LineTo (_bounds.left + _bounds.Width () -1, _bounds.top); - - dc.MoveTo (_bounds.left, _bounds.top); - dc.LineTo (_bounds.left, _bounds.top + _bounds.Height () -1); - - } - dc.SelectObject (&penWhite); - { - dc.MoveTo (_bounds.left + _bounds.Width () -1, _bounds.top); - dc.LineTo (_bounds.left + _bounds.Width () -1, _bounds.top + _bounds.Height () -1); - - dc.MoveTo (_bounds.left, _bounds.top + _bounds.Height () -1); - dc.LineTo (_bounds.left + _bounds.Width () -1, _bounds.top + _bounds.Height () -1); - - } - dc.SelectObject (pOldPen); - -} - - -// Paint the actual status of the progress bar -void ProgressBar::paintStatus (CDC& dc) -{ - if (_progress <= 0) - return; - - CBrush brshStatus; - CRect rect (_bounds.left, _bounds.top, - _bounds.left + _progressX, _bounds.bottom); - - COLORREF statusColor = getStatusColor (); - - VERIFY (brshStatus.CreateSolidBrush (statusColor)); - - rect.DeflateRect (1, 1); - dc.FillRect (rect, &brshStatus); - -} - - -// Paint the current step -void ProgressBar::paintStep (int startX, int endX) -{ - // kludge: painting the whole region on each step - _baseWindow->RedrawWindow (_bounds); - _baseWindow->UpdateWindow (); - -} - - -// Setup the progress bar for execution over a total number of steps -void ProgressBar::start (int total) -{ - _total = total; - reset (); -} - - -// Take one step, indicating whether it was a successful step -void ProgressBar::step (bool successful) -{ - _progress++; - - int x = _progressX; - - _progressX = scale (_progress); - - if (!_error && !successful) - { - _error = true; - x = 1; - } - - paintStep (x, _progressX); - -} - - -// Map from steps to display units -int ProgressBar::scale (int value) -{ - if (_total > 0) - return max (1, value * (_bounds.Width () - 1) / _total); - - return value; - -} - - -// Reset the progress bar -void ProgressBar::reset () -{ - _progressX = 1; - _progress = 0; - _error = false; - - _baseWindow->RedrawWindow (_bounds); - _baseWindow->UpdateWindow (); - -} - - -} // namespace CppUnit diff --git a/CppUnit/WinTestRunner/src/ProgressBar.h b/CppUnit/WinTestRunner/src/ProgressBar.h deleted file mode 100644 index 06bd48dcd..000000000 --- a/CppUnit/WinTestRunner/src/ProgressBar.h +++ /dev/null @@ -1,72 +0,0 @@ -// -// ProgressBar.h -// - - -#ifndef ProgressBar_INCLUDED -#define ProgressBar_INCLUDED - - -#include "CppUnit/CppUnit.h" -#include - - -namespace CppUnit { - - -/* A Simple ProgressBar for test execution display - */ -class ProgressBar -{ -public: - ProgressBar(CWnd* baseWindow, CRect& bounds); - - void step(bool successful); - void paint(CDC& dc); - int scale(int value); - void reset(); - void start(int total); - -protected: - void paintBackground(CDC& dc); - void paintStatus(CDC& dc); - COLORREF getStatusColor(); - void paintStep(int startX, int endX); - - CWnd* _baseWindow; - CRect _bounds; - - bool _error; - int _total; - int _progress; - int _progressX; -}; - - -// Construct a ProgressBar -inline ProgressBar::ProgressBar(CWnd* baseWindow, CRect& bounds): - _baseWindow(baseWindow), - _bounds(bounds), - _error(false), - _total(0), - _progress(0), - _progressX(0) -{ - WINDOWINFO wi; - wi.cbSize = sizeof(WINDOWINFO); - baseWindow->GetWindowInfo(&wi); - _bounds.OffsetRect(-wi.rcClient.left, -wi.rcClient.top); -} - - -// Get the current color -inline COLORREF ProgressBar::getStatusColor() -{ - return _error ? RGB(255, 0, 0) : RGB(0, 255, 0); -} - - -} // namespace CppUnit - - -#endif // ProgressBar_INCLUDED diff --git a/CppUnit/WinTestRunner/src/SynchronizedTestResult.h b/CppUnit/WinTestRunner/src/SynchronizedTestResult.h deleted file mode 100644 index 55dc01c55..000000000 --- a/CppUnit/WinTestRunner/src/SynchronizedTestResult.h +++ /dev/null @@ -1,106 +0,0 @@ -#ifndef SYNCHRONIZEDTESTRESULTDECORATOR_H -#define SYNCHRONIZEDTESTRESULTDECORATOR_H - -#include -#include "TestResultDecorator.h" - -class SynchronizedTestResult : public TestResultDecorator -{ -public: - SynchronizedTestResult (TestResult *result); - ~SynchronizedTestResult (); - - - bool shouldStop (); - void addError (Test *test, CppUnitException *e); - void addFailure (Test *test, CppUnitException *e); - void startTest (Test *test); - void endTest (Test *test); - int runTests (); - int testErrors (); - int testFailures (); - bool wasSuccessful (); - void stop (); - - vector& errors (); - vector& failures (); - -private: - CCriticalSection m_criticalSection; - -}; - - -// Constructor -inline SynchronizedTestResult::SynchronizedTestResult (TestResult *result) -: TestResultDecorator (result) {} - -// Destructor -inline SynchronizedTestResult::~SynchronizedTestResult () -{} - -// Returns whether the test should stop -inline bool SynchronizedTestResult::shouldStop () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->shouldStop (); } - - -// Adds an error to the list of errors. The passed in exception -// caused the error -inline void SynchronizedTestResult::addError (Test *test, CppUnitException *e) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->addError (test, e); } - - -// Adds a failure to the list of failures. The passed in exception -// caused the failure. -inline void SynchronizedTestResult::addFailure (Test *test, CppUnitException *e) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->addFailure (test, e); } - - -// Informs the result that a test will be started. -inline void SynchronizedTestResult::startTest (Test *test) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->startTest (test); } - - -// Informs the result that a test was completed. -inline void SynchronizedTestResult::endTest (Test *test) -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->endTest (test); } - - -// Gets the number of run tests. -inline int SynchronizedTestResult::runTests () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->runTests (); } - - -// Gets the number of detected errors. -inline int SynchronizedTestResult::testErrors () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->testErrors (); } - - -// Gets the number of detected failures. -inline int SynchronizedTestResult::testFailures () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->testFailures (); } - - -// Returns whether the entire test was successful or not. -inline bool SynchronizedTestResult::wasSuccessful () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->wasSuccessful (); } - - -// Marks that the test run should stop. -inline void SynchronizedTestResult::stop () -{ CSingleLock sync (&m_criticalSection, TRUE); m_result->stop (); } - - -// Returns a vector of the errors. -inline vector& SynchronizedTestResult::errors () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->errors (); } - - -// Returns a vector of the failures. -inline vector& SynchronizedTestResult::failures () -{ CSingleLock sync (&m_criticalSection, TRUE); return m_result->failures (); } - - -#endif - - diff --git a/CppUnit/WinTestRunner/src/TestResultDecorator.h b/CppUnit/WinTestRunner/src/TestResultDecorator.h deleted file mode 100644 index 33ed48db0..000000000 --- a/CppUnit/WinTestRunner/src/TestResultDecorator.h +++ /dev/null @@ -1,102 +0,0 @@ -#ifndef CPP_UNIT_TESTRESULTDECORATOR_H -#define CPP_UNIT_TESTRESULTDECORATOR_H - -#include "TestResult.h" - -class TestResultDecorator -{ -public: - TestResultDecorator (TestResult *result); - virtual ~TestResultDecorator (); - - - virtual bool shouldStop (); - virtual void addError (Test *test, CppUnitException *e); - virtual void addFailure (Test *test, CppUnitException *e); - virtual void startTest (Test *test); - virtual void endTest (Test *test); - virtual int runTests (); - virtual int testErrors (); - virtual int testFailures (); - virtual bool wasSuccessful (); - virtual void stop (); - - vector& errors (); - vector& failures (); - -protected: - TestResult *m_result; -}; - - -inline TestResultDecorator::TestResultDecorator (TestResult *result) -: m_result (result) {} - -inline TestResultDecorator::~TestResultDecorator () -{} - -// Returns whether the test should stop -inline bool TestResultDecorator::shouldStop () -{ return m_result->shouldStop (); } - - -// Adds an error to the list of errors. The passed in exception -// caused the error -inline void TestResultDecorator::addError (Test *test, CppUnitException *e) -{ m_result->addError (test, e); } - - -// Adds a failure to the list of failures. The passed in exception -// caused the failure. -inline void TestResultDecorator::addFailure (Test *test, CppUnitException *e) -{ m_result->addFailure (test, e); } - - -// Informs the result that a test will be started. -inline void TestResultDecorator::startTest (Test *test) -{ m_result->startTest (test); } - - -// Informs the result that a test was completed. -inline void TestResultDecorator::endTest (Test *test) -{ m_result->endTest (test); } - - -// Gets the number of run tests. -inline int TestResultDecorator::runTests () -{ return m_result->runTests (); } - - -// Gets the number of detected errors. -inline int TestResultDecorator::testErrors () -{ return m_result->testErrors (); } - - -// Gets the number of detected failures. -inline int TestResultDecorator::testFailures () -{ return m_result->testFailures (); } - - -// Returns whether the entire test was successful or not. -inline bool TestResultDecorator::wasSuccessful () -{ return m_result->wasSuccessful (); } - - -// Marks that the test run should stop. -inline void TestResultDecorator::stop () -{ m_result->stop (); } - - -// Returns a vector of the errors. -inline vector& TestResultDecorator::errors () -{ return m_result->errors (); } - - -// Returns a vector of the failures. -inline vector& TestResultDecorator::failures () -{ return m_result->failures (); } - - -#endif - - diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp b/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp deleted file mode 100644 index 43bc7a20f..000000000 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.cpp +++ /dev/null @@ -1,437 +0,0 @@ -// -// TestRunnerDlg.cpp -// - - -#include -#include -#include -#include -#include "TestRunnerDlg.h" -#include "ActiveTest.h" -#include "GUITestResult.h" -#include "ProgressBar.h" -#include "CppUnit/TestSuite.h" -#include "TestRunnerDlg.h" - - -namespace CppUnit { - - -TestRunnerDlg::TestRunnerDlg(CWnd* pParent): CDialog(TestRunnerDlg::IDD, pParent) -{ - //{{AFX_DATA_INIT(TestRunnerDlg) - // NOTE: the ClassWizard will add member initialization here - //}}AFX_DATA_INIT - - _testsProgress = 0; - _selectedTest = 0; - _currentTest = 0; -} - - -void TestRunnerDlg::DoDataExchange(CDataExchange* pDX) -{ - CDialog::DoDataExchange(pDX); - //{{AFX_DATA_MAP(TestRunnerDlg) - // NOTE: the ClassWizard will add DDX and DDV calls here - //}}AFX_DATA_MAP -} - - -BEGIN_MESSAGE_MAP(TestRunnerDlg, CDialog) - //{{AFX_MSG_MAP(TestRunnerDlg) - ON_BN_CLICKED(ID_RUN, OnRun) - ON_BN_CLICKED(ID_STOP, OnStop) - ON_CBN_SELCHANGE(IDC_COMBO_TEST, OnSelchangeComboTest) - ON_BN_CLICKED(IDC_CHK_AUTORUN, OnBnClickedAutorun) - ON_WM_PAINT() - //}}AFX_MSG_MAP -END_MESSAGE_MAP() - - -BOOL TestRunnerDlg::OnInitDialog() -{ - CDialog::OnInitDialog(); - - CListCtrl *listCtrl = (CListCtrl *)GetDlgItem (IDC_LIST); - CComboBox *comboBox = (CComboBox *)GetDlgItem (IDC_COMBO_TEST); - - ASSERT (listCtrl); - ASSERT (comboBox); - - CString title; - GetWindowText(title); -#if defined(_DEBUG) - title.Append(" [debug]"); -#else - title.Append(" [release]"); -#endif - SetWindowText(title); - - listCtrl->InsertColumn (0,"Type", LVCFMT_LEFT, 16 + listCtrl->GetStringWidth ("Type"), 1); - listCtrl->InsertColumn (1,"Name", LVCFMT_LEFT, 16 * listCtrl->GetStringWidth ("X"), 2); - listCtrl->InsertColumn (2,"Failed Condition", LVCFMT_LEFT, 24 * listCtrl->GetStringWidth ("M"), 3); - listCtrl->InsertColumn (3,"Line", LVCFMT_LEFT, 16 + listCtrl->GetStringWidth ("0000"), 4); - listCtrl->InsertColumn (4,"File Name", LVCFMT_LEFT, 36 * listCtrl->GetStringWidth ("M"), 5); - - int numberOfCases = 0; - - CWinApp* pApp = AfxGetApp(); - CString lastTestCS = pApp->GetProfileString("Tests", "lastTest"); - std::string lastTest((LPCSTR) lastTestCS); - int sel = -1; - for (std::vector::iterator it = _tests.begin (); it != _tests.end (); ++it) - { - std::string cbName(it->level*4, ' '); - cbName.append(it->pTest->toString()); - comboBox->AddString (cbName.c_str ()); - if (sel < 0) - { - if (lastTest.empty() || lastTest == it->pTest->toString()) - { - _selectedTest = it->pTest; - sel = numberOfCases; - } - } - numberOfCases++; - } - - if (numberOfCases > 0) - { - if (sel < 0) - { - _selectedTest = _tests[0].pTest; - sel = 0; - } - comboBox->SetCurSel (sel); - } - else - { - beRunDisabled (); - } - CWnd *pProgress = GetDlgItem(IDC_PROGRESS); - CRect rect; - pProgress->GetWindowRect(&rect); - _testsProgress = new ProgressBar (this, rect); - - CButton* autoRunBtn = (CButton*) GetDlgItem(IDC_CHK_AUTORUN); - autoRunBtn->SetCheck(pApp->GetProfileInt("Tests", "autoRun", BST_UNCHECKED)); - - reset (); - - if (autoRunBtn->GetCheck() == BST_CHECKED) - { - OnRun(); - } - - return TRUE; // return TRUE unless you set the focus to a control - // EXCEPTION: OCX Property Pages should return FALSE -} - - -TestRunnerDlg::~TestRunnerDlg () -{ - freeState (); - delete _testsProgress; -} - - -void TestRunnerDlg::OnRun() -{ - if (_selectedTest == 0) - return; - - freeState (); - reset (); - - beRunning (); - - int numberOfTests = _selectedTest->countTestCases (); - - _testsProgress->start (numberOfTests); - - _result = new GUITestResult ((TestRunnerDlg *)this); - _activeTest = new ActiveTest (_selectedTest); - - _testStartTime = timeGetTime (); - - _activeTest->run (_result); - - _testEndTime = timeGetTime (); - -} - - -void TestRunnerDlg::addListEntry(const std::string& type, TestResult *result, Test *test, CppUnitException *e) -{ - char stage [80]; - LV_ITEM lvi; - CListCtrl *listCtrl = (CListCtrl *)GetDlgItem (IDC_LIST); - int currentEntry = result->testErrors () + result->testFailures () -1; - - sprintf (stage, "%s", type.c_str ()); - - lvi.mask = LVIF_TEXT; - lvi.iItem = currentEntry; - lvi.iSubItem = 0; - lvi.pszText = stage; - lvi.iImage = 0; - lvi.stateMask = 0; - lvi.state = 0; - - listCtrl->InsertItem (&lvi); - - // Set class string - listCtrl->SetItemText (currentEntry, 1, test->toString ().c_str ()); - - // Set the asserted text - listCtrl->SetItemText(currentEntry, 2, e->what ()); - - // Set the line number - if (e->lineNumber () == CppUnitException::CPPUNIT_UNKNOWNLINENUMBER) - sprintf (stage, ""); - else - sprintf (stage, "%ld", e->lineNumber ()); - - listCtrl->SetItemText(currentEntry, 3, stage); - - // Set the file name - listCtrl->SetItemText(currentEntry, 4, e->fileName ().c_str ()); - - listCtrl->RedrawItems (currentEntry, currentEntry); - listCtrl->UpdateWindow (); - -} - - -void TestRunnerDlg::addError (TestResult *result, Test *test, CppUnitException *e) -{ - addListEntry ("Error", result, test, e); - _errors++; - - _currentTest = 0; - updateCountsDisplay (); - -} - - -void TestRunnerDlg::addFailure (TestResult *result, Test *test, CppUnitException *e) -{ - addListEntry ("Failure", result, test, e); - _failures++; - - _currentTest = 0; - updateCountsDisplay (); - -} - - -void TestRunnerDlg::startTest(Test* test) -{ - _currentTest = test; - updateCountsDisplay(); -} - - -void TestRunnerDlg::endTest (TestResult *result, Test *test) -{ - if (_selectedTest == 0) - return; - _currentTest = 0; - - _testsRun++; - updateCountsDisplay (); - _testsProgress->step (_failures == 0 && _errors == 0); - - _testEndTime = timeGetTime (); - - updateCountsDisplay (); - - if (_testsRun >= _selectedTest->countTestCases ()) - beIdle (); -} - - -void TestRunnerDlg::beRunning () -{ - CButton *runButton = (CButton *)GetDlgItem (ID_RUN); - CButton *closeButton = (CButton *)GetDlgItem (IDOK); - - runButton->EnableWindow (FALSE); - closeButton->EnableWindow (FALSE); - -} - - -void TestRunnerDlg::beIdle () -{ - CButton *runButton = (CButton *)GetDlgItem (ID_RUN); - CButton *closeButton = (CButton *)GetDlgItem (IDOK); - - runButton->EnableWindow (TRUE); - closeButton->EnableWindow (TRUE); - -} - - -void TestRunnerDlg::beRunDisabled () -{ - CButton *runButton = (CButton *)GetDlgItem (ID_RUN); - CButton *closeButton = (CButton *)GetDlgItem (IDOK); - CButton *stopButton = (CButton *)GetDlgItem (ID_STOP); - - runButton->EnableWindow (FALSE); - stopButton->EnableWindow (FALSE); - closeButton->EnableWindow (TRUE); - -} - - -void TestRunnerDlg::freeState () -{ - delete _activeTest; - delete _result; - -} - - -void TestRunnerDlg::reset () -{ - _testsRun = 0; - _errors = 0; - _failures = 0; - _testEndTime = _testStartTime; - - updateCountsDisplay (); - - _activeTest = 0; - _result = 0; - - CListCtrl *listCtrl = (CListCtrl *)GetDlgItem (IDC_LIST); - - listCtrl->DeleteAllItems (); - _testsProgress->reset (); - -} - - -void TestRunnerDlg::updateCountsDisplay () -{ - CStatic *statTestsRun = (CStatic *)GetDlgItem (IDC_STATIC_RUNS); - CStatic *statErrors = (CStatic *)GetDlgItem (IDC_STATIC_ERRORS); - CStatic *statFailures = (CStatic *)GetDlgItem (IDC_STATIC_FAILURES); - CEdit *editTime = (CEdit *)GetDlgItem (IDC_EDIT_TIME); - - CString argumentString; - - argumentString.Format ("%d", _testsRun); - statTestsRun ->SetWindowText (argumentString); - - argumentString.Format ("%d", _errors); - statErrors ->SetWindowText (argumentString); - - argumentString.Format ("%d", _failures); - statFailures ->SetWindowText (argumentString); - - if (_currentTest) - argumentString.Format ("Execution Time: %3.3lf seconds, Current Test: %s", (_testEndTime - _testStartTime) / 1000.0, _currentTest->toString().c_str()); - else - argumentString.Format ("Execution Time: %3.3lf seconds", (_testEndTime - _testStartTime) / 1000.0); - - editTime ->SetWindowText (argumentString); - - -} - - -void TestRunnerDlg::OnStop() -{ - if (_result) - _result->stop (); - - beIdle (); - -} - - -void TestRunnerDlg::OnOK() -{ - if (_result) - _result->stop (); - - CDialog::OnOK (); -} - - -void TestRunnerDlg::OnSelchangeComboTest() -{ - CComboBox *testsSelection = (CComboBox *)GetDlgItem (IDC_COMBO_TEST); - - int currentSelection = testsSelection->GetCurSel (); - - if (currentSelection >= 0 && currentSelection < _tests.size ()) - { - _selectedTest = (_tests.begin () + currentSelection)->pTest; - beIdle (); - CWinApp* pApp = AfxGetApp(); - pApp->WriteProfileString("Tests", "lastTest", _selectedTest->toString().c_str()); - } - else - { - _selectedTest = 0; - beRunDisabled (); - - } - - freeState (); - reset (); - -} - - -void TestRunnerDlg::OnBnClickedAutorun() -{ - CButton *autoRunBtn = (CButton *)GetDlgItem (IDC_CHK_AUTORUN); - CWinApp* pApp = AfxGetApp(); - pApp->WriteProfileInt("Tests", "autoRun", autoRunBtn->GetCheck()); -} - - -void TestRunnerDlg::OnPaint() -{ - CPaintDC dc (this); - - _testsProgress->paint (dc); -} - - -void TestRunnerDlg::setTests(const std::vector& tests) -{ - _tests.clear(); - for (std::vector::const_iterator it = tests.begin(); it != tests.end(); ++it) - { - addTest(*it, 0); - } -} - - -void TestRunnerDlg::addTest(Test* pTest, int level) -{ - TestInfo ti; - ti.pTest = pTest; - ti.level = level; - _tests.push_back(ti); - TestSuite* pSuite = dynamic_cast(pTest); - if (pSuite) - { - const std::vector& tests = pSuite->tests(); - for (std::vector::const_iterator it = tests.begin(); it != tests.end(); ++it) - { - addTest(*it, level + 1); - } - } -} - - -} // namespace CppUnit diff --git a/CppUnit/WinTestRunner/src/TestRunnerDlg.h b/CppUnit/WinTestRunner/src/TestRunnerDlg.h deleted file mode 100644 index 63689f7ae..000000000 --- a/CppUnit/WinTestRunner/src/TestRunnerDlg.h +++ /dev/null @@ -1,92 +0,0 @@ -// -// TestRunnerDlg.h -// - - -#ifndef TestRunnerDlg_INCLUDED -#define TestRunnerDlg_INCLUDED - - -#include "CppUnit/CppUnit.h" -#include "CppUnit/CppUnitException.h" -#include "ActiveTest.h" -#include -#include "../res/Resource.h" -#include -#include "afxwin.h" - - -namespace CppUnit { - - -class ProgressBar; - - -class TestRunnerDlg: public CDialog -{ -public: - TestRunnerDlg(CWnd* pParent = NULL); - ~TestRunnerDlg(); - - void setTests(const std::vector& tests); - - void addError(TestResult* result, Test* test, CppUnitException* e); - void addFailure(TestResult* result, Test* test, CppUnitException* e); - void startTest(Test* test); - void endTest(TestResult* result, Test* test); - - //{{AFX_DATA(TestRunnerDlg) - enum { IDD = IDD_DIALOG_TESTRUNNER }; - // NOTE: the ClassWizard will add data members here - //}}AFX_DATA - - //{{AFX_VIRTUAL(TestRunnerDlg) - protected: - virtual void DoDataExchange(CDataExchange* pDX); // DDX/DDV support - //}}AFX_VIRTUAL - -protected: - //{{AFX_MSG(TestRunnerDlg) - virtual BOOL OnInitDialog(); - afx_msg void OnRun(); - afx_msg void OnStop(); - virtual void OnOK(); - afx_msg void OnSelchangeComboTest(); - afx_msg void OnBnClickedAutorun(); - afx_msg void OnPaint(); - //}}AFX_MSG - DECLARE_MESSAGE_MAP() - - void addListEntry(const std::string& type, TestResult* result, Test* test, CppUnitException* e); - void beIdle(); - void beRunning(); - void beRunDisabled(); - void reset(); - void freeState(); - void updateCountsDisplay(); - void addTest(Test* pTest, int level); - - struct TestInfo - { - Test* pTest; - int level; - }; - std::vector _tests; - ProgressBar* _testsProgress; - Test* _selectedTest; - ActiveTest* _activeTest; - TestResult* _result; - int _testsRun; - int _errors; - int _failures; - DWORD _testStartTime; - DWORD _testEndTime; - Test* _currentTest; -}; - - -} // namespace CppUnit - - -#endif // TestRunnerDlg_INCLUDED - diff --git a/CppUnit/WinTestRunner/src/WinTestRunner.cpp b/CppUnit/WinTestRunner/src/WinTestRunner.cpp deleted file mode 100644 index 13412075f..000000000 --- a/CppUnit/WinTestRunner/src/WinTestRunner.cpp +++ /dev/null @@ -1,106 +0,0 @@ -// -// WinTestRunner.cpp -// - - -#include "WinTestRunner/WinTestRunner.h" -#include "TestRunnerDlg.h" -#include "CppUnit/TestRunner.h" -#include - - -namespace CppUnit { - - -WinTestRunner::WinTestRunner() -{ -} - - -WinTestRunner::~WinTestRunner() -{ - for (std::vector::iterator it = _tests.begin(); it != _tests.end(); ++it) - delete *it; -} - - -void WinTestRunner::run() -{ - // Note: The following code is some evil hack to - // add batch capability to the MFC based WinTestRunner. - - std::string cmdLine(AfxGetApp()->m_lpCmdLine); - if (cmdLine.size() >= 2 && cmdLine[0] == '/' && (cmdLine[1] == 'b' || cmdLine[1] == 'B')) - { - TestRunner runner; - for (std::vector::iterator it = _tests.begin(); it != _tests.end(); ++it) - runner.addTest((*it)->toString(), *it); - _tests.clear(); - std::vector args; - args.push_back("WinTestRunner"); - args.push_back("-all"); - bool success = runner.run(args); - ExitProcess(success ? 0 : 1); - } - else - { - // We're running in interactive mode. - TestRunnerDlg dlg; - dlg.setTests(_tests); - dlg.DoModal(); - } -} - - -void WinTestRunner::addTest(Test* pTest) -{ - _tests.push_back(pTest); -} - - -BEGIN_MESSAGE_MAP(WinTestRunnerApp, CWinApp) -END_MESSAGE_MAP() - - -BOOL WinTestRunnerApp::InitInstance() -{ - std::string cmdLine(AfxGetApp()->m_lpCmdLine); - if (cmdLine.size() >= 2 && cmdLine[0] == '/' && (cmdLine[1] == 'b' || cmdLine[1] == 'B')) - { - // We're running in batch mode. - std::string outPath; - if (cmdLine.size() > 4 && cmdLine[2] == ':') - { - outPath = cmdLine.substr(3); - } - else - { - char buffer[1024]; - GetModuleFileName(NULL, buffer, sizeof(buffer)); - outPath = buffer; - outPath += ".out"; - } - freopen(outPath.c_str(), "w", stdout); - freopen(outPath.c_str(), "w", stderr); - TestMain(); - } - else - { - AllocConsole(); - SetConsoleTitle("CppUnit WinTestRunner Console"); - freopen("CONOUT$", "w", stdout); - freopen("CONOUT$", "w", stderr); - freopen("CONIN$", "r", stdin); - TestMain(); - FreeConsole(); - } - return FALSE; -} - - -void WinTestRunnerApp::TestMain() -{ -} - - -} // namespace CppUnit diff --git a/Crypto/testsuite/TestSuite_CE_VS90.vcproj b/Crypto/testsuite/TestSuite_CE_VS90.vcproj index 9ac78b607..ecb7b9fe0 100644 --- a/Crypto/testsuite/TestSuite_CE_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_CE_VS90.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" @@ -106,7 +106,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" @@ -180,7 +180,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);POCO_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" @@ -256,7 +256,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);POCO_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" @@ -330,7 +330,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);POCO_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" @@ -406,7 +406,7 @@ InlineFunctionExpansion="0" EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include" PreprocessorDefinitions="NDEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);POCO_STATIC;_CONSOLE;_CRT_SECURE_NO_WARNINGS;_CRT_SECURE_NO_WARNINGS" StringPooling="true" MinimalRebuild="false" diff --git a/Crypto/testsuite/TestSuite_VS90.vcproj b/Crypto/testsuite/TestSuite_VS90.vcproj index 6a0c4bf45..62155b716 100644 --- a/Crypto/testsuite/TestSuite_VS90.vcproj +++ b/Crypto/testsuite/TestSuite_VS90.vcproj @@ -21,7 +21,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj index b75aa143a..6db1279ba 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -328,7 +328,7 @@ - + diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 525d0e709..46a30eb85 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -328,7 +328,7 @@ - + diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index 9eb508b1f..577f6de48 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj b/Crypto/testsuite/TestSuite_vs140.vcxproj index 76bb75587..e7243ab9e 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj b/Crypto/testsuite/TestSuite_vs150.vcxproj index 00633a9da..4a0821d15 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj index aa51a528c..6d0cef24a 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -328,7 +328,7 @@ - + diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index 9f4a21603..1782d4f91 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -328,7 +328,7 @@ - + diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index 88f05e10a..30beb320f 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj index cc81c9110..014b1148f 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj index c8f6c60bb..6fe25e030 100644 --- a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Crypto/testsuite/TestSuite_x64_vs90.vcproj b/Crypto/testsuite/TestSuite_x64_vs90.vcproj index 1067d82f0..38afa5e22 100644 --- a/Crypto/testsuite/TestSuite_x64_vs90.vcproj +++ b/Crypto/testsuite/TestSuite_x64_vs90.vcproj @@ -21,7 +21,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/Data/Data_WEC2013_vs110.vcxproj b/Data/Data_WEC2013_vs110.vcxproj index 81c8e6abc..24549940a 100644 --- a/Data/Data_WEC2013_vs110.vcxproj +++ b/Data/Data_WEC2013_vs110.vcxproj @@ -1,268 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoDatad - PocoDatamdd - PocoDatamtd - PocoData - PocoDatamd - PocoDatamt - - - ..\bin\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Data_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - /bigobj %(AdditionalOptions) - - - ..\bin\$(Platform)\PocoDatad.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoDatad.pdb - - - ..\lib\$(Platform)\PocoDatad.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Data_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - /bigobj %(AdditionalOptions) - - - ..\bin\$(Platform)\PocoData.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoData.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoDatamtd.pdb - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoDatamdd.pdb - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamd.lib - - - @@ -313,6 +51,29 @@ + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoDatad + PocoDatamdd + PocoDatamtd + PocoData + PocoDatamd + PocoDatamt + + diff --git a/Data/Data_WEC2013_vs110.vcxproj.filters b/Data/Data_WEC2013_vs110.vcxproj.filters index 16a983fbf..4a3189fa9 100644 --- a/Data/Data_WEC2013_vs110.vcxproj.filters +++ b/Data/Data_WEC2013_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {c513ea20-454b-4be6-b8d1-fccfffeef0e8} + {002c7c58-5bc7-4d63-a795-98c989130458} - {e99f9f01-bf53-49dd-ab1f-4276af6c8aab} + {be626293-2fbc-4576-895b-103b12fdbe7c} - {8409e501-6e7f-4d59-aeef-16e21e3dd593} + {c366ccff-5dcc-4bd7-a356-0ad01a94f617} - {574e0f33-2ee1-4311-8a97-25f156e97d90} + {95736580-6405-4e86-a969-1a07535fba00} - {2a330a8f-ba25-4954-8696-5cc49dbb383c} + {edf27381-cc97-40c0-9a7a-ccb342ba4e00} - {23469b79-dd22-45bc-b0d1-2db00ead05c6} + {4c1921e8-1d5e-40c7-b286-ee949285619e} - {787027ac-2ff3-4c89-b61f-40130c5e96b7} + {54d6ad2d-1922-4a38-bd1c-acce57abe9c7} - {6992da5f-c8b9-46de-967b-e9703271516c} + {900ecfd3-8802-46ca-82b9-73501fc58779} - {f7404183-ab00-48f6-9d36-288f3f4e07b4} + {44b55a67-fc29-46b5-b02b-8ec5c8b22df7} diff --git a/Data/Data_WEC2013_vs120.vcxproj b/Data/Data_WEC2013_vs120.vcxproj index 4238465d6..644a3e664 100644 --- a/Data/Data_WEC2013_vs120.vcxproj +++ b/Data/Data_WEC2013_vs120.vcxproj @@ -1,268 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - Data - {240E83C3-368D-11DB-9FBC-00123FC423B5} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoDatad - PocoDatamdd - PocoDatamtd - PocoData - PocoDatamd - PocoDatamt - - - ..\bin\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Data\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Data_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - /bigobj %(AdditionalOptions) - - - ..\bin\$(Platform)\PocoDatad.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoDatad.pdb - - - ..\lib\$(Platform)\PocoDatad.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Data_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - /bigobj %(AdditionalOptions) - - - ..\bin\$(Platform)\PocoData.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoData.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoDatamtd.pdb - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoDatamdd.pdb - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - /bigobj %(AdditionalOptions) - - - ..\lib\$(Platform)\PocoDatamd.lib - - - @@ -313,6 +51,29 @@ + + Data + {240E83C3-368D-11DB-9FBC-00123FC423B5} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoDatad + PocoDatamdd + PocoDatamtd + PocoData + PocoDatamd + PocoDatamt + + diff --git a/Data/Data_WEC2013_vs120.vcxproj.filters b/Data/Data_WEC2013_vs120.vcxproj.filters index f98cb0157..bf311ccb0 100644 --- a/Data/Data_WEC2013_vs120.vcxproj.filters +++ b/Data/Data_WEC2013_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {b0a859a6-51c7-40e8-969a-9607fa8028be} + {16b13d91-8e0f-40ed-a5e0-f03665d7dee0} - {dca19c39-696e-4a82-9334-a09e27b8b011} + {53caa097-7de8-42d9-bb58-a1db9912cb42} - {fed07d20-5a02-4322-8adc-aaae5b42ee6f} + {30d6de2c-60db-4a6e-b6d4-33839580e5a7} - {3d8e1cc7-8c63-48fd-a03a-691bb4994433} + {95d89376-4bbc-4aec-b5a0-9a1f25408214} - {d21002bc-042b-4164-925c-f29c44692208} + {cb8af126-0c08-44ca-a51c-6388b49b9602} - {ad8224b2-f02c-4e8e-b81d-de0fa279e855} + {ad192924-72b9-4401-95ac-dfda5c693b24} - {30e8c133-011c-4f31-8a27-7276a7d6ba26} + {73da7f8c-4b09-44c7-849e-428164367b0e} - {2aa71099-9d2e-4121-ab46-4e7c5f4b3143} + {46bedd00-35a9-4c3c-a5e9-9d0eac16279a} - {ca21c708-38dc-4668-9d7f-06d14847a131} + {ee307c7a-1de9-49f6-a007-1939962fd94f} diff --git a/Data/Data_vs100.vcxproj.filters b/Data/Data_vs100.vcxproj.filters index d965b3aab..581f1fc97 100644 --- a/Data/Data_vs100.vcxproj.filters +++ b/Data/Data_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {12378d3c-8fd3-46dc-857b-658dba6f2f48} + {4f877db0-7e15-42ad-9161-194295d3cf61} - {6e5ddb05-2fa8-4a27-9572-0d547d173018} + {511bb500-572a-4b4a-b8c5-d14ddcf8b593} - {5da2def5-d7fb-40c5-912e-2b19ad0123c7} + {42c4be4b-ccfa-43ee-bd65-88e996e39ede} - {39b5346f-cf15-487e-9966-18f3340364e1} + {ca7802ad-cc5b-4abf-a2cd-13ca5198219a} - {fabf825e-e9a6-4277-91b3-cf216916a9a6} + {e41ada7e-b929-4e9d-9c2e-9afd44a513ee} - {f7f0a853-95b9-4cb8-9c30-ae4fde88dc86} + {3fc77a9d-740b-4105-a6c2-506c8fca4277} - {08c38923-041e-40e5-b28c-54cb4556e211} + {b9cb890a-4399-4e17-aad3-6bd3f2f3aac3} - {c70117c6-f1de-4e12-b3c8-7dd4aa6a8dfd} + {69ca5d0a-beb7-4299-9893-a355d3519b83} - {5502c796-47e4-4b2b-9ee9-df21b43dbe60} + {e729a557-5d60-45e7-8527-588fd6c136fb} diff --git a/Data/Data_vs110.vcxproj b/Data/Data_vs110.vcxproj index 98b003daf..c5a01a87c 100644 --- a/Data/Data_vs110.vcxproj +++ b/Data/Data_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoDatad PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs110.vcxproj.filters b/Data/Data_vs110.vcxproj.filters index e7b11aefb..b5ee2a901 100644 --- a/Data/Data_vs110.vcxproj.filters +++ b/Data/Data_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {d72bb88c-fd44-4732-b8cc-56c685759777} + {b1aaaa74-ee97-4ef3-a03c-31149510515b} - {92444a47-fa18-4c6c-8cfb-1adf33a57632} + {27db07a8-2bbb-40d8-abb1-dffcd8bc08b4} - {e9103719-5363-4eb8-bae6-49953c403873} + {99d3b04e-fac2-4568-86a7-2f290345c6ca} - {b57eabf4-8740-4879-b7a5-60338bbb60a5} + {02bc8614-0469-4d82-b73f-dd2358f360e0} - {bf9f4278-6136-48f5-8958-fe2ee299e88a} + {17bedb4b-829c-43ab-88c4-e8b6a2e8be87} - {5044c804-f24f-4963-91e3-0c2453f3f524} + {f56c2101-7ab5-45bb-8604-2e0cf64570f0} - {e4b78ea7-18ae-4f05-9ce3-39c522639dd2} + {3c93b606-cba2-4d51-a57b-c08f85f50066} - {44ddf9b1-150e-4c77-944d-6650f7a454a4} + {1a28cfcd-7d80-420b-814a-5d900fded207} - {0262f82e-f799-4890-8d2a-30e27d1b87c3} + {45797abd-b3ac-4240-b0e2-3672dd6d3a14} diff --git a/Data/Data_vs120.vcxproj.filters b/Data/Data_vs120.vcxproj.filters index 53217663a..ffa77e4e6 100644 --- a/Data/Data_vs120.vcxproj.filters +++ b/Data/Data_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {b81b71a0-6eee-44c4-aeb3-b5b2c00464da} + {bf9d4a35-8d66-4dab-9111-a3ed638fa984} - {18e970ed-1258-4f79-8dd7-8e79bca7b909} + {e59accbc-4b69-4916-bc9a-040f88a8c24e} - {c9f17704-a856-4bdf-9fff-8b7c1a997076} + {b8256114-2725-4d82-9e88-db70e6b70727} - {f0c237af-b686-4d26-afb1-71d0c45c9cb9} + {c4acd589-c154-4858-a3d0-0ee489eade1c} - {a589e905-9206-47c5-abef-f3787b536fe5} + {900fd0ee-f3f4-4710-8e3d-f11a3ff097e0} - {4e14520c-b448-4705-be75-2da1cbd399e7} + {d6e4069f-7082-4056-85cd-fa6967b4149a} - {2274c564-8165-441e-b521-1fe1b206d58e} + {fb5d7e8f-648e-4250-82ca-de0611ae6d8a} - {02782211-f784-40de-8bcf-9ac7695a182d} + {f494aa75-38d6-43bf-b346-676969d08cae} - {ebfd92a8-2b01-4a40-9d3c-1bcdc7def580} + {7b149928-c818-4d93-ba01-3561fe3e0cba} diff --git a/Data/Data_vs140.vcxproj b/Data/Data_vs140.vcxproj index 609f16dd8..4b5a24dcb 100644 --- a/Data/Data_vs140.vcxproj +++ b/Data/Data_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoDatad PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs140.vcxproj.filters b/Data/Data_vs140.vcxproj.filters index aea2a8fad..01f1d5d33 100644 --- a/Data/Data_vs140.vcxproj.filters +++ b/Data/Data_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {b4c7a430-4cf6-49fa-89de-9301321f877f} + {ab800cf2-ecc1-4752-b278-56cc2ddfd4c2} - {5294b51c-0bd3-4fad-8ad9-5cfc5d27c9e9} + {52e4b428-7a58-4b6c-bfcc-87635853f00b} - {b4ff6a3d-4c4e-45d5-9954-c88225d5dcd8} + {783bb699-ee3a-43a7-83bb-b6e1aa6d68ab} - {c61908f2-65e3-4180-8ca2-b82ac97c4b31} + {c354c7ac-013d-4a46-b096-2dcf77a0b460} - {b81ea19a-52cf-4c01-a268-3487b42bede0} + {92688e3b-3fbb-424d-b7ca-f427da5a45d8} - {75fe5e10-b9ed-4238-9cd0-6ed3b06629c0} + {00d079a6-634a-42d4-9d35-231612d34cad} - {b108a281-7b73-492c-b9aa-3b704d18a526} + {39eba5e0-d3e4-477c-a19a-b35af0985ef1} - {7a0bce76-8822-4379-a88e-ebbd68b44e57} + {4dfe448f-5c01-4f27-b4ed-772e020b1a8c} - {a44b210e-5cef-4e9a-9a16-7a6f6d1a8d85} + {50c5e03d-a746-4dd5-86a9-4585506c70c6} diff --git a/Data/Data_vs150.vcxproj b/Data/Data_vs150.vcxproj index ca23011a0..01f7f4c42 100644 --- a/Data/Data_vs150.vcxproj +++ b/Data/Data_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>15.0.27625.0 PocoDatad PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs150.vcxproj.filters b/Data/Data_vs150.vcxproj.filters index aea2a8fad..45ccbc7bc 100644 --- a/Data/Data_vs150.vcxproj.filters +++ b/Data/Data_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {b4c7a430-4cf6-49fa-89de-9301321f877f} + {7f0654ef-7e83-4b58-ac51-31e4e1310d09} - {5294b51c-0bd3-4fad-8ad9-5cfc5d27c9e9} + {ecd7e754-490e-4c6e-be5c-4d06d4c6939d} - {b4ff6a3d-4c4e-45d5-9954-c88225d5dcd8} + {cf28be8f-b1f7-4f9d-a33c-16116555c8dc} - {c61908f2-65e3-4180-8ca2-b82ac97c4b31} + {4c4eab32-9710-424d-b86a-6f5a798db667} - {b81ea19a-52cf-4c01-a268-3487b42bede0} + {b4d217a1-dfbf-4382-a897-b6950cee98ee} - {75fe5e10-b9ed-4238-9cd0-6ed3b06629c0} + {3fc86e80-5cba-440d-9b60-9968ed4d9be4} - {b108a281-7b73-492c-b9aa-3b704d18a526} + {a94004a8-b6d9-440e-9c6c-d5125457fcb2} - {7a0bce76-8822-4379-a88e-ebbd68b44e57} + {80453d31-c856-4378-a115-6d70858034a6} - {a44b210e-5cef-4e9a-9a16-7a6f6d1a8d85} + {b826193d-e309-49ed-911b-af3e3ca9f1a2} diff --git a/Data/Data_x64_vs100.vcxproj.filters b/Data/Data_x64_vs100.vcxproj.filters index e6a6136e1..163988418 100644 --- a/Data/Data_x64_vs100.vcxproj.filters +++ b/Data/Data_x64_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {9a3ed3d0-6af5-4b87-8406-337d0cc46dd8} + {e705ff8a-95cb-4313-8a9e-d7ed2a9d3cb0} - {81b99119-9a42-4602-8ef0-be6e9b7bd6aa} + {ee22e7c7-4f9a-4706-b7bb-92e67656e97a} - {6ebd7f74-fef0-41a8-86c1-434120fbcdb9} + {f91f3a66-e8ac-42f2-8c7e-d0fba666c44c} - {6257bd1c-6a02-4fbb-b9f9-4f1ad54c0bc4} + {3864fba6-dc67-4e1d-b9b1-b845f891dc22} - {be212d51-ea3b-494c-ace2-050adaa2e7f3} + {fff40d67-7e1f-4829-a634-45a76b6730a6} - {1ae53e9b-547f-4f21-8ec6-fc3d95c09b6b} + {40ece370-d352-44c7-9c44-f810a16fea05} - {596b789a-5ebe-4faf-9eae-80dab856be2b} + {a64d9b17-d7cb-44b9-9ad5-fe96efc116be} - {eb1b5d29-52e0-4091-8237-516bd23c5503} + {b0ed69a4-8363-42a9-a286-f2c6347687ca} - {d035cdfa-307e-4ab6-aeb3-799294952898} + {a393ed41-f928-40e8-8016-38c758780e33} diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj index 7de8200a2..be6740559 100644 --- a/Data/Data_x64_vs110.vcxproj +++ b/Data/Data_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoData64d PocoDatamdd PocoDatamtd diff --git a/Data/Data_x64_vs110.vcxproj.filters b/Data/Data_x64_vs110.vcxproj.filters index 22ed82e59..88d554782 100644 --- a/Data/Data_x64_vs110.vcxproj.filters +++ b/Data/Data_x64_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {c030283b-54db-435a-a6f2-fe49a3bba956} + {90acb326-4d5c-49d7-88a6-f719cfb88454} - {2f009761-17bd-452f-a891-53eb16128238} + {2635f1d7-35c0-402c-9557-180003cb3786} - {33568050-20bd-464a-b6ff-19c9495d7da2} + {1abd4334-9d26-4c71-9125-ea8b470b6a31} - {3b4f1b20-890a-4bcd-a252-94d1123a4b3b} + {5a527897-cc26-4490-9227-43845e251f10} - {d5108fb8-331b-4f8c-a449-fed72cda1acd} + {74e2cc5a-40d2-4f87-b35f-bfe56be2423a} - {8c42a0c8-e397-4d42-b570-fe41fb5bb5c2} + {742622d6-4cd1-4cdf-9de1-49019436b603} - {03c46819-46a2-463e-a3bd-d01c87658a2b} + {cc2ae774-de1e-4429-baf4-2859a76abddb} - {064cd91e-cee5-4153-9a29-bbbfebaffb72} + {7c861528-339e-4012-b6bf-398ca6a4ab89} - {7d441960-1ec7-40b1-8ebe-4d03d9a0a6d1} + {ec0a1165-51a7-4f6c-8673-9a0181c6bb9b} diff --git a/Data/Data_x64_vs120.vcxproj.filters b/Data/Data_x64_vs120.vcxproj.filters index 4bebba67c..3bb1ebf01 100644 --- a/Data/Data_x64_vs120.vcxproj.filters +++ b/Data/Data_x64_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {27a34048-2c6a-495e-a90f-ba29a33d0eeb} + {33fd0431-836d-4069-ad6b-4ca528c2500e} - {df74f587-390d-4fc4-a949-0be0bce3f91c} + {973e9e54-aef0-472d-9b3f-1a18ffffc2e6} - {3a336877-81ac-4dcc-a376-26883df375f2} + {ee9d4b89-84ae-4d71-b1a4-7b4e8c4d8c78} - {f57f8963-e089-48e1-a2c2-5020163c276d} + {8e3f8613-a846-43be-9c60-d392a7bb0db2} - {bf8a7c70-4c2e-4633-862a-7ddff6dfbdd7} + {d60c58b2-07fb-4fb5-9a7c-4c096461ba3d} - {373aebb0-622f-47ea-9c7e-8431d976643d} + {f780643e-1e0b-4ac8-b857-d61c824552fe} - {25bcbb88-f96c-4628-a6c8-40899a2a1d59} + {211caaad-dc33-43b5-a514-8bd7b5afc56b} - {fcf29cd0-67a9-4b3a-86e9-a659fb5d2a3c} + {1e49310e-6b82-45cc-a08e-ac2ba3aba8a0} - {b6046893-0fe3-4e49-9733-b645ee468421} + {0240e793-e20b-45bf-b751-ca32bf1ebef6} diff --git a/Data/Data_x64_vs140.vcxproj b/Data/Data_x64_vs140.vcxproj index 765af62db..5f38ec0f6 100644 --- a/Data/Data_x64_vs140.vcxproj +++ b/Data/Data_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoData64d PocoDatamdd PocoDatamtd diff --git a/Data/Data_x64_vs140.vcxproj.filters b/Data/Data_x64_vs140.vcxproj.filters index 20a589443..1232a1448 100644 --- a/Data/Data_x64_vs140.vcxproj.filters +++ b/Data/Data_x64_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {840e0230-d295-4977-b5ef-3f4536ad5d42} + {61818a9e-a09d-4c5d-a5fb-088feec8065b} - {21e2fc6f-3ccf-4fae-9a17-ca9066ee0011} + {16af8285-90c3-4d16-84ed-b229b6b788c7} - {edc45426-a577-49e3-818a-eb4a8d982908} + {22e9ba2c-721c-48d7-8634-7ec4ef234f37} - {0dfd9e77-9bfd-4597-915a-53dcb54de2a1} + {516315fc-1b92-42f8-95cd-a7c12f24acc6} - {8c91f04c-7ba2-49f8-9c45-49f60c5f1cfb} + {ea099c9e-e003-4b32-89d2-1daa03a269ae} - {d649fcea-34c6-4484-925a-da8e1067fccb} + {51c28c5f-5332-4565-a72a-bc47072d3cff} - {4923030c-e7d9-45b3-bf94-ccfbc4a27a2c} + {533c5f68-fe42-47ed-8f22-6e302bc0c893} - {41b8136c-4fea-46e5-ace9-754c055d483f} + {f903a4b0-76ca-4b85-a839-9696a0433258} - {99d27f85-c622-4210-be97-b96939b6e325} + {de3d7712-c041-44ac-ab06-bca4d22ab6ed} diff --git a/Data/Data_x64_vs150.vcxproj b/Data/Data_x64_vs150.vcxproj index 03d759d32..96d303429 100644 --- a/Data/Data_x64_vs150.vcxproj +++ b/Data/Data_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>15.0.27625.0 PocoData64d PocoDatamdd PocoDatamtd diff --git a/Data/Data_x64_vs150.vcxproj.filters b/Data/Data_x64_vs150.vcxproj.filters index 20a589443..aaa62f186 100644 --- a/Data/Data_x64_vs150.vcxproj.filters +++ b/Data/Data_x64_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {840e0230-d295-4977-b5ef-3f4536ad5d42} + {d73e287c-95f8-4e3e-813c-e00224dd4c03} - {21e2fc6f-3ccf-4fae-9a17-ca9066ee0011} + {6fa2622a-d4e8-4e36-885c-f9ffa9587486} - {edc45426-a577-49e3-818a-eb4a8d982908} + {496f071c-d958-42b1-8f7f-50038c64ec72} - {0dfd9e77-9bfd-4597-915a-53dcb54de2a1} + {3fa3bc17-61ce-4efc-9427-18ca49bd2b46} - {8c91f04c-7ba2-49f8-9c45-49f60c5f1cfb} + {e972d60c-c0f3-4fb6-92d7-b0304573f091} - {d649fcea-34c6-4484-925a-da8e1067fccb} + {0ed2ac40-199c-49f5-9f0b-de4c6fbb9412} - {4923030c-e7d9-45b3-bf94-ccfbc4a27a2c} + {8bc6f01e-65c5-48d9-8566-41ecd985d600} - {41b8136c-4fea-46e5-ace9-754c055d483f} + {34f53df2-5f1f-47c8-a305-473b4e016ed9} - {99d27f85-c622-4210-be97-b96939b6e325} + {e9545ad3-ef25-4933-92c4-41a6d7a8f10c} diff --git a/Data/Data_x64_vs90.vcproj b/Data/Data_x64_vs90.vcproj index 4703b9b53..87ca5e1a3 100644 --- a/Data/Data_x64_vs90.vcproj +++ b/Data/Data_x64_vs90.vcproj @@ -1,46 +1,35 @@ + Keyword="Win32Proj"> + Name="x64"/> - - + + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + AdditionalOptions=""/> + Name="VCALinkTool"/> + Name="VCManifestTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCAppVerifierTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> + CharacterSet="2"> + Name="VCPreBuildEventTool"/> + Name="VCCustomBuildTool"/> + Name="VCXMLDataGeneratorTool"/> + Name="VCWebServiceProxyGeneratorTool"/> + Name="VCMIDLTool"/> + AdditionalOptions="/bigobj"/> + Name="VCManagedResourceCompilerTool"/> + Name="VCResourceCompilerTool"/> + Name="VCPreLinkEventTool"/> + TargetMachine="17"/> + Name="VCALinkTool"/> + Name="VCXDCMakeTool"/> + Name="VCBscMakeTool"/> + Name="VCFxCopTool"/> + Name="VCPostBuildEventTool"/> - - + + Name="DataCore"> + Name="Header Files"> - + RelativePath=".\include\Poco\Data\AbstractBinder.h"/> - + RelativePath=".\include\Poco\Data\AbstractBinding.h"/> - + RelativePath=".\include\Poco\Data\AbstractExtraction.h"/> - + RelativePath=".\include\Poco\Data\AbstractExtractor.h"/> - + RelativePath=".\include\Poco\Data\AbstractPreparation.h"/> - + RelativePath=".\include\Poco\Data\AbstractPreparator.h"/> - + RelativePath=".\include\Poco\Data\AbstractSessionImpl.h"/> - + RelativePath=".\include\Poco\Data\AutoTransaction.h"/> - + RelativePath=".\include\Poco\Data\Binding.h"/> - + RelativePath=".\include\Poco\Data\Bulk.h"/> - + RelativePath=".\include\Poco\Data\BulkBinding.h"/> - + RelativePath=".\include\Poco\Data\BulkExtraction.h"/> - + RelativePath=".\include\Poco\Data\Column.h"/> - + RelativePath=".\include\Poco\Data\Connector.h"/> - + RelativePath=".\include\Poco\Data\Constants.h"/> - + RelativePath=".\include\Poco\Data\Data.h"/> - + RelativePath=".\include\Poco\Data\DataException.h"/> - + RelativePath=".\include\Poco\Data\Date.h"/> - + RelativePath=".\include\Poco\Data\DynamicDateTime.h"/> - + RelativePath=".\include\Poco\Data\DynamicLOB.h"/> - + RelativePath=".\include\Poco\Data\Extraction.h"/> - + RelativePath=".\include\Poco\Data\Limit.h"/> - + RelativePath=".\include\Poco\Data\LOB.h"/> - + RelativePath=".\include\Poco\Data\LOBStream.h"/> - + RelativePath=".\include\Poco\Data\MetaColumn.h"/> - + RelativePath=".\include\Poco\Data\Position.h"/> - + RelativePath=".\include\Poco\data\Preparation.h"/> - + RelativePath=".\include\Poco\Data\Range.h"/> - + RelativePath=".\include\Poco\Data\RecordSet.h"/> - + RelativePath=".\include\Poco\Data\Row.h"/> - + RelativePath=".\include\Poco\Data\RowFilter.h"/> - + RelativePath=".\include\Poco\Data\RowFormatter.h"/> - + RelativePath=".\include\Poco\Data\RowIterator.h"/> - + RelativePath=".\include\Poco\Data\Session.h"/> - + RelativePath=".\include\Poco\Data\SessionFactory.h"/> - + RelativePath=".\include\Poco\Data\SessionImpl.h"/> - + RelativePath=".\include\Poco\Data\SimpleRowFormatter.h"/> - + RelativePath=".\include\Poco\Data\Statement.h"/> - + RelativePath=".\include\Poco\Data\StatementCreator.h"/> - + RelativePath=".\include\Poco\Data\StatementImpl.h"/> - + RelativePath=".\include\Poco\Data\Time.h"/> - + RelativePath=".\include\Poco\Data\Transaction.h"/> - + RelativePath=".\include\Poco\Data\TypeHandler.h"/> + Name="Source Files"> - + RelativePath=".\src\AbstractBinder.cpp"/> - + RelativePath=".\src\AbstractBinding.cpp"/> - + RelativePath=".\src\AbstractExtraction.cpp"/> - + RelativePath=".\src\AbstractExtractor.cpp"/> - + RelativePath=".\src\AbstractPreparation.cpp"/> - + RelativePath=".\src\AbstractPreparator.cpp"/> - + RelativePath=".\src\Bulk.cpp"/> - + RelativePath=".\src\Connector.cpp"/> - + RelativePath=".\src\DataException.cpp"/> - + RelativePath=".\src\Date.cpp"/> - + RelativePath=".\src\DynamicLOB.cpp"/> - + RelativePath=".\src\Limit.cpp"/> - + RelativePath=".\src\MetaColumn.cpp"/> - + RelativePath=".\src\Position.cpp"/> - + RelativePath=".\src\Range.cpp"/> - + RelativePath=".\src\RecordSet.cpp"/> - + RelativePath=".\src\Row.cpp"/> - + RelativePath=".\src\RowFilter.cpp"/> - + RelativePath=".\src\RowFormatter.cpp"/> - + RelativePath=".\src\RowIterator.cpp"/> - + RelativePath=".\src\Session.cpp"/> - + RelativePath=".\src\SessionFactory.cpp"/> - + RelativePath=".\src\SessionImpl.cpp"/> - + RelativePath=".\src\SimpleRowFormatter.cpp"/> - + RelativePath=".\src\Statement.cpp"/> - + RelativePath=".\src\StatementCreator.cpp"/> - + RelativePath=".\src\StatementImpl.cpp"/> - + RelativePath=".\src\Time.cpp"/> - + RelativePath=".\src\Transaction.cpp"/> + Name="SessionPooling"> + Name="Header Files"> - + RelativePath=".\include\Poco\Data\PooledSessionHolder.h"/> - + RelativePath=".\include\Poco\Data\PooledSessionImpl.h"/> - + RelativePath=".\include\Poco\Data\SessionPool.h"/> - + RelativePath=".\include\Poco\Data\SessionPoolContainer.h"/> + Name="Source Files"> - + RelativePath=".\src\PooledSessionHolder.cpp"/> - + RelativePath=".\src\PooledSessionImpl.cpp"/> - + RelativePath=".\src\SessionPool.cpp"/> - + RelativePath=".\src\SessionPoolContainer.cpp"/> + Name="Logging"> + Name="Header Files"> - + RelativePath=".\include\Poco\Data\ArchiveStrategy.h"/> - + RelativePath=".\include\Poco\Data\SQLChannel.h"/> + Name="Source Files"> - + RelativePath=".\src\ArchiveStrategy.cpp"/> - + RelativePath=".\src\SQLChannel.cpp"/> - - + diff --git a/Data/MySQL/MySQL_vs150.vcxproj b/Data/MySQL/MySQL_vs150.vcxproj index f583ceb15..9d035f53e 100644 --- a/Data/MySQL/MySQL_vs150.vcxproj +++ b/Data/MySQL/MySQL_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoDataMySQLd PocoDataMySQLmdd PocoDataMySQLmtd diff --git a/Data/MySQL/MySQL_x64_vs150.vcxproj b/Data/MySQL/MySQL_x64_vs150.vcxproj index fac4269bd..e26b47272 100644 --- a/Data/MySQL/MySQL_x64_vs150.vcxproj +++ b/Data/MySQL/MySQL_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoDataMySQL64d PocoDataMySQLmdd PocoDataMySQLmtd diff --git a/Data/MySQL/testsuite/TestSuite_VS90.vcproj b/Data/MySQL/testsuite/TestSuite_VS90.vcproj index 055fe964c..5ca501233 100644 --- a/Data/MySQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_VS90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj index 93157de9f..6ae944037 100644 --- a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +320,7 @@ - + diff --git a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters index 43df21903..ec442a2b9 100644 --- a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {3af4c043-6902-430f-a0ee-aa4e4904e694} + {364e6c29-c104-4da0-8e60-cfef9f841380} - {7bf31bb4-cb5b-49cd-a438-d5b32e7a1745} + {7f36e030-191d-44bb-89b6-5b7665366fe8} - {552b7480-0263-4f22-884c-d067d58b3012} + {aab8f2cf-b91e-447e-afab-a706b20a6c2a} - {4ab98106-a25d-426d-8dca-9f8e0d397313} + {a10a717c-53df-47eb-b9f8-853bda1bdd0f} - {0c3791bb-aee8-487a-ae0d-0db7ad42ded2} + {266b753b-e2ae-4df1-9369-e28644eb0fab} - {d04f43df-41f3-40c5-8160-cc23988be4e1} + {24d87ff5-5587-4ee4-9c62-2d4d06ccbc93} - {88c5b32a-b18c-44a4-a0c8-76066b63919c} + {ae716507-250d-40ef-900f-acd046ace9e9} - {2e0f0a9b-389e-4d92-ae0f-51bf033dc4e7} + {f5c0c611-ff23-4a31-9f8a-5d28a16266fe} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj index 92ce030b8..b59377b28 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +314,7 @@ - + diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters index 8ed4ab97e..e1141cdb0 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {b7598567-0f10-4570-9ac3-c3af48a2a713} + {2bee57b8-7878-4e45-9f1b-fdcb58b8cd00} - {9925b687-a4c6-4799-9862-4a0bc1394a59} + {d8f8c3b1-c8a8-4e49-8dd7-ac2503117bf2} - {4bb21e28-8e76-46e7-b905-4fca48f57ab0} + {d0f9c213-d339-4e88-a4f7-6a1977f35382} - {4cf297c4-f4ee-4ce3-9797-74fd43ceca12} + {35b34fc6-9e3a-4bc4-94eb-d85214f10fcf} - {6093d94f-38c0-4e23-ace1-38b703ea4796} + {23bf3613-f375-40b4-a979-c6a5a379de71} - {8caef0b7-909c-450c-b25b-412d3cfb743c} + {681a38a6-2b61-45b0-8cbf-716edcd5af47} - {122dbc9e-bb30-4c79-87c1-082f8203e924} + {3ab00620-3896-42ba-9b2d-be05e4e36bd4} - {5a5485aa-216a-4409-824c-349d8e712527} + {7badedc4-cdac-4805-bb58-1690d1350f2f} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj index 5f42fee7b..c5d7c9e92 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters index 214ce4e19..61a70e136 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {04dd946f-7cfd-41c8-aabe-ba3d3a102ac8} + {cd51dfff-4cbd-4de8-9fb4-ce7fa1a4e15f} - {bc3719ee-8227-45fe-8280-cc11399da691} + {5547c395-fc31-4f29-ace1-b94555325ba5} - {8ac8ca5e-da9e-4954-b189-cf6bbe197f0b} + {30c57803-5d56-4734-a7d6-5c122936d5af} - {80265e8c-00a0-4f31-a2be-acb1b7eba459} + {5b403d46-448c-456b-95e4-7d04105e5703} - {1242eb1f-0839-4c6c-aa4a-f2a1d1d98375} + {330a886d-277b-4d83-9f62-18adddd1a8ab} - {d87d5fcb-e9ed-432c-9b59-2fe1d2d075e0} + {9c41722d-5cbe-4b34-8508-0a703939c2ae} - {2dcd1029-9dae-4d9e-987c-24c14190dc62} + {e22488ca-6bdc-4ec3-b670-24406574b23e} - {11dcf4d6-d2d7-446c-9d20-bbc6040e1610} + {54e0a331-db2a-457e-bdb8-711eae301da3} diff --git a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj index 2282540f7..5d516ba56 100644 --- a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters index a49dad530..7d0ca4da6 100644 --- a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {2f6daca5-ae7d-4875-b1fb-dc6461621815} + {afb5443a-6957-46f6-8d1f-f8eb49c82dfc} - {15c2ccbb-f361-4a72-bc7b-fb6f6133868c} + {e44120eb-ff95-418d-bd88-362387e0715e} - {c9f283d8-aed1-4d69-a049-e6e38e8c0769} + {329c9773-9fe9-4aa8-b173-db5276d5dd06} - {daf1fdcc-4e7d-4ee9-8f4a-3fbe4aad5cac} + {179f2f8a-7f92-487d-9ccd-ed7e51c61749} - {6293f965-4497-4862-9ef1-4576cdb1816e} + {d7736483-217f-4cf9-842f-bd37ed7a881b} - {5ccc51ba-7a5f-4766-9985-2879dfcb31df} + {731b7c28-a012-4d52-adbc-ccdb89e9632c} - {4d4527a2-4607-4077-b0ca-ba0151218208} + {6e5ae936-4868-4088-85a3-6ccb0269cb75} - {7e53cbf0-9f63-4514-bf8b-444cd03d1f5c} + {72f15b12-711b-4f4c-ac14-65a3ba50584c} diff --git a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj index 261d91240..4b061bc42 100644 --- a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters index cbf4b71ec..b7fe064ce 100644 --- a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {173a0bbf-f28d-4aa0-9fc4-94035cf85a76} + {bfc6d86f-c3d2-4c0d-8720-e30aa678b53b} - {f9093f11-59ce-4edf-bb03-33f950c7679f} + {08d124a4-c1b4-4f79-95ec-9560e1b6a09a} - {3f2a0232-0a6e-47f1-9b5a-12165db46a64} + {bcdbf43b-2e24-419a-974c-5094868b92c1} - {041147af-3feb-4da1-af98-b264d6001956} + {010011de-8787-48d7-9262-3ebbedfcfde9} - {92794a3d-7f8d-4660-bc5f-bd36ecfd9a5b} + {d365732b-da1a-4c51-b8a2-a3d9f34336ab} - {c17cfc63-6d3a-4bde-9598-073012c8158c} + {461f3ace-2f28-4b10-a7b0-ebf4d51c1def} - {1ff7adf6-bfe2-456f-a8a9-d3b4d19cf695} + {ff0e6952-1891-4081-a3b4-e082271eb89e} - {e47c10ed-fc90-4c9a-ad49-f8de4134e12b} + {16f21ead-bd05-481c-8184-6089f00f67a9} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj index b6caa968d..0313ddaf7 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +320,7 @@ - + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 620ec99c0..798a7eab6 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {63e9b218-1090-4d08-a113-5462730189de} + {b40c191d-6fc1-4c72-a547-b7636f1cb473} - {b725e98b-cb67-4aa7-9489-1331854a059b} + {d979874b-eb73-4e53-8cfb-82e09a34dcf0} - {a1d42970-01c5-4769-9278-aab222b5b58e} + {5bdbe1ce-7301-4d77-acd8-74e3b89463ac} - {ca347e55-11e5-4f86-adda-679508c6fb6c} + {292ad638-5a0c-42bf-be7b-5b0cada7bf36} - {29c24b73-1cf9-4b15-8dd9-65508b52d8a7} + {75959cea-2683-487e-9485-52ee57108cf8} - {a649dcac-5621-4264-9604-60755a7ab0c5} + {14b0f4a1-277e-4cbb-a1fa-c2e46eba5697} - {5d6b4c2c-70df-4e41-9936-3ffc979b28ca} + {e2d02b31-f55a-4888-8671-a26b18313ffe} - {e8256195-e7e5-4d3e-b018-57b5d1da2cba} + {d4bc4f83-a144-4d7f-937b-439c3569873c} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj index 23b75f17f..13e76a8f6 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +314,7 @@ - + diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index f48741e65..483998779 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {84694e4d-6ebc-44c0-a2fa-947f6e2e20dd} + {c650c45c-fc80-4c0b-8407-da4456ad3c5e} - {eb3caffc-499e-419e-b3c9-ddf64f4a953f} + {bff7f3c6-b734-46fb-b2fe-36d322dff473} - {d116e6c7-1665-4316-ad69-38aafb22177f} + {b9341598-9c37-48c3-a601-b0ead0e3cf03} - {c7b929fe-6bcf-4fb5-bb05-41bb2c311057} + {271c27b9-456e-4b55-b0d3-33b8041978d5} - {adb26479-46bb-45a2-b7e0-c681e4f03ac7} + {5c560063-c857-478e-9c58-7813909887b4} - {9a7bbf62-3054-403a-a339-b8675da54148} + {b015183d-691f-4e41-a592-0bff7bc79f90} - {40fa4ab8-0c9c-48a0-9c2a-b55ddcb0642e} + {65564cd7-4d1c-4d39-b809-751d431f74bf} - {de8b0107-9eb2-4902-b434-e9b6411f666f} + {afbe09b0-8232-4eef-a9a8-89fe279bbc0a} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 8cd0b9f53..5c73e6d86 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters index a161b8420..a81e9a646 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {c67a7d6c-82e3-470d-9adc-112d0e160376} + {79a8459f-cd4f-49f9-837c-0444c26b2130} - {2f27cf6c-6288-4b15-9a80-6ff8809ce43a} + {8bb1b8fd-2661-469b-9e62-65d76fdaac11} - {a2f19326-b240-450b-9aa0-05c7414312c8} + {3f2ac34b-faba-4099-9216-14b328fd0605} - {add6e844-9506-46b4-ba67-5b60d0964806} + {c7b56b93-7a12-46b5-9793-4dbbfe92f6b3} - {8057079c-a953-402f-a3c0-acedab16ad1e} + {b6c0d446-484a-4a87-b034-16c0b3455ff4} - {5f91323a-a4b4-4274-a32c-8c1373afd6f4} + {8ab7caeb-44fc-43f5-8e3c-b3aecd7f16f5} - {b5ea1b9c-4627-4636-8dea-64fbcc7ff1ba} + {3cd90e61-2d7a-4fa9-b8b8-5d97d723767a} - {38b509c3-dd20-4140-967d-216ef8cbc069} + {6984506e-845f-4e6e-b68f-10306abc5601} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj index 7ce67a213..d22989e49 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters index 32861c4da..6a6bfd96e 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {f2d6b2b6-76d1-4a30-83fb-78fc3d18a5b9} + {45627996-2388-4d06-baf3-35f6bfbdaf9e} - {44d0a9e7-31c2-40db-9491-6c223484d88a} + {13ed2d3f-3b14-4165-ae28-9762fc61b9e3} - {1e0b797d-d471-4cf2-9481-465e7abc2a2a} + {4b3c2ae5-4cb8-4cf9-946d-1b87d976b86c} - {ecb13bd7-dcf2-45ee-b5ea-a146217734d2} + {aea184d5-afcb-4156-b7da-3821b9f95873} - {6cd08e3b-2861-4e78-b80b-d53e41cd83b6} + {7e8d07b0-9eec-4c89-8ee2-d2932544e443} - {d6cb2343-bfa4-46e4-afab-c66202ea8466} + {ad8ad9c4-0bf6-489a-a695-68d187e0982e} - {34633656-ff17-493c-959c-85f1318f33f9} + {74155cd6-b51d-4009-a020-5115a2202c3d} - {dbf199f2-7eb5-40c7-ae41-383bb4ca0d64} + {61eda188-706e-409b-a209-e844ca1adc20} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj index 1c7143baf..fa7f70b42 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters index c032bce01..e06c56b0e 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {1b9bca35-ba89-4728-806d-7a638e3396d3} + {5e5ef4a9-ca97-479e-a805-3c4e88154387} - {af28bfd3-56be-4618-a2a8-1269cd160a57} + {f3d7c024-d129-4a67-816e-7a53c3fd0b30} - {62435c0b-9b0d-4482-90e7-6d22ed0070d3} + {2fa1be0e-084b-4516-925a-5a44193ab9f6} - {de472449-c08e-440d-8d77-3c5cf8a584fe} + {c7ebe9a1-4aa4-4247-91aa-3c63a996d08b} - {a4c460f2-892b-4c31-ab6f-dfa558115788} + {f433069e-eb11-4660-bfc1-396080d69e02} - {01398920-d118-4f55-97a4-01681ec59c9e} + {0a578778-74c0-43a1-9500-997734ea6e7c} - {91820bd9-bdff-49b0-9a78-dbfda57615ca} + {ded90b0d-a29d-4fe8-a5ea-4e9429fa6616} - {c23fec90-7ef5-442f-85cb-d75e1e5e01bc} + {6dacd857-276c-4ea3-9a23-c59bf62e94fd} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj index 28c732b85..8f3d9869e 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/ODBC/ODBC_vs100.vcxproj.filters b/Data/ODBC/ODBC_vs100.vcxproj.filters index 982f83bd3..803e37a04 100644 --- a/Data/ODBC/ODBC_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {fb859766-f281-4d88-90d8-662b987ea1eb} + {e30fb377-decc-4c39-935a-a847e063c52a} - {c58bb5a7-5dbc-42ea-bd30-83ae022a98a4} + {74077f39-7c93-4e6d-af52-6521d414bf8b} - {9e10f0cf-b36e-440e-98a7-975a4bf34d02} + {6f5b2e8d-12be-40de-b1a0-7dc7ac54e36d} diff --git a/Data/ODBC/ODBC_vs110.vcxproj b/Data/ODBC/ODBC_vs110.vcxproj index c3ddbbd9c..b165f8170 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj +++ b/Data/ODBC/ODBC_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_vs110.vcxproj.filters b/Data/ODBC/ODBC_vs110.vcxproj.filters index 17340cdf0..25fbefb53 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {a9ce018d-3696-44d5-863e-db376360a2fd} + {96dbe5ee-3061-4826-b685-21bf48acd67d} - {9b09648e-a915-41fd-8eb4-7633d332448f} + {840404eb-3d4a-4b83-94fe-bf52005ec99f} - {d1d095be-feac-4195-8e84-c090edbb4fec} + {8fb6c137-8f26-4c11-8bcc-79cac47760de} diff --git a/Data/ODBC/ODBC_vs120.vcxproj.filters b/Data/ODBC/ODBC_vs120.vcxproj.filters index 52f808172..27531c2e3 100644 --- a/Data/ODBC/ODBC_vs120.vcxproj.filters +++ b/Data/ODBC/ODBC_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {1f753f4d-9e16-44d8-bf35-2992060057d0} + {e0b5873a-105b-4e8f-929d-47c7e92ba2dd} - {4b4fda72-4dd3-4581-b57f-51d304479e06} + {015320b7-bba6-4071-9d90-2b3313a9868f} - {555b4dae-89ba-4250-a985-2c6d69785a9f} + {0d942bb1-40d6-416a-9bb9-6aea2b63596f} diff --git a/Data/ODBC/ODBC_vs140.vcxproj b/Data/ODBC/ODBC_vs140.vcxproj index 8592981cb..f9e2e2213 100644 --- a/Data/ODBC/ODBC_vs140.vcxproj +++ b/Data/ODBC/ODBC_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_vs140.vcxproj.filters b/Data/ODBC/ODBC_vs140.vcxproj.filters index d3a4a2419..b0e6b07fa 100644 --- a/Data/ODBC/ODBC_vs140.vcxproj.filters +++ b/Data/ODBC/ODBC_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {3cdc9efd-03a4-4371-88bb-a31255233cf2} + {2da3e13f-dfa9-4ef3-bbe9-76d000814db9} - {545630b5-0b84-4d8e-bd64-08f0e9a687c4} + {162e9fa9-a051-4a97-9f75-ea99efce4933} - {5144515a-4152-4d4a-bb7f-09f19a437159} + {0f8cd624-0828-4a47-a954-98490057bfc8} diff --git a/Data/ODBC/ODBC_vs150.vcxproj b/Data/ODBC/ODBC_vs150.vcxproj index 0fa8d9c06..57ac3b4cb 100644 --- a/Data/ODBC/ODBC_vs150.vcxproj +++ b/Data/ODBC/ODBC_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_vs150.vcxproj.filters b/Data/ODBC/ODBC_vs150.vcxproj.filters index d3a4a2419..ec39bf760 100644 --- a/Data/ODBC/ODBC_vs150.vcxproj.filters +++ b/Data/ODBC/ODBC_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {3cdc9efd-03a4-4371-88bb-a31255233cf2} + {2a0eb393-c771-40d4-bdee-85bd67176c94} - {545630b5-0b84-4d8e-bd64-08f0e9a687c4} + {2ad89069-1541-4bff-bc90-b23f83515d99} - {5144515a-4152-4d4a-bb7f-09f19a437159} + {dd17e5af-717e-410b-b112-5092f927728a} diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters index ef8b79ee8..6f8ca9204 100644 --- a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {41adc3cd-455e-45df-80e9-65e02fadbd40} + {a75ad312-6ca2-4bf7-96d6-5637d7e71a33} - {07800ffd-5d2d-44eb-a107-45448dabe41a} + {21470592-158f-4e5f-8397-9f17cafc69ae} - {6afd03f6-f232-40c8-aa80-b178c4f0f222} + {8777626b-4c57-4ddd-a520-5c8155064737} diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj b/Data/ODBC/ODBC_x64_vs110.vcxproj index 18774ce38..3f68a8c24 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoDataODBC64d PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters index 48a1a849f..928a5cc46 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {b9586a5e-7203-4f9b-86c7-fc65cbda7af4} + {c676049f-3eac-4ad7-8c54-6f23862ed228} - {6bd9a218-5957-41bd-8b50-59b80d95648b} + {b6325e0f-673e-417e-a933-cc41fafa57fa} - {96f3a8d2-4edb-4ff8-a221-2890bec505cd} + {a28943ec-4715-441f-bd7d-56259eda27cc} diff --git a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters index 95caff3ad..bc57ecb1c 100644 --- a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {3c129610-d60a-4dce-8a8b-6e5a8f2c82b9} + {085b1467-f8d6-4e79-b0d1-3d45e142e39a} - {742fe18a-b56f-4ac7-8312-13ed2110d00d} + {73eaaaf8-1bcb-4b9e-a037-c70f5dc987ad} - {de911cee-a427-4bcb-8892-957afaed1aa7} + {cfb3df2a-9278-4744-bb50-bfbe1d2ceb54} diff --git a/Data/ODBC/ODBC_x64_vs140.vcxproj b/Data/ODBC/ODBC_x64_vs140.vcxproj index 825da8c24..b38075e45 100644 --- a/Data/ODBC/ODBC_x64_vs140.vcxproj +++ b/Data/ODBC/ODBC_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoDataODBC64d PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_x64_vs140.vcxproj.filters b/Data/ODBC/ODBC_x64_vs140.vcxproj.filters index 4f4d2b879..efd7b0c6e 100644 --- a/Data/ODBC/ODBC_x64_vs140.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {8c6c030f-1e08-46c8-a5e0-ac6a3ea78171} + {042fc032-b2af-4426-8b11-93bc4e13d453} - {4795876d-fd53-491f-804f-f18246eb1aa0} + {99aca2ee-3a43-4f73-a844-5766d443e399} - {142d4770-b6b3-439c-bd06-2dd8dd423b8a} + {547188ca-f576-495c-bd1e-d7bcd5886121} diff --git a/Data/ODBC/ODBC_x64_vs150.vcxproj b/Data/ODBC/ODBC_x64_vs150.vcxproj index 5ad61024d..6794c5e02 100644 --- a/Data/ODBC/ODBC_x64_vs150.vcxproj +++ b/Data/ODBC/ODBC_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoDataODBC64d PocoDataODBCmdd PocoDataODBCmtd diff --git a/Data/ODBC/ODBC_x64_vs150.vcxproj.filters b/Data/ODBC/ODBC_x64_vs150.vcxproj.filters index 4f4d2b879..b46e1a439 100644 --- a/Data/ODBC/ODBC_x64_vs150.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {8c6c030f-1e08-46c8-a5e0-ac6a3ea78171} + {fd6f2fcd-25c7-49dd-9519-1ea82fcb402d} - {4795876d-fd53-491f-804f-f18246eb1aa0} + {edeb8057-decd-4aac-bedf-59392999578a} - {142d4770-b6b3-439c-bd06-2dd8dd423b8a} + {28a68bce-488e-4143-ab9f-dd337ab8e96f} diff --git a/Data/ODBC/testsuite/TestSuite_VS90.vcproj b/Data/ODBC/testsuite/TestSuite_VS90.vcproj index 1bc646eca..8dc4d1bca 100644 --- a/Data/ODBC/testsuite/TestSuite_VS90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_VS90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj index 92328241c..3d9d0a6a3 100644 --- a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -334,7 +334,7 @@ - + diff --git a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters index e79ad0069..13ddd0eb2 100644 --- a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {9383b0c5-4140-425e-98fb-c1f8f260a149} + {5dd0c62a-400e-4588-96b9-7452adfd24b9} - {18f47805-6502-447c-8a4b-8d19b417b71a} + {5b1517f7-9c17-47cd-b7f7-e5bdb773dee7} - {ed71216f-a655-47a2-a4f6-a36934e0075a} + {8125c62c-4050-43b0-9577-2ab9bd9be56b} - {aacd81e6-4dff-4482-99d9-20f47edbfb61} + {d161d431-df6d-4047-84d4-1a839c4ce1a1} - {4db96c1a-cf4c-4791-ae7e-02886087e2ae} + {4b0e7f3b-ebc3-4693-ab00-70fce4e6787c} - {1ed7ce2c-f5ec-4af0-9528-af67f500015e} + {af2ef720-df32-433e-a584-46efbc6a7a4b} - {d905ca8e-4b7f-46e7-b302-a6e9e748faef} + {8bc7d2bf-77de-484a-8807-2d505f10beb5} - {7a720ab1-d3ec-41cf-abcb-ac9d182dc060} + {0ad7820d-9e82-420d-bfe0-cfbc2449f5a6} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj index cea67528b..13ef652e3 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -334,7 +334,7 @@ - + diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters index 462ed615f..9795bb6c3 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {9a9ca7fb-8d61-4549-8e54-ed0d204f02a3} + {dfe2a695-a99f-4d3f-b727-34da88410bf1} - {2a32f1cd-ea9d-464c-a4d1-c070815f2a4a} + {3dceed7f-582f-4da3-9959-ab21c66a0a28} - {bffc941a-ddd6-45e7-ae8a-7e911b411295} + {fb17d90b-5b73-42c0-b715-8531f4278d30} - {ed22e75f-1ccd-4941-80ab-7b677a44bcca} + {107e80b6-2529-402d-8044-17cb6ce558e6} - {00a35377-d5a0-4b8c-81a0-74193a69b1bf} + {54de5d80-0802-420d-bd9b-99a144922ad6} - {dc50d4e5-4213-47e7-a741-7606c49fbaa8} + {889a7a33-7f36-4dce-aae6-b1fe93ad833b} - {1c3bb517-893e-4c74-a219-a449caab4699} + {cbd40839-ff26-4fe0-a20c-30d86b5301de} - {a0fdf6d6-324c-4e2b-8f6e-9f114f9d405f} + {1822d2ed-943c-4349-a262-3b2df724382a} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj index cb93037bb..8ffddb1ed 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters index 14c22456f..4c294b691 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {4257f5ee-92b5-4300-a5c5-8c4da65415a3} + {cd2050be-9828-4918-90ce-ecc2a5acd0d0} - {e1fc8265-54aa-4649-9d7d-80181be06de8} + {3a029714-b97d-4703-9ef2-ba2c8d67ff9a} - {bdefdf01-71be-4c08-8c6a-03a6d89e792a} + {1f0f9715-103c-446d-b2a3-f8df1e020ea2} - {115cff5b-53b7-4b4d-a55f-b5f6fb046204} + {1c19af38-aa12-4ad2-a780-826250a2a28a} - {f9caec67-9aab-4ecc-9051-5633ca376c22} + {daa1de56-b939-44cc-8725-bfbbc47f769b} - {884d4a12-63fc-476f-b42a-d7115c9635f8} + {8ab1ef47-ffdd-45d8-a76b-2d07e56273f7} - {f67e8462-8118-41f3-920d-7aba606b3882} + {dd041c46-a0dc-4b48-b1bb-6ab2e3fac5db} - {d8a20f87-f489-433b-8376-b4bab8815760} + {acf6eea5-d849-4da1-8182-48f2e09a1366} diff --git a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj index 51b236cb3..a91edcf4c 100644 --- a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters index 82e2522f4..066ff7518 100644 --- a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {4df06dae-eebc-4c82-bee3-c874bce4d955} + {a9d5b620-0ae8-4b16-97d0-8dade44fa4f1} - {3ea9cd99-99ee-4bc2-adf5-fd23fd7b32f1} + {ef1578b3-0594-484e-a8a6-4ccf09e5cbbf} - {e000ab67-ccba-4f48-9333-0b3382571b69} + {e708fa86-9f2c-4b68-b9e0-efe8fb921cbb} - {45926fd3-d826-4f0b-90cf-13183a6b79b0} + {32fa5817-8f82-4a77-b8e1-10b6bb547439} - {b3e088e4-9d59-4324-a120-e910920b2fd8} + {c93a04ca-0269-4527-ac39-27ed3a0fd7a6} - {0289a81f-2d46-46a2-bbc1-c831bd35608f} + {04a4d009-4b58-478e-950f-33512a55d4f6} - {bf50fc4b-c2a2-4801-804c-8c8f9602522a} + {3800fdec-31b3-4785-bc2f-51dea38d29b5} - {e9ea6811-16b6-4476-968f-837211de764b} + {65dfe213-1e02-4b59-8c1a-60e895939bfd} diff --git a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj index 6e3f96cc9..97d4a6ea7 100644 --- a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters index c46ae171b..7f0d57ef0 100644 --- a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {10d4a8f6-f796-4fb5-ab46-57e2b8688fcf} + {296d1eae-4cbe-488c-8570-c252fc17f927} - {94ac2aea-03d4-4be9-adfe-22615aea3b24} + {0b7bae8e-50ae-4004-8223-bffb0c69e0b4} - {6f4cd591-3a2b-4f7a-a50b-ec26d5af1c24} + {4520ee06-10d3-447f-a331-9b2a6aa4a937} - {15d370ca-b11e-418f-8f76-e8d23b182c3d} + {b62e8ce3-8d8a-44cc-bbdd-0e218cd9f64f} - {592daf02-96df-4d98-85fe-adfd511d2e2d} + {5e7556fc-d001-4755-9105-6affd63082d5} - {64b7efdc-a670-4c5c-b0f2-a54f14d5a7ff} + {afbd747b-b823-4ac2-9b36-6e144cdd81bd} - {25771d45-c442-4208-86b0-b923e37ba449} + {5df335a1-4779-477e-9788-8817538e1440} - {b3b27ab5-f49b-4d3e-9109-b8efef995e1a} + {2e263f7d-66b5-4e2a-b9f0-d1f0930ef865} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj index b4a69dba5..25b9b807a 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -334,7 +334,7 @@ - + diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters index c2905d6dd..c1dadb145 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {2c7e0a70-f475-45bb-869c-56be77702351} + {14bee51f-ec6e-460f-8fd7-ca647ce1afe7} - {15950b88-4e72-45ec-bea7-108679e42275} + {31ad35ab-9792-4a5a-bad9-9d181abdf05e} - {afdab025-a11a-44b6-9a8b-01aeee5774ce} + {965b189e-87a3-477a-8e48-0adc6dbb31a2} - {a934e909-ac67-44f4-b10b-053abe8cfa2b} + {0709274e-13c4-434d-91bf-80541f299fc8} - {6f794284-16a2-4119-ad0e-e65b8a61446d} + {b1e434a3-cf55-4559-a3f5-540c0ba5b2b2} - {5926940f-9e66-4f30-886a-3dd234509bb8} + {6d85760d-9bb0-480e-b8e3-2de8bca10dc4} - {5b6afddd-82c8-4552-961c-8ebf35cd88f4} + {c9461886-05de-4759-ac1f-1f393860cfb7} - {8a0d176e-95d6-402b-bac1-349b18e23a56} + {eb0f0e87-e7cb-43c6-bd5f-a23e34be8e1d} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj index 6fa1f0329..d6353084b 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -334,7 +334,7 @@ - + diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters index 8e460a495..ec1bbfcbc 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {2a8e2426-ecbf-4acd-af6c-7e460aebb0b0} + {74f7cd2b-bb66-424a-b879-575e46f8065d} - {6339412f-0e9c-472c-b722-91e70615a37c} + {e54cfe9c-395b-4fa0-9c92-2acaaaf5ab28} - {5d486d82-40f8-4247-af96-d5038af083c3} + {cd16e3dc-247d-469e-95e1-c4f91f3ca25b} - {7fad9f6b-bd83-4679-926c-b957bd7c6019} + {20ea9db4-f370-4321-bc4f-a65986c9e39a} - {5a5d43ca-eb53-40f3-bde6-742155276dcd} + {8f2df928-ea10-47e2-b508-f9b66976a995} - {5d70310d-6aaa-4e34-aa80-40fe55152f43} + {157b54ea-1f36-4f2b-b31d-a01f7605ba22} - {e3a11d2f-3a6b-4bfe-85b3-ef41b5a106ce} + {07cfa525-521e-4f99-ba18-9446fe1c7df4} - {07f3ce66-792b-4ee5-99dc-6c813611a1e4} + {ba02ebfc-0956-41af-a567-a41c76e70cf7} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj index c3572f8f3..c5bb5885e 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters index 4d0f1da12..0742607dc 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {11643162-7779-4671-afc6-0ecb1e90e4d8} + {5abd0be4-4644-4820-9773-274b5645224e} - {8fa8dc9c-577d-4a1e-9100-3f248695dd71} + {02d6e074-d96c-4b0d-8cb6-343a92c8bba6} - {41783aa4-4b6e-4e2c-b1d0-9a39c55e991f} + {85dfa446-e3e0-49d8-ad46-4391217cdac3} - {97a3be97-3c14-428f-92d7-703e4f3d437a} + {58d50537-8b0c-43f3-b5d6-382f506ba438} - {aaa3aa55-ff08-4e16-9f67-f4cb8e22fafc} + {8b7c8288-7e58-446f-aae1-526ed5c3a2d1} - {397cd0f4-0817-4255-9634-0b8f19840ee0} + {d60f0a2a-7a4f-4200-bd0b-7189a0de2b90} - {ebcea8c2-4d48-4fd8-8bed-907c14ddcdfe} + {bc628091-c79c-4eb0-bb7a-b9a043194527} - {c1bb1f30-40f9-49b5-833d-b5bcb7a27fa7} + {35ac10c1-f447-4e1b-b3bb-26d7c933b282} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj index a6854a9cf..fff47f9df 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters index 5748b7dfa..d3c937a71 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {007b21c7-5371-4193-b8d8-ae6ec943bb24} + {8ab601aa-5e4d-448a-938f-35b914a86c5e} - {46710613-c9c6-4062-b462-2a205da4553a} + {7c5c81de-ddd7-480e-a948-170e608fd3cb} - {e5b051cf-76d1-4c9c-a762-a8aee434fba9} + {3ca239a5-a66b-4f4d-ab99-35c88dc9393d} - {67095694-629f-4207-875b-da6ad4bcf3cd} + {a6c93e7a-53e4-4b01-802b-5d699086b70c} - {86353180-636c-4b46-8030-633ba2c22374} + {4ac4043d-5648-4460-9ca1-7882e3a25bca} - {9fe805e6-974a-41cc-9e51-2b3378d2bd55} + {4936075b-14c5-4a3e-8816-04e5c19db8bf} - {d5a6d90b-3a7a-430b-aa9f-a681e4cd9420} + {a3621585-1dca-46b1-b382-54691914d656} - {1320f67d-cb7e-4517-aeb6-7262d45bde3e} + {3950487d-3aee-4129-82f2-7f1f8dc16db4} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj index 88cd48954..0dcbc5670 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters index edd440e60..198590b4f 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {0587e5fd-a675-4bdc-b4b5-6c8551cc31dc} + {303fbfcf-f1ac-40e9-9651-ae6f6f87e7d3} - {83c5a7c5-10d6-40a0-9a12-6b760a27f1f6} + {1bbbf7ac-7865-4c2d-ae73-3136226926a4} - {b77fb9f3-914d-4508-a82e-e417a42bb2e1} + {a487a6ef-e9d8-4042-8a72-5a89f3737df4} - {7afd6155-8b2b-440f-ae9c-2143eb825a1a} + {47dca9f5-5928-4164-8d80-f3a54895598a} - {683a6918-0709-4c8a-a5e3-1c2e40efb8a2} + {5e71d2b3-a13c-485e-884f-acc3e198987d} - {bd70290b-2147-4738-8ddb-904c5bb8e359} + {ab77f342-779a-4a11-a5ec-82c7e51fd1cc} - {1ca8fa79-6c14-4568-af2d-d50d72c1c67e} + {bf5cc629-5b89-42a9-9516-fac492f0a37d} - {bf471a37-1017-4ca1-a5e4-bb80d491343f} + {8576fc64-2e86-49c9-85b7-186adbe141dc} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj index 9bd9a05b1..dad8c953a 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/PostgreSQL/PostgreSQL_vs150.vcxproj b/Data/PostgreSQL/PostgreSQL_vs150.vcxproj index 48f87ab8e..ec823f325 100644 --- a/Data/PostgreSQL/PostgreSQL_vs150.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoDataPostgreSQLd PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj index b914a6d6e..36533be59 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoDataPostgreSQL64d PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs90.sln b/Data/PostgreSQL/PostgreSQL_x64_vs90.sln index 1d130c67a..7184c7de2 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs90.sln +++ b/Data/PostgreSQL/PostgreSQL_x64_vs90.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PostgreSQL", "PostgreSQL_x64_vs90.vcproj", "{73E19FDE-1570-488C-B3DB-72A60FADD408}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_x64_vs90.vcproj", "{C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}" ProjectSection(ProjectDependencies) = postProject {73E19FDE-1570-488C-B3DB-72A60FADD408} = {73E19FDE-1570-488C-B3DB-72A60FADD408} EndProjectSection @@ -10,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.ActiveCfg = debug_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Build.0 = debug_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.ActiveCfg = release_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Build.0 = release_shared|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_shared|x64.Deploy.0 = release_shared|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 - {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Build.0 = release_static_mt|x64 {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Build.0 = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.ActiveCfg = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Build.0 = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_shared|x64.Deploy.0 = release_shared|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Build.0 = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {4D6E42AE-EB6A-47EB-A186-B8A183FABCF7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Build.0 = release_static_md|x64 + {73E19FDE-1570-488C-B3DB-72A60FADD408}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Build.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.ActiveCfg = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Build.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_shared|x64.Deploy.0 = release_shared|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Build.0 = release_static_md|x64 + {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj index 2166437ea..78c94e533 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj index 53eb3239e..7a2e2b613 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj index b0ad4c1dd..a0fe5af33 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -32,7 +32,7 @@ - + diff --git a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 23d82566c..ac4ca35da 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {43552cc9-780b-47fb-b499-19d145fe8c71} + {aa897198-28ec-4998-8b72-382245dd2735} - {56012b43-097a-455c-bb3d-df3932575d3b} + {102789c0-9cb2-4ad7-80fe-431f58653852} - {b8b10281-691d-4273-9cb3-e6ab16b6efed} + {c7626815-71a6-4122-9a56-cce842ecf9e0} - {7589c784-b903-4afc-8ffb-2ce98134fc42} + {6142a588-cc14-49b3-87a2-3a80e99b8aac} - {4234765d-e9b9-4531-a593-d572378b1f57} + {932f527f-3f29-42ff-b049-e7d7a2a84542} - {12eecc22-a7d5-44b1-9a92-f4d7cca927d0} + {e541abd8-25d3-433d-b655-c4f2d1a73505} - {d994ebad-aa0f-41f4-871c-79c7f7487d40} + {472600f8-cf4a-4175-a3d2-827529fb3cc6} - {9f672dd9-5706-4a4c-9719-0488799467ca} + {304f67f1-356f-4a66-bc35-ff8024e9fbb2} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj index 42c9a3f2f..1fb1bd00f 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -29,10 +29,10 @@ + - diff --git a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 9295295db..095715705 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {dc6d869d-0957-4a4d-b3a3-b0a2052af498} + {1e189d0a-1611-4560-9bef-f9919762d57b} - {64bcf50d-3947-489f-8f42-b7510ee7b1dd} + {1481426b-9c61-4fb7-b4b2-0d4392c96fbf} - {e4f1304d-1096-46d3-94a3-fa2093e60ca1} + {d539313b-9073-4bdf-949c-50c42c8b2f1c} - {587f5310-950f-4cba-b5ff-bbaf69900151} + {b048f657-7523-49f9-9cd8-2c66c235c6a5} - {f9383dbd-02bd-429d-add5-c73138298dc9} + {3dbf1d2c-91fa-44b1-83f3-840d0fe6cdc5} - {9bf123a5-7f43-4d16-9bc5-fc6ded7ce9ee} + {75699732-bb6d-4562-9681-ffcf99b6e495} - {ddcc2725-25f9-446b-8b1d-443b296dbf85} + {3ed07339-c31b-465b-8eb9-e8f5889c982a} - {879357b4-1d42-4395-89ed-d52b6a826d3a} + {a7b300fe-7013-4e93-b307-5e93f569df94} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj index a9e3be87d..8c038ccfd 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +320,7 @@ - + diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters index 0c75a6700..ecec97096 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {f394659c-9d61-483b-af58-f13dfdff85e5} + {ce0eb972-c360-430d-9c6e-6601aa09d52e} - {21e2cb4e-4964-49ed-9741-fa8a7c73ec1c} + {528344c2-d0b0-4d71-a997-426890b76f7c} - {105d72fd-85d2-4cd7-ab3f-0944d32836a9} + {c2ce0849-761a-4c25-8009-055b8aeb417a} - {9997838e-5ade-417e-ab7f-eb50b7318c51} + {6fd61c8c-aea6-4bd8-8d6b-74b559e87361} - {adcac531-6278-4ef5-8b2e-dc1ea7a91434} + {a7112ebb-e6d4-470e-950a-28480d5d8e19} - {959dcbcc-c18f-4d1c-b805-c4283d5abaae} + {2a67f8f0-8df2-42ac-8f0f-4f85b89abf90} - {543a9f59-ba64-4920-a3fb-fba31ded4776} + {141d467b-cff1-48c8-bdff-42608eb3a468} - {f7885305-889d-4772-a0c9-67ae9653a237} + {334c9472-10ee-445d-9457-f3d0c595ff52} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj index 98978c4b0..e550a1812 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -320,7 +314,7 @@ - + diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters index 993309c5c..67fc2eaed 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {8cc283e0-8e14-49a5-a696-c16a046ec49e} + {a79d3243-c385-4bcf-ae73-5a2138444b5c} - {51b38a02-195e-4f83-9eb3-dcf2ba26ffdf} + {36839382-8e7f-4df7-9d18-716d4ed70949} - {7124d40c-e298-447f-844b-3e825a8a5c14} + {134bfdb6-c5b3-4dff-a554-c001e28ed498} - {36ccf3dd-c7ff-4567-95c2-1e73b9b4ff70} + {e4e38cf3-2ef5-4f5b-a4e1-a0f22c901daa} - {2894413b-e4f7-48ff-88e3-b4ae8299f974} + {7fd7f91a-baf7-40c1-829a-c5fcd04766f2} - {12871004-d3b5-4e26-9e4a-72d24d864a0e} + {038ac280-2992-43ed-ba21-9d738d599335} - {c4154173-8ac9-4cd4-8844-2c94ee7ce782} + {a079540e-6d4c-44a1-a892-db654392bf10} - {47792d99-5fab-41b1-8798-fb1773bb3199} + {ea6dd4b5-b27d-4864-bae4-db5da469f356} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj index 7e38b8b1f..ff29ef3d3 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters index 7f91a9fc4..e44e8beca 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {8efcf4bc-f6b4-47af-a152-9cf0cc8aa05f} + {feb4c82a-4592-4477-b9e5-d48d55b13df8} - {e3fe6d0f-231d-4811-98a3-39da55aea115} + {d779829a-5acf-4a94-a7ab-c0dc2ad45c08} - {7f889579-0547-4268-a280-413f0dd8e5e0} + {66804ce6-5013-49ba-a2a5-c67f0521ee72} - {6b93073c-b7d5-430d-9dae-0761a364592e} + {58f534d8-0441-4133-8f44-6b4f7cd1f963} - {e9a844d1-48ae-4b82-b1bc-e2e814c7ade8} + {38d7cb33-5b9f-4c7f-b042-a59a305f3b95} - {6fe0ab24-1b4a-4b3f-9fce-a8a9d327e1a9} + {ed44a0ac-ef8e-40e4-b502-96b6c5e8a168} - {23bdc739-59e1-462e-862d-353c2b2a5306} + {ec2b70e5-7520-45c6-b64e-4ecd617f1c10} - {6b6901cb-6fea-43af-8683-fb3c95a6cdd5} + {40802448-f4e0-4a8a-91ab-a6bc073ca61b} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj index efdf45af0..7e6da7c23 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters index 8ee8d09f4..e4cac81c7 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {7b1acee5-5296-4f10-bf36-172809b66c22} + {5bf43a25-d466-41a2-9e48-c60a568dd17a} - {3c725758-3ad0-4843-b966-96626852c80a} + {d1febb30-8cd9-4097-bef1-b855edb8037e} - {c4a35434-54c5-4c9c-94cb-9e871e456dd0} + {57e28629-cebc-4671-99fe-1eee7a6d97eb} - {39ca2d3a-2eb4-4174-8006-588fd39e9909} + {8522b809-2d22-4522-9e76-83c235e108bc} - {cb85c79f-03fa-4ab3-b222-e9e4a3f225a9} + {ae2ae580-dee5-450e-8110-095f770d33ba} - {cf4a8555-4379-451e-8b9c-57ad1ebc7e4f} + {c68a9488-ddc8-4ce3-a125-4a5fe135fee0} - {94bae749-3d70-4a21-8e08-051e3c4e4e46} + {b180345c-b75d-4339-993a-eba2a379ed02} - {0bd8ebee-6b8d-48e4-8717-c26aec99602f} + {feae5d72-ec3d-47b8-9767-6803d2e6c902} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj index fa36f847e..938e6ca51 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters index 632b8445f..c478e8eb0 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {0c1a3b88-dfaa-4c2c-80f7-330e7a300c75} + {8a73f8cd-1669-416b-882b-ac5b65a6fd3f} - {af978351-e068-4122-bd28-32b925fc9f01} + {608b489f-dd52-41b3-9df0-23a7a432141b} - {7bf0b4aa-6e3e-4b37-ba0a-b950586b7309} + {ae234ca9-6cf8-404a-a271-ba229fb47399} - {b4a5ba6f-32f8-4411-ac07-8594b86eeabd} + {b673792d-eb33-4c50-a4bf-6422616ae3cf} - {1865411e-368c-40af-8a00-ecce023b84ac} + {27d0cab6-39d5-436f-aff8-85b8cf443759} - {b58850f9-04eb-4aca-9229-3e7651bcad64} + {2ffd9064-e775-4d11-8acf-4e8595f67e94} - {452a9c98-a6e9-453f-8bbd-f6e78df35ca8} + {fbbd755c-578f-45b1-9ee3-ca9e5018c54b} - {5f00199d-548a-4d7f-a400-ae07db5ecd36} + {5b1af651-332e-4ac2-b87c-f417052d06ef} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj index 010bf3c95..50d07f0e9 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +320,7 @@ - + diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 3821abc64..9dc2007d5 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {be13f2db-6c5e-4861-a256-2faf61970550} + {5fb68052-7f51-4cca-af3b-661bd9ed6676} - {4642a443-11bc-4f38-af8b-be58cf335051} + {71dc0928-3c72-4f6a-9b30-681156934322} - {d722c234-9f73-4629-9943-84c7b9c1a7fa} + {7d28ac5a-7e9c-4875-aaa1-f7606bb0c6df} - {8ee70ed2-0d03-4403-9023-bb912b8e3fce} + {15733f0c-d4c7-4dc9-b447-07dea14c4658} - {43baa5ce-3456-41f2-a8d9-0c5cd2b205af} + {850d74a8-cccc-4daf-8fa0-1352b57d7a50} - {dadff1ba-ba22-4018-8a9b-95b653e86a01} + {a693f23f-2570-4a69-93fb-9fc89e23a097} - {a1eba761-00a4-4837-8923-9edf1ac62d2c} + {5aae364b-f9c1-43c4-aab8-eb5f57ef788c} - {7d0b72bd-2846-421c-b479-06c3382c6eb3} + {cdbee3ab-48ef-460f-9c70-69d7a0c9c741} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj index c239afeb3..d239be8f3 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -320,7 +314,7 @@ - + diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index c30c89dbd..26e3ba1df 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {3d9c7891-d9e2-4112-81fc-3a4f17b6144e} + {83016003-f6b1-4b64-b6f2-5f7783795071} - {ccea5682-4f13-41bb-aa30-fd4f82048c5d} + {59a04cbb-baa1-4e12-851d-9fd245b25577} - {d9f24c08-8b4e-458f-b874-587601dd063d} + {75ad78ed-13bc-489a-80c5-896b11035828} - {f6838511-0964-4abf-9b28-48f26d93ae13} + {4a677a30-277d-4bbc-9038-3e3210dabb64} - {dcaf40ca-fa37-4616-afab-7789c3bca65d} + {8da4e3ba-8411-4733-bd04-c6952df36336} - {1c85ce27-ec0a-4eb9-92c4-c068b11aab14} + {6c8e1f25-4038-416f-8133-e72c91642723} - {5b68fb31-cf5e-4cd5-a171-f88cd44b6112} + {199adccd-7fb0-4b73-be14-887dcb56f0b7} - {91daec91-8d35-432e-8a7c-482c5ea5432b} + {6383d8b0-df4f-49f7-950b-3190c7528fd9} @@ -47,7 +47,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj index a0c0ff973..e5052a943 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 65f449433..30c2946a1 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {6e541911-f456-4ad8-afe0-911e4a3e0f5a} + {fc04cd71-7a46-40b2-8033-278c71f9c0eb} - {f81f8824-d400-4067-b959-af22839e9ef8} + {a01babaf-a3da-41ea-a8f0-bd12e3a34e8c} - {43951eb9-b2c1-4b73-aa28-3445a02f9958} + {3ff32932-3f61-4ad8-9971-52b352205b63} - {ccf4ddf2-6be1-4b9d-8d4a-2ac66f5d7220} + {1b3fad52-bc5f-425e-b3b8-db1b33f38dc5} - {c2b7cadd-1126-41cf-8e4a-8d999242ec42} + {8828be15-1a37-4894-8941-1a23afdfd3ed} - {8aa49be1-db45-4d91-bc72-1f472bf51b5c} + {0eb95244-5273-42a5-b56d-0a55a1acb574} - {65eb0643-9f25-4335-b64b-673a9aabfcd2} + {a3cb3bd7-2337-4fcd-9b6f-32ad072488d5} - {14343a38-d290-4d63-b9c9-d35916f4a363} + {a175764f-ea94-4f78-a688-f9668934fb59} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj index d3cb0aa6f..026bb7509 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters index 75c88d3b6..2fb13c6b5 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {3870954e-8c87-45a1-a0de-5935e7275487} + {0d26f41e-fe38-4411-bd82-231e410bbefa} - {95a8da48-ec3e-481d-9108-199c2bf9f1ca} + {7f41bd15-73f6-4dbd-9d6c-e4cc22024d9c} - {3a4aecaa-b0ee-417d-8e30-ca7c56729de0} + {17b16324-4228-4737-b897-be62310e2d21} - {147f7b5d-f5f0-43c8-b744-f1c5233e77fe} + {d4110d3d-27e0-4e5e-84c0-4bf199c3e3c6} - {c9c31c78-dbde-407b-9ae5-6d97023a1a9a} + {5038dbf9-a17d-4cc2-b744-b63ddea5f7ab} - {657ac368-1d64-44a4-8c46-b0ea32b02813} + {809d7e27-cf4c-4ea0-b441-7938e6b82070} - {e3c495f7-ebb2-442d-8f69-48dd34c6993a} + {7bd9a5f5-e347-4fb4-98ae-86d59911360c} - {acbdd088-8099-40d4-a390-cfc9a9ff1e50} + {85401f09-072b-40d7-9519-909fdc7fefb8} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj index 0f515f39d..36588d1e6 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters index 13761660c..a1d2b4154 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {ea3e653c-8207-4df8-a906-c0e2936f3d94} + {b973d4c6-8604-42ea-93d6-91fc9cd2d23c} - {3e39046f-cd24-4edf-affa-39a7c3d52414} + {5ea1ea1d-a003-4dce-b603-c1f1960907fa} - {dc3a6300-bcd0-4163-9bd2-090ce8031268} + {ae38f324-2d07-4af3-994d-63b5b14f43f4} - {afc767f1-e88e-4206-9c74-038c4407acdf} + {e4d1e6c4-a175-46ee-aa49-1bcd135080f5} - {39f5b886-ed55-4494-85f2-5b87b31251fc} + {bb71e23c-af79-40ea-90be-8f909f84eb9f} - {4f165544-5842-4373-a7f1-829433566e0a} + {185ba33d-f134-4ad4-ba30-797b714c58d7} - {dd7d0648-2c8c-4475-bd3d-4256957bb2e5} + {9a6edfa1-1ab5-4ef0-b61b-c799ba2c99b6} - {a4ad33b9-f7bc-4229-b112-b2003382519f} + {9a1bedfe-f41b-42c6-a183-4e8f428e7cec} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj index 92b80a5a5..b3c411c93 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;_CRT_SECURE_NO_WARNINGS" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj index 2940ca0f7..13181f4c0 100644 --- a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj +++ b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj @@ -1,268 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - SQLite - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd - PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt - - - ..\..\bin\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - true - true - - - ..\..\bin\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - false - true - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\bin\$(Platform)\PocoDataSQLited.dll - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\..\bin\$(Platform)\PocoDataSQLited.pdb - - - ..\..\lib\$(Platform)\PocoDataSQLited.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\bin\$(Platform)\PocoDataSQLite.dll - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\..\lib\$(Platform)\PocoDataSQLite.lib - WindowsCE - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\..\lib\$(Platform)\PocoDataSQLitemtd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\..\lib\$(Platform)\PocoDataSQLitemdd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemd.lib - - - @@ -274,6 +12,29 @@ + + SQLite + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoDataSQLited + PocoDataSQLitemdd + PocoDataSQLitemtd + PocoDataSQLite + PocoDataSQLitemd + PocoDataSQLitemt + + diff --git a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters index b7692b308..70fa8c3ad 100644 --- a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {f000a771-063c-4d8a-8020-3a7af3aeff3a} + {6ad17cfe-92ce-4c66-b775-325ded72246f} - {91229eb4-aeec-4136-8fd6-c9473a054521} + {bff62d6b-5043-4e89-b72a-96cdcb7ecc9e} - {27334953-a26b-41d5-8d06-44e63038771f} + {46ea7d56-3171-49c8-87b5-19e20779140e} - {0092bf9f-0aee-41e4-b41b-4213460dacd3} + {47bb1598-f30f-412f-b8f4-e06b50250978} - {f32d2593-1855-4342-bdcd-2b4d3d5a0599} + {23388edb-fb43-403a-8cda-175ac328c7e4} - {83df488f-41e4-4dc6-917f-63c440414723} + {ffb1d98c-1062-4084-8f65-bcbfdd9001db} diff --git a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj index 86a4ef292..53c5ca63a 100644 --- a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj +++ b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj @@ -1,268 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - SQLite - {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd - PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt - - - ..\..\bin\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - true - true - - - ..\..\bin\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - false - true - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - ..\..\lib\$(Platform)\ - obj\SQLite\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\bin\$(Platform)\PocoDataSQLited.dll - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\..\bin\$(Platform)\PocoDataSQLited.pdb - - - ..\..\lib\$(Platform)\PocoDataSQLited.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLite_EXPORTS;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\bin\$(Platform)\PocoDataSQLite.dll - ..\..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\..\lib\$(Platform)\PocoDataSQLite.lib - WindowsCE - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\..\lib\$(Platform)\PocoDataSQLitemtd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemt.lib - - - - - Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\..\lib\$(Platform)\PocoDataSQLitemdd.pdb - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;SQLITE_THREADSAFE=1;SQLITE_ENABLE_FTS3;SQLITE_ENABLE_FTS3_PARENTHESIS;SQLITE_OMIT_UTF16;SQLITE_OMIT_PROGRESS_CALLBACK;SQLITE_OMIT_COMPLETE;SQLITE_OMIT_TCL_VARIABLE;SQLITE_OMIT_DEPRECATED;SQLITE_MSVC_LOCALTIME_API;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - 4996;4244;4018;%(DisableSpecificWarnings) - - - ..\..\lib\$(Platform)\PocoDataSQLitemd.lib - - - @@ -274,6 +12,29 @@ + + SQLite + {5B889CE7-AD42-4CFE-BBC3-532B61F8329E} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoDataSQLited + PocoDataSQLitemdd + PocoDataSQLitemtd + PocoDataSQLite + PocoDataSQLitemd + PocoDataSQLitemt + + diff --git a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters index b854ed5ae..393e364aa 100644 --- a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {d9e663e6-1349-41ea-bbad-5a3f19b0d780} + {6f6882e2-4afb-4b58-a31f-74da03a4521e} - {e198e70f-3f19-4045-af9b-d0e33327183e} + {dbe6caf0-1001-4262-9cef-8610695f4763} - {c19bc426-2cfe-4d00-825b-9b5c8b6a38ff} + {aef179cf-1cb2-461a-808a-7bd941390941} - {a9db3efe-6c25-420e-a023-d17176d10dc6} + {a5da3040-fe4c-493c-8269-6452c277f673} - {34c09bed-463d-4428-be6a-269c53c8da90} + {74775ad7-39ca-4ede-9a53-851a7f6ab574} - {38ee66ff-f246-4849-9255-1541d99002a5} + {0dc26a2a-5807-4b46-8734-56baaedec8d4} diff --git a/Data/SQLite/SQLite_vs100.vcxproj.filters b/Data/SQLite/SQLite_vs100.vcxproj.filters index 4a2962ba5..2725a1ae5 100644 --- a/Data/SQLite/SQLite_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {ebb75a17-c232-490e-814e-462d50727a9a} + {19106b97-a7b3-4ec0-bd03-b71a6ed7abc1} - {4cf664d4-0ea7-4d95-9db5-d1f8e278aa50} + {2a6e1c13-0d3a-4983-9a09-b60989ec0952} - {fbd50fb0-9426-4678-a010-0e05228b3fe3} + {3ee7b58e-f519-476e-bbeb-5c5053193dab} - {e7858fcd-a642-4f91-a28a-8315bd2bdaed} + {58154d36-7978-4f18-a797-34616ca05b8a} - {34ae1a2a-5ddf-4a58-a53a-071643c5600f} + {e3187b32-0916-402e-8014-7a15cbb2bf28} - {87bfac33-d5f7-46bc-a1ae-dca63d9df28a} + {0b4f66a8-377f-4d7b-b2bf-1f032b1a2393} diff --git a/Data/SQLite/SQLite_vs110.vcxproj b/Data/SQLite/SQLite_vs110.vcxproj index 3f2166415..67c704ad9 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj +++ b/Data/SQLite/SQLite_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoDataSQLited PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_vs110.vcxproj.filters b/Data/SQLite/SQLite_vs110.vcxproj.filters index fcf2bc8e6..edefba304 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {2899e15c-e3a0-4515-accd-5fd021ad8af4} + {22dfeba9-aaa5-4f82-9f59-dad0506ec547} - {35a702a2-8ca9-433f-8afa-1b44765aba3e} + {f9e4c6cd-c6be-4fd9-8156-7ec76b2a48cd} - {2b322b60-a599-4f15-be26-6b8d85793d61} + {9eb26f76-c640-4b96-895e-bebdb73648fc} - {101c6240-fee7-4efc-8fe2-85697cfa7022} + {bc3a5f88-8b2f-482a-bb67-35e5a52c126e} - {0fb51f3c-342a-4e4f-b36d-98c5994cb9a3} + {908a7f35-444f-4bbb-8bab-a7e34f348516} - {5e4c1d4e-6cb3-4360-b98c-b26730e9354a} + {fa0cfbdc-3903-4d69-abce-4b14bdaac130} diff --git a/Data/SQLite/SQLite_vs120.vcxproj.filters b/Data/SQLite/SQLite_vs120.vcxproj.filters index e9e94f5b5..c187f6f61 100644 --- a/Data/SQLite/SQLite_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {c495a631-ac08-4a04-8099-ea02d0da8140} + {9d836dd6-02ee-4c3b-8bf1-a4b772233f12} - {85549b0a-1c68-4df0-86d5-8de81bff326b} + {b04e88e9-d07a-46ba-bfec-07c8812655ab} - {6f34e149-170f-4927-a7a1-9228d747350a} + {dfe185a4-0f87-42a7-bda2-9634b64108c6} - {f68edc9f-7217-4fc6-a1ec-6a447cfbb056} + {cac50b4f-4783-4708-8d0f-52de67b17f52} - {403c4ecf-f4a2-4380-a282-3caea60e6fc7} + {141609fd-ed65-43ef-b1ca-b010fea27010} - {3e6f8cad-cb7a-4416-b99a-74e2cd518838} + {6a2d056f-fd2e-46fb-8ce7-97cbbe7b9612} diff --git a/Data/SQLite/SQLite_vs140.vcxproj b/Data/SQLite/SQLite_vs140.vcxproj index 95b73005a..84410bea5 100644 --- a/Data/SQLite/SQLite_vs140.vcxproj +++ b/Data/SQLite/SQLite_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoDataSQLited PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_vs140.vcxproj.filters b/Data/SQLite/SQLite_vs140.vcxproj.filters index 070062c01..da6e4e110 100644 --- a/Data/SQLite/SQLite_vs140.vcxproj.filters +++ b/Data/SQLite/SQLite_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {c70ee70b-9af8-47dc-9103-8c979b955127} + {d3bf8ad2-af4c-432b-8591-5c902c19b8b8} - {eaee544d-47b9-45cb-a21d-a14480e5915f} + {df126619-afcc-4280-91bf-68997c12c289} - {5eadd687-b740-4123-bebe-a239656d4707} + {1bcbfb7a-aeb4-4121-939e-ca20fe59232e} - {b7e5baca-6e14-4e7e-9591-e6d8b9bb3e3b} + {2c657904-5687-4a64-b382-b71684d6f0d5} - {c04da463-7b2d-4202-a459-231320d03e2c} + {67639195-f1fd-4b26-8e87-b43dbf30ab98} - {29fe7b2e-8047-47e3-846d-c0f1cc0889b6} + {1dca2949-2fd0-49b6-8c7d-880c4374165d} diff --git a/Data/SQLite/SQLite_vs150.vcxproj b/Data/SQLite/SQLite_vs150.vcxproj index 9aed46012..855dc26a1 100644 --- a/Data/SQLite/SQLite_vs150.vcxproj +++ b/Data/SQLite/SQLite_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoDataSQLited PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_vs150.vcxproj.filters b/Data/SQLite/SQLite_vs150.vcxproj.filters index 070062c01..9436317c5 100644 --- a/Data/SQLite/SQLite_vs150.vcxproj.filters +++ b/Data/SQLite/SQLite_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {c70ee70b-9af8-47dc-9103-8c979b955127} + {c046f557-7646-4f08-9ce9-e3378085b62b} - {eaee544d-47b9-45cb-a21d-a14480e5915f} + {f527a76d-c01b-47b5-a1d8-253606327ba4} - {5eadd687-b740-4123-bebe-a239656d4707} + {fac626ea-c86a-425b-85b9-98f416ad34ac} - {b7e5baca-6e14-4e7e-9591-e6d8b9bb3e3b} + {3bf050c9-40b5-4f15-98f3-2c22e2651049} - {c04da463-7b2d-4202-a459-231320d03e2c} + {239b1a8b-8063-4e30-9bee-c9eb0e9ae452} - {29fe7b2e-8047-47e3-846d-c0f1cc0889b6} + {25bd32fe-6981-47c2-a4a6-154506536e87} diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters index 9ccfb5433..4ebab8960 100644 --- a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {2b98f96d-f649-439d-841e-340a78f7ee41} + {d9314398-8d01-42d3-a7a0-886c0f3ef93e} - {1800f3cc-4cdf-4da5-b9f4-11915b3e2609} + {80e8f75b-6eae-468b-9663-3467fbbb2d1a} - {49546373-c448-4ed5-a14b-44d337d06ba0} + {714b727c-22ae-478f-8460-279110b1b368} - {fae35a09-ca9c-43ec-b420-4a182552c622} + {392d175e-ab5a-4f87-9ff6-3a6876897074} - {2c1a8e4e-f459-4a06-9c94-f907e9f8b9da} + {cc4e28d3-1efe-45e3-bbb6-3bcd4d48d934} - {7cec44d0-2454-4e53-91e3-7b2fc47a3d1b} + {a3cc1c8b-8563-453d-a163-80318e7400d3} diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj b/Data/SQLite/SQLite_x64_vs110.vcxproj index e1ab6d3ac..587acb1a6 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoDataSQLite64d PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters index 6cdcee12e..fb664fb08 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {1761e79b-6bf8-4529-93dc-d4f136c346f9} + {60bed258-ef4e-4612-916d-c40edae5fb69} - {db6785f3-8d55-49b5-95e8-974b33625704} + {8d5a01d8-0002-456b-aaa2-892779fd25f5} - {63c16b64-b9ff-4884-a17b-935c4a6fddc1} + {59485c93-094f-49fb-a275-02c38b732621} - {ece120ec-5aef-4b70-a3dd-93003d3a97b1} + {f23b9ffe-50ef-42aa-877e-11ab12489217} - {3d4bf34a-1246-44bf-a6d6-72690f0a0d65} + {0f683511-6abd-43b4-9efa-53b022f0a599} - {24334ce8-1317-49ac-8856-b736abceacda} + {37d9857c-be83-49d1-b505-31de8e562772} diff --git a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters index cb4058413..8706d1094 100644 --- a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {b4ea06e4-3a5c-473b-8dfa-966f84495298} + {96698a27-581f-4b7f-ba81-e2c0fcbcf07f} - {00ee5e7a-ad2c-4b42-b7c5-acd66f7f6206} + {5624cb96-971f-41d7-8114-3e620e76a483} - {3cb05c7a-9775-4c89-af83-6004c8781f85} + {f8b77356-9f4b-4468-885e-ff8edee116d3} - {8e54e907-aca9-44ae-b895-b58fd6216cfa} + {5b49545f-6552-4afc-ad40-8e072766b026} - {637846d6-8f08-42b0-b7b7-028250f88898} + {27bb50ce-93d5-43fd-be6e-bd406fbcad3d} - {7fd93c88-ca00-4371-8d3e-892b1bbddc7f} + {5343b431-63d2-4911-af83-2bbe9fc1b4d8} diff --git a/Data/SQLite/SQLite_x64_vs140.vcxproj b/Data/SQLite/SQLite_x64_vs140.vcxproj index 1274b1fac..bd520611a 100644 --- a/Data/SQLite/SQLite_x64_vs140.vcxproj +++ b/Data/SQLite/SQLite_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoDataSQLite64d PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_x64_vs140.vcxproj.filters b/Data/SQLite/SQLite_x64_vs140.vcxproj.filters index f3c4843ab..12b68a7d1 100644 --- a/Data/SQLite/SQLite_x64_vs140.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {2169dba2-5cba-4703-9af6-3efadd96027c} + {c61d2885-58ec-44af-ac9b-1a92dad9173d} - {170c969c-bba3-49ca-8cda-7c8bdc27f52d} + {c4c5d677-9e8d-45e1-8b80-fd08a6dbdeb8} - {690e51a5-b0d1-49ed-ab30-42465cddb2f7} + {6fe63675-b894-4852-b780-de04ec25d38b} - {739fdb52-aae6-4699-8337-95a0e65ffe36} + {40490d1d-c8ea-494e-908c-1af4e74ed618} - {aca2c992-4a96-4efb-99fe-998a00e3313a} + {34b9b4ac-8d4b-40d5-a542-d1ce1c6332bd} - {5e79c6ac-d55a-4be6-9fe0-b307cfc61337} + {dd0bb630-2650-4e45-81b4-8d52bb792f84} diff --git a/Data/SQLite/SQLite_x64_vs150.vcxproj b/Data/SQLite/SQLite_x64_vs150.vcxproj index 42ba46da2..34a4fc1e6 100644 --- a/Data/SQLite/SQLite_x64_vs150.vcxproj +++ b/Data/SQLite/SQLite_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoDataSQLite64d PocoDataSQLitemdd PocoDataSQLitemtd diff --git a/Data/SQLite/SQLite_x64_vs150.vcxproj.filters b/Data/SQLite/SQLite_x64_vs150.vcxproj.filters index f3c4843ab..b3e301118 100644 --- a/Data/SQLite/SQLite_x64_vs150.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {2169dba2-5cba-4703-9af6-3efadd96027c} + {65aef071-96de-4feb-8bce-4cf7f277b36d} - {170c969c-bba3-49ca-8cda-7c8bdc27f52d} + {8e0ba5a5-c131-4f54-82ba-9b18c12cca7d} - {690e51a5-b0d1-49ed-ab30-42465cddb2f7} + {d27f6ece-cbaa-429c-8bc9-28dfc8dd7815} - {739fdb52-aae6-4699-8337-95a0e65ffe36} + {3f5350eb-e800-4caf-be39-005d1bf10d60} - {aca2c992-4a96-4efb-99fe-998a00e3313a} + {1875b4fe-678a-4f87-904b-7cd3ff09a724} - {5e79c6ac-d55a-4be6-9fe0-b307cfc61337} + {26fb5a18-297e-4061-bb23-85841b1f8264} diff --git a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj index 3abfc6565..bcc36015e 100644 --- a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/SQLite/testsuite/TestSuite_VS90.vcproj b/Data/SQLite/testsuite/TestSuite_VS90.vcproj index 5792e8caa..e48f59c30 100644 --- a/Data/SQLite/testsuite/TestSuite_VS90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_VS90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj index a0586a84d..aef049a90 100644 --- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -30,7 +30,7 @@ - + diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 26428c540..b80c7c6b4 100644 --- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {a0a5770d-b1ac-4bce-a06a-99ff464dc73d} + {97d75219-8091-4652-bc2c-58b899b63010} - {b3eaf318-6e8a-4d5c-bfa6-0276c0ae450d} + {644c4ab7-ea8a-4daa-a22a-17f9bac053d5} - {9705d109-b348-40d9-96fe-5b6044a1de56} + {da85bc54-261e-47a0-a8db-af6e68531f5e} - {efc018d9-6322-4af6-ac5f-3600928c69bf} + {ad747ccd-35ea-4fb8-a906-a931993fd68c} - {65ed4d5a-7c74-4d6c-95e6-04723eee83bf} + {eee27ae3-baa2-45c2-8bd7-7ef31fc2dc08} - {694d9a96-2e48-4e5d-93b9-63ae8b7a34e3} + {846f6106-e3e3-4682-b40b-6cd67f00f7f0} - {6aec0db3-5950-4f43-9b65-4b49404ec569} + {02700767-53cc-493e-bc6d-a575f5089017} - {ae6fc5bd-f6dc-43c9-8fd8-b4af4c1e8dd6} + {feac55e1-4aa5-4d51-9126-e7c76d169253} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj index d3dd4a2f2..55689861f 100644 --- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -28,9 +28,9 @@ + - diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 3a5a07d61..9c762dce9 100644 --- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {ffe6ea2b-e531-41a9-86bb-08b5c77ffc8f} + {5f4f7a4f-fbf2-45de-b454-187da42d5249} - {38e21e54-cc10-4fb6-be8c-121306ed6276} + {6ab4a27b-7f15-4a69-aacc-4cbdba615fa4} - {b8807f2e-7299-4181-8a88-d21660be6ca5} + {3f3195f7-907d-41d9-bbbb-1be093094385} - {119cd9d7-725a-4a5f-9845-801d018b1c25} + {0d9996dd-37ff-4147-b4d0-f73e7a4b062c} - {db39c90c-11f4-4db0-b034-358ee07d1d6d} + {42b10a61-bea1-4cb1-b648-d66f944a35f1} - {19933ee9-7b2e-465c-8213-a8a1e86cf031} + {b369fa20-dcfb-48cb-bf7e-44f9f4776784} - {b0f97332-2d34-4d57-a88e-158d31965872} + {c216485c-e9c3-4c25-868c-fe9d2bafec74} - {653bf6b8-afac-42e8-bea8-aaef838a42c1} + {3feb58a2-0af5-4180-934d-7ea6ea4d08fc} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj index ca843383b..94ecfc6d4 100644 --- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -318,7 +318,7 @@ - + diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters index b3d5191f2..177c8dde3 100644 --- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {e5cfdb20-ed2c-4685-acc8-bfe4dd9be56a} + {7e4ec13e-adc2-4cef-bcb4-bd6ae5088053} - {53a8ffb4-e9b2-4a24-ad2e-d244cef313fb} + {f44dc2a5-2f2e-4357-a08c-8fdc6eacb728} - {e2cf4ae2-a7db-4d48-bddb-5933cd4ef0e3} + {3cee168d-91fd-4e4f-8c39-307c394692d1} - {f65a02c6-1d43-47c3-b242-0f49dc5688fc} + {e6480be8-b5c6-4d59-8655-15123ac6d1a8} - {29b87fa3-d20b-40fe-a963-8e63c9a3df04} + {839a1790-dcf7-4008-8814-732fa05d579f} - {bd2f7ed3-bf4e-464d-938d-291fb32bdeb9} + {61a71052-b2ac-4769-9b39-e5efbf6d6e38} - {cd05a6d9-843d-496c-91eb-480891b3f1fb} + {2db88185-7793-44fd-9d28-58b621d77fc1} - {871be448-7b20-4273-9726-b177349957f8} + {923488f9-c854-4101-b35d-8b3d2a9517ac} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj index 3e0e9a774..b01047960 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -318,7 +312,7 @@ - + diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters index fe53deaa5..8d65f2a5b 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {ecdb70e7-c842-4857-8173-01d0b4d9ed4c} + {ec1b283a-5971-4026-ab48-3d83dfbfd50d} - {5fcaa638-6a9c-450b-b679-51c71f15116a} + {1983e28b-4f50-4ec8-9d5c-7f1ecdc03ee9} - {48624f84-0909-458f-bede-01e29956fe64} + {7a5be821-5176-4b69-9312-c9ffcf3c561a} - {c96a639a-e9cb-402b-86f3-0fd6df81f6b5} + {e97fa491-c3d8-46d3-bdef-195038020ec1} - {0849d32e-e1e0-4d30-a0d6-be0157f16435} + {ae1bfa69-c5aa-4a5d-b2f7-df3830c5a136} - {9438443f-8ac2-4d34-af5c-fcae5f202d61} + {059cb246-01b7-42c8-83cf-2ef5b6203066} - {86da936b-ec3e-40c5-b801-25f3b178ea16} + {2a067a3f-b8b7-444d-a3cc-3cfef3a3a50a} - {950ed494-077c-44ef-b9ec-7140060abba2} + {b1185af2-58ff-477e-a412-672f54f1ae02} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index 632889c97..8ffd0715a 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters index f3a5e89d3..f9f288f84 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {3b484786-90e1-483e-b612-1b5fa05e5d24} + {fcd62f4c-341d-47a0-b927-269044491efd} - {c88c3bb4-537b-4745-98ed-a1cbfe7091fa} + {5fca14e2-db58-461f-95d4-14467a6a3eed} - {ac384778-ca3c-4090-b41e-f7b4fe62f312} + {39f1ea08-c571-45b7-98c0-8b11cc889e99} - {1a20b2c5-48bb-4431-8a21-99a90e54f0f8} + {86ce836a-e6da-4801-be4d-d4916e0e6921} - {6e0a4fd1-04a6-468e-8338-3707dfcf11f0} + {4f7510a4-4465-4401-bd7d-f2158373b25d} - {ccac5785-7298-4af9-b9b8-57437cfb752a} + {b6c70fde-9755-4c23-9f3b-92803904bfde} - {6064bab2-1756-4080-a84e-accffeaff81e} + {05bce786-5e37-4a7b-a095-548a7650a857} - {96dd64e2-b560-4d75-aa0d-6ec897d10f01} + {210b0c6c-cdee-43f1-b983-bb077176f09d} diff --git a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj index 882d0d837..1829fe513 100644 --- a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters index 368538f93..75a56e16b 100644 --- a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {ca693100-b323-42c8-a465-087b403c817d} + {be0cedf2-924b-4e92-9251-71874f51f7c5} - {3ebdbe17-bff2-4a07-b4d7-c1b795f1734f} + {bbdaf38a-373e-41f0-b12a-2b4ba6557e63} - {d3fbbade-2a56-42ac-ad9a-43034c064736} + {18f70193-5e74-4bad-9b9b-0e1d47b937f5} - {36df4c5c-622d-4dc5-9bef-349b80c5505c} + {0d1fa5a6-dc21-4cab-93b9-30d57547d957} - {eb736a85-8309-4e55-b50c-0a273cf4a4e9} + {c25e6228-93e2-47fc-bcba-b15aff69c3a5} - {05b7f82d-9bea-486b-a68e-adbf29adcdcf} + {cef15fef-368a-450d-ab94-cec687a73f05} - {09f17916-978b-40ca-9e81-4e31ece87298} + {2a127406-cb82-424c-b4b2-5b200972fcec} - {4f98dbc9-41fb-4dd0-922a-9d4d0285144c} + {f4a81813-da5d-4bd5-b87c-b9ddf7795320} diff --git a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj index 18f7b4fb8..e243f5771 100644 --- a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters index da24fe87c..867a9d327 100644 --- a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {dde4ff19-1783-4d2c-85be-0af4a720cb60} + {e2c571fb-d15e-4979-a87d-191d01c756f1} - {88b6d455-759e-4b05-a890-071b8dcf3114} + {41ec19e9-b314-485d-a7ac-79c16e5d1217} - {3140e49c-8f6b-478b-9a7c-cf28ecf4bdfc} + {7641ac15-0227-4a5d-a13c-2e3a9ad5ac31} - {91dcba83-a191-4657-aba5-9733fe9b09ac} + {ad754a24-1892-4b88-b52b-b169880897b7} - {d3968fe9-f4c8-4491-81a5-204dc753a0cf} + {3b5b1fbc-af9c-4168-81f6-975bd58df30e} - {9b429e09-debf-423e-9151-62181a04c8c5} + {6dead3c5-7e8c-446f-a994-45d08e5207b1} - {bfe62155-caa3-4e50-bf98-123ce0fd0e38} + {542955c2-fd83-48a2-ac12-3009a9e4c0db} - {e22cb702-b871-4f6b-8818-f53e290e1f27} + {031029d6-a609-48f3-85c2-3033e923c9d3} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj index 9be0469e5..39c9c2f91 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -318,7 +318,7 @@ - + diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters index e0881bbf1..d102ba1b2 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {12f08305-3aea-40c4-aa83-e4ada75c851b} + {a82f6840-56f3-48c1-8dab-a0b636b9fa46} - {914ccec9-615a-4d3a-9253-000c7d52293a} + {26f82a48-1a43-4da2-9874-8a4161bbd0e9} - {4d06b8de-c7ec-4a4a-b7ad-a1f46a4b1a0c} + {17084bf0-c26a-4946-b23c-28d125ffcfa7} - {5b6c9b43-8f91-426b-979f-8bbf67182389} + {963a7b68-3030-465d-b702-eeb6dc0de04e} - {07fbc39d-b0e0-49fd-8292-4c5a4b4d337e} + {0052255f-a992-42dc-835a-1735b7b596fd} - {9870c66f-6599-406c-aa69-d8e85d40ad09} + {02a683cb-68d7-4758-8c1b-d8ad4b62291a} - {8fc16a16-a53e-4fba-96a5-980c3c4deea5} + {f23a1f39-2f3c-4876-a921-4932dae0a76a} - {7242e3bb-9f83-43a4-93d5-a9823edf0779} + {9bbe29a8-12a0-45f2-9f77-7b906423778f} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj index 23a462b38..8a8a3604b 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -318,7 +312,7 @@ - + diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters index 23eaf2942..b1ef87595 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {69c63bde-5466-4029-92ea-b0629058dbdc} + {2fad8f00-a075-44d7-bd30-73ebc21ab4e1} - {dad76fd1-1341-4f18-8956-bce71cd96d69} + {2c68a228-af28-46fc-bf5a-56ebef6ad447} - {458f6808-db83-47c4-86a7-ef8d7d379cca} + {a476912a-f754-4161-9640-33a21d80e653} - {4495dd74-26dd-452e-bb68-046393a5f721} + {598d6fa5-3578-49f0-8ffa-0274a59dc879} - {13c9ee5b-f728-46b0-ab56-4d64a2790e10} + {880f6484-99c4-4167-af25-8b0d731657a7} - {fb76dfa1-d134-405a-b9d4-9f26470dc8e7} + {9103e4a1-67c8-4907-8301-c5e30546aa8a} - {e9091066-6282-47ad-a6d1-4d023e2c0cb2} + {0a315dbc-945d-4521-bf7b-08a08905c15d} - {ba5b72ee-c3a2-417c-9c8d-55f057d0cd62} + {e77fe6f2-ae40-4562-84d1-bb243b37d8e4} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index 554e9a368..0546035d7 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters index d88cee4b4..cfce96954 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {252f2257-6417-4c2a-bbad-32302a8cb18c} + {c2317a73-98bc-4b2c-934b-e74bd2192537} - {96ecbd1f-a41f-4ac5-929f-c7ceca258498} + {425c5768-831b-49e5-bf87-0e11251397c8} - {6b62256f-1c75-47f9-81c5-e0ee703cbc43} + {6e083acf-53a0-4b50-bf62-06f580286564} - {c0963bd4-e05a-4532-98be-94818d3d9871} + {3a9a2006-ea57-47b7-b252-9550df08811a} - {39da9eef-ca49-431a-b192-1a3d3370033d} + {37120768-a991-48b6-ab8d-2cb687af8c8e} - {af4dd955-0602-4e73-9ed2-1b7b74a33f53} + {2663d26d-0710-4192-869e-64db79968223} - {162cfe3d-8560-43ea-8072-1949b12001bc} + {c97d113f-1f41-442e-acf2-ca0fc187527d} - {184c05f0-e28b-42f8-823a-98b86ac8f5ad} + {0bc9b83a-1410-4614-883e-3ef8825c0dcc} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj index fc83efdba..244993422 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters index e8ef3fcee..0e3853f34 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {bf051784-12fd-483c-b0cf-d897462dfdf5} + {5e2a135f-e23b-4b9d-a25e-6f336b7cfaf1} - {f2534811-aa19-4220-b7f0-1581fb4491eb} + {fae39b21-2d93-49fd-b366-e3cbd16cff82} - {4b2a5c7c-5234-4e4b-bc84-45a70e9834a0} + {76348886-c083-4cb8-8893-daccdeb4c857} - {ef96838e-8a65-46cb-ab15-49bd6f036e06} + {d6e17955-b6ae-4ad2-845a-8df7e4c856e5} - {378ee92a-4f1d-4846-a4d2-79e70e00abd1} + {dd83ec74-2931-4e0a-b9fc-9bf52c3ba0d0} - {f245b3ba-0e11-45f4-92ae-8dfcea86ff30} + {008874d2-eb74-487c-8fe1-c54127ae4a41} - {c8066bb8-5246-4c33-bd6f-1a35b0748679} + {7d12e46c-6036-40b9-b846-ca066627ffa6} - {8a096648-4653-4743-80e9-7ee6e7937dc7} + {22afbe77-270a-4123-964a-db9b02dcd761} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj index edc4c5bd4..1fec83222 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters index 1b8af0407..09a8e2670 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {1d8dcfae-12ea-49fc-9994-c2058e5657af} + {c8df4eff-87b7-4318-8f65-047ee80ac10a} - {6c2816a0-f347-4df3-b8db-93caef17cbbd} + {fdcf4c1a-9758-4fc3-a913-756f164133d2} - {3a924389-f5d2-4dc3-99ab-cbeff59875f2} + {6a42c24e-dd3b-4588-aa57-a04c15fedcbb} - {2db2cf28-7223-4e62-82c6-df754060dd78} + {fda8e258-d2ea-4765-9ffe-072fe5c11987} - {7c000025-73b5-459c-b5f1-2d2d4e199460} + {43419e9e-b10b-4148-90e1-220721590b09} - {ac398aa5-acd5-4a37-823f-780e5771af2d} + {13ce6baf-dec8-4267-8a25-8a60a81a90d1} - {0d1b1663-5d4d-4660-b680-77ada21c76e6} + {2ef29616-b083-47cb-847c-cb237fa92512} - {14218db6-64aa-48f5-beaa-87cbd591a14e} + {94227db4-d3f0-421c-a15d-d50562436e17} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj index 74c1faa05..0e5a9d054 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include" + AdditionalIncludeDirectories="..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Data/testsuite/TestSuite_CE_vs90.vcproj b/Data/testsuite/TestSuite_CE_vs90.vcproj index 2056da52d..4ddb49e25 100644 --- a/Data/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - + diff --git a/Data/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Data/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index eef09e7ed..6f9a0071f 100644 --- a/Data/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {ebd169d1-4164-43af-bd93-85bba6ef23fe} + {55608a02-0408-4843-aa44-391241efa224} - {7c35d350-5f46-4aae-b6a2-6306cebc8496} + {d3159d87-09fa-45c3-9c5e-19e2fe7f4fd4} - {3cdabbef-8995-4a3a-ba4b-0a200bde94ae} + {458ed29f-93b9-4d82-b71b-2d11af292e5b} - {f381b69a-6db6-4b5a-b878-3b759228c7ff} + {89161740-4b33-4269-9819-c78915d18c50} - {70bfb99c-9835-4dfa-94e6-70629cb600eb} + {6defd41b-8d9f-4b87-a3eb-fe8d4f22b64e} - {0cd888df-cabd-468c-ba35-c9de9c5f4e3c} + {b99cc591-083e-438a-aafd-e094e9983723} - {5a59966d-a160-4eb0-9b7f-ece2a93e1c4d} + {4a0f1f9e-2214-4bb4-8647-e8646b97056e} - {1486c7dc-4a4a-464c-9fc5-5945409695dc} + {453a2513-be29-4bb7-97eb-4bbc9f6d9d6a} - {c2ee68b9-6804-4cb7-b8ef-c31462ba56b6} + {db783350-75fa-4e1b-911d-0d399bcfe316} - {f037bdc8-84aa-4cb0-a433-80aa2272dfa3} + {70b78d52-8ae5-4917-b4de-a2a69254815e} - {c916b452-40e0-4f40-ac89-b58785839cc6} + {ff337875-5ae2-4032-8c99-0a44d012140c} - {3690f22b-c81b-420d-9734-f99fda7cf160} + {d04ab369-02b9-4be0-adf4-4d930c81e412} - {2a9d9012-f065-4801-a0e8-379f1a4a2fe5} + {7623e9fb-e501-41bc-ad82-37193ba2613d} - {3bad8424-9eb6-4346-86ce-3df099d6ccad} + {6c20e2f4-cc61-4b33-baf1-eaf1097fc597} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj index b5583eed2..cb8f3e542 100644 --- a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -39,12 +39,12 @@ + - diff --git a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 435803dde..4bdb2126a 100644 --- a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {9894bb3e-fb6a-43ab-b0e1-d0ab5a568c69} + {4fa94c87-090d-499b-b0ec-5b621bc7dfd9} - {ea50d51e-64b9-4b42-83dd-3bf0a651c145} + {631d041f-cce3-448e-8a2e-3047aea693c0} - {7eac405f-dbea-45a1-91cc-7824936c459a} + {b47edee3-c87a-43e3-9aea-e6d5a85047ff} - {3dbf5cf8-db26-4f61-b29e-7c22608896e9} + {a43da434-48d1-4ca3-9bf5-1933e5eeeca5} - {1d2dc05b-b00b-451d-89ca-895e04b1558c} + {3d5f93f5-f72e-4a75-831e-3f9f9d353c1d} - {56d0f58c-0dd4-447f-bcb5-7fb21c2faa2b} + {04ac3412-cf5b-49d0-8cfd-883810a330dc} - {dcd26a21-5bc8-4d3c-aced-3ae4b17026da} + {89f937fd-909d-490b-b852-a3b85de073d0} - {8529cf74-da74-4e42-afc8-9dc8093705bf} + {4e52dea9-a16e-42bd-8ce8-83e2860a07d3} - {cb864fed-9bcb-4fce-ad9c-6ddcb28952b5} + {337d5b20-68d4-433e-80b5-0f43518b48f2} - {37394001-f8f2-48ae-a329-1b435a9d1a54} + {38368cd6-01b9-4256-9292-2e7391da1de5} - {af93fbc3-5b43-41c8-8f2a-2bd872b6ad67} + {0d67caf2-f61f-4c25-9613-8bbbb75cbf0a} - {d1a66bc9-4d7a-4da4-8471-d6a50e58e8b5} + {b8ab563b-63d9-4310-bebd-6aa25e884e6f} - {285abe1a-e680-4791-9e66-23fc69075c19} + {febf692f-4482-402f-b36f-8ae268cb89d5} - {b1774f8c-5d45-4de0-b74b-f92184120446} + {3a58366d-ba2a-4eb1-8b42-4b4eaea70b37} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_vs100.vcxproj b/Data/testsuite/TestSuite_vs100.vcxproj index 03eff75d0..e56dc711f 100644 --- a/Data/testsuite/TestSuite_vs100.vcxproj +++ b/Data/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -325,7 +325,7 @@ - + diff --git a/Data/testsuite/TestSuite_vs100.vcxproj.filters b/Data/testsuite/TestSuite_vs100.vcxproj.filters index 7db8164a4..ba9ae1926 100644 --- a/Data/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {c2d9a49e-3a0d-4638-aeab-c3dc80a0aa2e} + {19e2322f-6d13-44f6-8c2a-cbb408f1d128} - {4a98deda-b460-43b2-a070-9dc35901881a} + {cc772106-4669-4839-a55d-f00eca72a47f} - {6b2d92d5-4d7f-438a-af0f-c5cae1c3699a} + {fe799c0f-3e0c-4449-b356-02c50b5342b1} - {f31a4268-264a-49bb-9b5d-8d6668916551} + {9a62a1bb-9715-4c41-95e1-f7a089b35f0d} - {2908b0fc-85ff-464c-82d0-487e645781c1} + {5f989294-1545-4092-b7aa-ca7196dfdcb0} - {a430c8dd-20c9-457d-a346-8d0e6d7d084f} + {dd20b432-b4ec-47aa-afa8-c90b404b7b82} - {d21c81c9-7611-4957-8d7e-350985458e49} + {cd908598-223e-4794-b919-98f67d781f99} - {a141dff1-4707-484b-be31-3e5be25a3d4e} + {361c3d5d-17f2-48ef-86cd-b8dad5fd1c7b} - {4a2dcc7e-46fd-452e-b187-58ce53b39b7f} + {f65427d0-df1a-4fe5-9b2d-3dc02c9b727b} - {fc0185bb-121d-4acb-b1b1-adff1e41c8cf} + {80ae9b58-4fe2-4f76-8a8f-2e27ab76afe7} - {9182b1c9-45e5-4a98-b390-944bfcbb6cae} + {1178afe3-6922-4bba-b9ca-bda70102d032} - {27e4b75e-34fa-438d-94ea-97b28923dff8} + {dfdd77d8-eb0b-4482-a020-55c0c76df9a6} - {30a2d96b-a1f2-48a3-8578-55dee4f263a0} + {3e724ef5-2219-44b5-a689-868bc32791fc} - {d7ed5d88-0fab-44f0-ab04-e0795f57719c} + {dd41a284-633e-4520-8cc5-9721a4ec8e3f} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_vs110.vcxproj b/Data/testsuite/TestSuite_vs110.vcxproj index 571dc393f..251f74add 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj +++ b/Data/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -325,7 +319,7 @@ - + diff --git a/Data/testsuite/TestSuite_vs110.vcxproj.filters b/Data/testsuite/TestSuite_vs110.vcxproj.filters index 5989fd2b7..e00abb490 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {05df16c7-e34a-46cc-a883-d53733d389d9} + {c994b3cc-5b6c-484f-84aa-08a66671c061} - {557e610b-64da-4488-883e-bc1a9ad69c32} + {22a0545d-2b45-4d11-a8c0-130e95c57cf1} - {12f1633e-344c-4833-bbba-c0de1d55b7bb} + {6e275394-7f25-4d6e-92f0-b94f336346bd} - {74f962bd-5c76-4fed-83e3-e95bc07e8aa3} + {14583bf0-04da-45fc-87bf-fed6aa5e39af} - {38890ac0-2ac4-4e52-95c8-2b98b53367b0} + {c72c7b6f-b83c-4cfb-b211-392f53aade01} - {6df9b500-093d-49eb-9f6b-2f901369de5a} + {8a4d056c-2554-4bf8-a5f4-db06b38b3ada} - {8cfc61e3-1d47-438c-a712-b05d883a0791} + {4b57db0b-e139-4d79-be95-412d3f3cb5a4} - {63c24857-5ca1-47be-a437-d2baa38d85e2} + {b52ec83e-63cc-4c57-9d03-e929e606cd3d} - {631dbac2-cd1d-4788-94a1-9f3dc03ad65e} + {a487a1d4-9c3c-443a-8120-7861725aa843} - {b8e7e884-4e40-4ffd-94f9-322bd5868501} + {815ce9e8-fdcc-4203-9056-a2940e0b0c41} - {a6a35a8b-6ffc-4114-ac12-bd82f549ce39} + {ec23403e-362e-414b-aa42-5ac36248eef0} - {15a8f8d1-ed7e-4d2e-9cf1-f21540e0fa9c} + {2700057e-d603-484d-9d26-d029df2e3469} - {92fce141-c494-42a7-a7fd-459bf5d5701b} + {23dce6a0-cea0-45c3-8350-dca4c9176fcd} - {9b882b89-aa22-481b-b692-f8b9a2d7ecea} + {722d69f7-64b2-4a2a-a50a-1e865cd1d9c7} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_vs120.vcxproj b/Data/testsuite/TestSuite_vs120.vcxproj index 79df27680..1536d061c 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj +++ b/Data/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs120.vcxproj.filters b/Data/testsuite/TestSuite_vs120.vcxproj.filters index 7cbb943f5..0988c464c 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {d67fac61-b2e8-4365-a8c5-ba13aee4078c} + {3628e615-38c1-41e9-be73-61653dfd41b0} - {1a9158eb-2aab-4e6e-ae1d-894bc5cfdb2e} + {709612fd-161c-4b25-88c1-7a77fed130dc} - {aadfe43c-0c03-43eb-86e6-59aac6a9cf7c} + {18b749dd-cc51-4fc4-8fb3-a7de37195b27} - {eeb55764-a78d-4e08-8ea1-09dd30025d10} + {31dc2417-ae5f-4dfc-aa04-9ae77dc784d7} - {7bc4677a-435a-442b-bac5-033607b3683b} + {4983b609-9e64-4301-b219-40a5289eba30} - {955ba77e-11b0-4540-96c7-646964c4ba4a} + {9751b31d-9424-4cf5-85d0-fbb06661b1fe} - {41442aab-d9be-49ef-ab99-041dd249b957} + {14a9dbc3-d1f5-4186-b721-215aee59eb18} - {904ea37a-87f9-4baa-8c8a-17b9ad464942} + {d54d521c-d3cb-455a-8db6-fc024104a79d} - {9c8ff662-903f-47c6-a005-4f88e264e795} + {08317035-5764-414b-bba2-34c418edbff8} - {463adfb7-1e80-4e41-a56e-604a96b6f912} + {29a46250-2d7a-4300-b4b6-bb48e0b2c3a2} - {5b8ec0da-3b7f-4f09-8db3-5f94e38135b0} + {5b1d2f5d-fa8b-44d9-9029-b85d0e174285} - {2db478f3-cbbb-4e91-bb55-0c9ce14f7f10} + {edff14e4-a504-43a3-897e-881f971edcb9} - {ae472a45-c0ff-494b-bc43-00ea6ad182fc} + {e85b6be8-4a61-4755-acfb-ad1e8e20c74e} - {d165557c-4c44-4557-8855-6a6ef4447f55} + {1be0c035-7fc4-4cad-9001-3c122c5fc6b4} diff --git a/Data/testsuite/TestSuite_vs140.vcxproj b/Data/testsuite/TestSuite_vs140.vcxproj index f08335d12..891b61620 100644 --- a/Data/testsuite/TestSuite_vs140.vcxproj +++ b/Data/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs140.vcxproj.filters b/Data/testsuite/TestSuite_vs140.vcxproj.filters index 7b53b21ad..cf6bd9fda 100644 --- a/Data/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {a88b8868-a289-4073-8b01-5186dbc5fe3e} + {7bd4e729-bf1a-4249-baae-013a9215dbe8} - {ee40b4e6-fc09-49f8-a8ad-7cbc8d583791} + {103b4ef8-5ca3-4067-b156-5c8a3eb22597} - {f18fc782-e7bf-47a5-87f3-b171f1f60c11} + {607d6e8e-0006-496b-a23e-af9638bf9107} - {c7901bb6-7d04-4694-b11f-723ed7d52de3} + {d505692c-f3fd-487b-87ba-5b02fefc018d} - {cbc95fc4-c72d-41d1-84ef-04d3388447a3} + {462d9501-6e8b-4c21-bdde-d1fc1f4bb309} - {6beabeba-907a-4221-9de3-9639997fbda1} + {b7e11b18-0fe3-47d0-869e-6065b7bc38d5} - {8940e1d7-7fc1-46b5-81fd-1a47b8e98ae3} + {ab2a200f-2b40-4583-8ee5-26455fcf81f9} - {1437f7f5-c697-491f-baef-7f890b97c61f} + {f3e66970-834d-46ee-8ef0-ffebb790a556} - {be9a270f-1330-45dc-a76f-76ce79bfb2fb} + {72592b06-653e-4e99-98c2-70ef728b0b17} - {62b651aa-0b99-44dd-aa8f-b0d442c51441} + {ed9566bf-4404-4e8e-83b6-c88b752b703c} - {b603a190-24c3-4a12-92cc-0a7663c52686} + {c665bb3a-b8ed-4bc4-bead-b3255600c8b5} - {f631d554-5495-4699-98dd-b26be5f59546} + {c05e1767-3a10-4244-bf4b-7ba7d9cb3a7a} - {e45ee089-70ed-4639-8215-2a7ca3ad2d35} + {83b52c2d-d708-4529-a003-c9fa92165de1} - {6c6b628f-51e7-4318-9164-5e96a0077616} + {60ff879a-033a-4702-9725-e196a3a16f33} diff --git a/Data/testsuite/TestSuite_vs150.vcxproj b/Data/testsuite/TestSuite_vs150.vcxproj index 66ac17cb2..5db09a5fd 100644 --- a/Data/testsuite/TestSuite_vs150.vcxproj +++ b/Data/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs150.vcxproj.filters b/Data/testsuite/TestSuite_vs150.vcxproj.filters index 652bc42fa..d9a47d777 100644 --- a/Data/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {1fbf245c-cc45-4d74-a6b0-04bf473a45fb} + {e191fd2e-7b1b-4d0b-9811-2691ca3f0c65} - {762088fb-db1b-413e-bf20-bd94952f8826} + {331af13a-e31f-40f4-919f-059e030a9530} - {67384fd2-eb4a-4bde-9aa5-986808ddc2cc} + {58e2e3b1-ee4a-4bd9-9d3a-bbcecad178c2} - {125441d9-b0b5-48b5-b9f9-627bcc833b82} + {c4a0ff5b-d308-45f3-8ba5-14532fe355bf} - {c154a6b6-f18a-4074-9f32-7675be805ce9} + {ed9a046b-e8ef-4597-82fa-3b6be0a6c051} - {7f62aa1f-ad0e-4c07-a3f4-f28caa6024f2} + {87acfe3e-cab2-492b-8f16-b255a8e2dd6a} - {a6938f38-7139-4554-bcb0-0930c22d2b57} + {990eca72-e803-435b-a1f2-5213a5772da7} - {57d87cb0-afec-43b9-a712-82cc5da634ba} + {db2f5f7a-02b2-4820-8484-f7e33ba257b8} - {2acd22db-edef-4276-9b45-8d21431b2e00} + {d57b2c2d-b7c1-4364-adf3-4c30441c9f5c} - {b56e871c-1366-443e-90d9-49d005494af9} + {d9d1d34a-d42a-4f31-a664-650e770f6f61} - {5cc5300b-455e-448d-ae93-f77360ce6c85} + {6f945ad0-3b78-4ee7-9079-7e45bfd72093} - {d212a219-272b-4c33-97d4-c8ec501a40fe} + {b84db61d-1ff5-4b61-9e1b-45e0a477c38a} - {7d8f022c-658f-4760-aea3-d8ba57093c1c} + {2f78c413-fd10-45f9-9e9b-11567026d3ee} - {4279a81c-d222-407e-8e16-c06aef5990e5} + {6277956a-b526-4b6f-81e3-a11282479e3e} diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj b/Data/testsuite/TestSuite_x64_vs100.vcxproj index 795e95274..10e4e77c9 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -325,7 +325,7 @@ - + diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6750fdb3d..c1f04867f 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {d68f9b4f-5613-4105-a587-49bdbcb497a9} + {fff3bb2a-0cda-4043-8562-683de25b53dc} - {4dc38d8b-3265-4b27-b16c-2a4619b02b2d} + {24591343-6bfa-4a0a-838a-155396e57f49} - {8d297249-ca9a-4697-84d9-9ea54957768f} + {f0af132f-df00-45d4-af5f-879f12fce9b2} - {2c98e553-2e0e-4f8a-a5a1-1a5d1b47b3f3} + {0937b6d5-f74f-423c-bdfb-c0e270388b21} - {adb19a9d-582a-4399-ab72-93d6b6ea2b37} + {205217b3-fa4c-45a7-a7bc-a07f3766f573} - {2e22be0d-cfce-4a35-8ff8-6e2083fbc88f} + {622ab8f9-630e-481c-a19c-f063bf24f7d5} - {463f31ba-b640-4423-99ab-47d3de40913e} + {ad6d9a83-5bdb-4cdf-be44-585d35a8f5e0} - {2198e95c-524f-483d-bcee-d203d8122763} + {f2142239-7017-4ecf-b4f5-e85c50de6387} - {a3ed9e0f-ac16-4eac-8711-12110c3f9002} + {35d36eaa-aef4-486d-978f-6064056c7ef2} - {efd61677-e36a-4450-9b83-b75493c08956} + {6e07b1cc-b413-42ed-be8c-af27b4695956} - {b1e639d0-26ab-4df1-b132-9e57f49e626c} + {806927c7-40dc-49e3-a531-9a875ce220f0} - {0860a27a-a701-483c-8544-980724d4eefe} + {beac6316-067f-41ce-9f68-3fe9ef7787e5} - {bbf411c3-7402-4510-b923-5164b088c729} + {0c7fd92d-7d73-4bb1-b665-df456ad37dee} - {0d9531cd-843d-4264-8bef-09f456360e53} + {220b8a89-0f39-446a-857f-901271422e3b} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj b/Data/testsuite/TestSuite_x64_vs110.vcxproj index c33c89860..e68d95494 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -325,7 +319,7 @@ - + diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters index 6379dc483..c6e8eab27 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {460ffaa9-26d2-4b18-ac1d-b7523497ebd6} + {cc3dc132-fd6a-4296-84d6-31b5b9d08475} - {61d78147-3968-4802-aed8-c667bae66836} + {af655687-9544-4e93-84a1-23c66164e371} - {915335ed-083d-4ac1-ad6b-633c6954c38b} + {d4adeacf-9e03-42e1-a958-67f50a6abea2} - {fd5ba489-424e-4f91-b2c2-036881c873f3} + {fdf7d252-2d99-4bc9-8e42-34a41ae556b9} - {3a6eaa04-db62-42ef-bcea-c6fddf5212e6} + {16cdb692-94cb-4c1e-92ae-5592b7de6706} - {ef1ac2fd-2c22-4feb-a5d0-8112e020ff5a} + {bca78984-d782-46c8-a7d3-1678f824bf09} - {c139d942-4835-4e42-b67c-c66a3faddcfb} + {c0b41ce5-df5a-426f-acef-500accec84e5} - {626e8aef-b408-4f62-8ba1-227c13f9ed7c} + {e352741f-96f6-4c63-90fb-3386e8c2b19e} - {aadf49e4-bf32-4d10-9c35-b2711f6ca0d6} + {b5a838a7-32d5-4010-bcbd-9684dfb9bbbe} - {9725f33e-2046-40f6-85f9-848a631ba119} + {39a669cb-04e6-434a-9cbe-b650d1918f59} - {be1a670b-dff6-4d65-8cb1-ec930e87adb0} + {f9434dbe-9074-498e-82c4-dfd2d67d7e21} - {f1fb2f47-4d49-42e9-93fd-ebb7f4d64aa6} + {b161d1ff-3a81-456b-95ed-74b8036d7e1e} - {f21a8430-5e20-4040-971b-6eb8fd1b55cd} + {eec1f7bf-b7e6-4f95-93bd-5d40cc0d1b27} - {18728e31-5da1-4239-9f27-80281979cea3} + {463b994b-ebe1-4ee6-b325-167757612aea} @@ -80,7 +80,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj b/Data/testsuite/TestSuite_x64_vs120.vcxproj index 1d2b12556..f5175fb8c 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters index ddc2fd94d..7c4dcc53c 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {4491f630-a55f-4233-84ff-2c92f98ff818} + {ce6c5de2-9987-4b20-bc9b-cf175879857a} - {d842642e-62a7-44ad-a5fa-f9c1b601a46f} + {4ce8a9d7-ac3c-47a4-a6eb-57b0f2ce976b} - {21f18aed-b216-4d00-b3f4-b560164712a6} + {fc33bff9-78f0-4e55-8b3d-8f6c11955ae8} - {174a70be-d849-41fd-adca-135c68e4182b} + {f764817c-d894-44e1-abe6-8421745c316f} - {069a486f-55fc-40e3-be5c-d451eeb88835} + {fce11772-ef57-4efb-aca7-f8a5de0f7575} - {184d0f23-7b20-4f85-991e-8d73fb01b4a9} + {b1dc68e5-0348-4c33-aca1-687d4fa6db8d} - {8df725ec-d228-4a4a-bc90-a364905c5363} + {cb35aa04-c500-4e6c-9759-f48f0b5d56d5} - {a0c2c8a2-3553-4e8e-84c7-1f4d0889d75c} + {b94c066a-4529-402d-979f-b8b3a71e6f2b} - {a904b7f6-f80b-42c0-bd16-bf72101c0d05} + {77e67fe4-2ac3-4bdb-8281-f030aaa0bc6d} - {e39cfc7e-d117-4de0-b031-32764f0ba4b2} + {c843deb7-25a9-4240-8526-1cfe2d0e12fe} - {5ce55ca2-4824-40fb-9a3c-54db2e233fb4} + {d7e26b66-f01e-4c09-8b5a-a12c7b9207ed} - {a532a345-7e1a-4ca5-9c82-3cdc201e23c9} + {407b143e-becd-4f26-bae1-c81c5793a672} - {c819d5f3-fea3-47b9-b559-5f7f0cccfae0} + {4d2d31df-b093-47b6-84a5-a07529a2b3b3} - {d09c5207-62e9-422e-83de-4382c9906374} + {ff6a147c-3aa9-482a-99f1-e4936da63dde} diff --git a/Data/testsuite/TestSuite_x64_vs140.vcxproj b/Data/testsuite/TestSuite_x64_vs140.vcxproj index c37fd2bd1..1dd1f827e 100644 --- a/Data/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters index eb957d864..be17527bb 100644 --- a/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {9c352b32-825b-4417-bf02-03b643e3ded6} + {583273ae-dbad-4af2-bed3-2c6bc5853802} - {018dd3c6-b8d4-4029-b950-a150f6ac28f2} + {fc269909-e298-4397-b657-a2180c550815} - {bd5ff531-b9b8-47e9-aa1f-11b49db33475} + {4b652c4d-1934-474f-a67b-a32fecc906f9} - {d73fe271-7d69-4c30-89c1-7433d0a98a55} + {26909bb5-d5f8-4a19-b386-0c15566e298a} - {fe646738-23de-403a-941c-2e856cdb8682} + {8d665c85-a219-4697-9bdf-5a7d0a80ed07} - {3239677f-e96c-4d7e-aa01-4f8411a94874} + {31843d17-0bf9-4121-8cd4-d27246ca915b} - {15359e6c-f3f6-4b44-a981-cf3265889ace} + {eb6a1582-b09b-4521-b761-c03853769bda} - {f31c49e5-d1a6-4c57-9f34-361501eb0bb1} + {3517c4a3-2976-496b-b401-2e00029ecd7e} - {c5e6245f-979a-432a-a98c-b3a85e8cbd26} + {cf3586a2-d62f-4f9d-b94b-61d7120e7961} - {c928b768-4f2c-4712-a302-08caaf180eb8} + {a01a01dc-99eb-4b0c-80dc-becaad977ed7} - {f1e36216-bf37-4f4a-a232-87309be732c4} + {c06e010e-7923-4276-915d-fd5bd7a4fc2b} - {4c9233d2-ccd8-4f4f-9d86-ffa2d7deb63f} + {6e9cbf02-a20a-40a2-b75e-e62a56f364d9} - {edf285d0-8133-4f12-ae15-a9b0f2b5df67} + {1d81659b-78e6-43da-a2b8-b320ed791b59} - {2c097bf9-3e00-4ce4-b3a9-ce5a5139e421} + {4b66703f-f36f-4a7e-bb6e-a3d349d11054} diff --git a/Data/testsuite/TestSuite_x64_vs150.vcxproj b/Data/testsuite/TestSuite_x64_vs150.vcxproj index e121c0e24..094fa0bbe 100644 --- a/Data/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters index 1294567e7..dc7584aa8 100644 --- a/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {178d6687-ed0f-44e4-bc9f-bf8d75e05d4a} + {d5ce2c41-15f7-47f5-a71b-5e5b28a6b2b0} - {285421a0-6340-42b0-bff4-bf37b46c2d9e} + {bb89804e-a046-4a4d-9c5f-50627b0365b9} - {d1963bec-e56f-421f-8a04-51b30a741972} + {9609da15-ff79-4e7a-bf25-c37b95fcd437} - {9d4c280a-5324-4f2f-92c2-9b053a3c9a90} + {7e3a27f0-5a66-43d9-a526-162fc7adc422} - {32a47f7a-79d3-4e4a-8df0-05831abb6952} + {26c112e7-1152-48d8-a679-acc83202b5c5} - {efe9a8e2-1057-453f-934c-8cc7320eb5f3} + {a4e41eae-fd3b-49ca-ab67-73d7baf810b3} - {b70abb2c-5144-437c-86ff-c786aa11ed9f} + {57849d35-1004-4fda-8b32-75e82a02e58b} - {b81b44cb-c756-4ad8-925b-d56204c646d7} + {b2aa73ad-913b-49c6-acf2-64ebd48f50de} - {a452250c-cc81-4c42-aef6-011997ba2deb} + {8192bad2-c0aa-4a85-89fa-ee9cff776ec9} - {40136335-2ac5-44dd-96c1-b656f6393da7} + {7406c484-7d52-4d67-ac93-4c5132d1abae} - {05306e67-32f7-4c30-af82-6c6bcbd9c7f2} + {032c2918-00e5-4a6e-8fa3-e3ecccb6322a} - {59f804c9-7b2c-4812-bd3b-9c58b3d5b41b} + {73353bb2-e263-4568-93c3-c9e63e50c0b2} - {2ba8317d-2189-42ea-b55d-b6157271f8d6} + {a39df0fc-0f5f-471f-b447-78da13964653} - {7df5b316-5f8c-4236-bad2-c8b69946fb3f} + {79583080-448d-4286-aa5a-1a46392c6b76} diff --git a/Data/testsuite/TestSuite_x64_vs90.vcproj b/Data/testsuite/TestSuite_x64_vs90.vcproj index a7c1ece5b..b61f5cfff 100644 --- a/Data/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_WEC2013_vs110.vcxproj.filters b/Encodings/Encodings_WEC2013_vs110.vcxproj.filters index 33ac91ee5..aa44a4de9 100644 --- a/Encodings/Encodings_WEC2013_vs110.vcxproj.filters +++ b/Encodings/Encodings_WEC2013_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {b18cc6cf-26a0-41c9-9f45-a6edcca24efc} + {fd123da8-38fa-45b7-9284-7d1bea4fb58f} - {d8b2ddbf-192e-4cd3-9d6d-cdaa97b89d0e} + {425cbcd1-e53e-4013-8f6a-b5f685d5f052} - {20fe6882-7d4a-4cb4-92be-3b488784e879} + {d389e869-eb73-4003-91d7-44d56c080718} diff --git a/Encodings/Encodings_WEC2013_vs120.vcxproj b/Encodings/Encodings_WEC2013_vs120.vcxproj index 9d1ecbc4a..2d19f8269 100644 --- a/Encodings/Encodings_WEC2013_vs120.vcxproj +++ b/Encodings/Encodings_WEC2013_vs120.vcxproj @@ -1,262 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - Encodings - {D7AAB91A-9AB8-457D-A329-02D1FA47CB7E} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd - PocoEncodings - PocoEncodingsmd - PocoEncodingsmt - - - ..\bin\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Encodings\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Encodings_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoEncodingsd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoEncodingsd.pdb - - - ..\lib\$(Platform)\PocoEncodingsd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Encodings_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoEncodings.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoEncodings.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoEncodingsmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoEncodingsmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoEncodingsmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoEncodingsmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoEncodingsmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoEncodingsmd.lib - - - @@ -283,6 +27,29 @@ + + Encodings + {D7AAB91A-9AB8-457D-A329-02D1FA47CB7E} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoEncodingsd + PocoEncodingsmdd + PocoEncodingsmtd + PocoEncodings + PocoEncodingsmd + PocoEncodingsmt + + @@ -311,14 +78,7 @@ - - true - true - true - true - true - true - + diff --git a/Encodings/Encodings_WEC2013_vs120.vcxproj.filters b/Encodings/Encodings_WEC2013_vs120.vcxproj.filters index 0ae2bc5e7..10e9d6a18 100644 --- a/Encodings/Encodings_WEC2013_vs120.vcxproj.filters +++ b/Encodings/Encodings_WEC2013_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {df3129ec-1c9b-4bd1-a34d-446c9eafe03d} + {c0756457-1f59-4d98-b292-030f8f89c7f9} - {320b26cb-dd00-42ed-8a02-210c12418aac} + {6b4258da-76e4-4371-928d-d1eebc8465fe} - {639b3026-bdc0-4445-a76e-009892832f46} + {ca25b02c-477b-46b5-b2a2-02088740b3e5} diff --git a/Encodings/Encodings_vs100.vcxproj.filters b/Encodings/Encodings_vs100.vcxproj.filters index cdf0adc4e..838590676 100644 --- a/Encodings/Encodings_vs100.vcxproj.filters +++ b/Encodings/Encodings_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {b5a8e73d-dca5-4333-b121-7e5645261da6} + {b7797f76-af58-44af-add3-4ed6aa03e28f} - {23792959-6cb4-4544-9cf2-404c0ad53dd3} + {debeba5f-688e-4f46-9491-33b9fe450de8} - {12c4a8dd-3b18-45c3-bd77-b09847055a88} + {cde2625d-b701-4d27-a56a-951b05f4a740} diff --git a/Encodings/Encodings_vs110.vcxproj b/Encodings/Encodings_vs110.vcxproj index edaeb7cae..033bff248 100644 --- a/Encodings/Encodings_vs110.vcxproj +++ b/Encodings/Encodings_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_vs110.vcxproj.filters b/Encodings/Encodings_vs110.vcxproj.filters index df3e5d705..518e5affe 100644 --- a/Encodings/Encodings_vs110.vcxproj.filters +++ b/Encodings/Encodings_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {03ddec0c-01fa-43bc-913e-483cc7bee91d} + {5d887b7b-76eb-4ceb-9ad1-c981c5ea6d97} - {5a84b5b0-9d61-4801-aeda-dbd2ed234e16} + {4f54d27d-6238-448c-95c4-bc6b8e9df108} - {b7d6bb75-30ed-417a-8fe1-0c3016df362b} + {c185a1cf-9bfc-4b19-a2c2-de1752f095f6} diff --git a/Encodings/Encodings_vs120.vcxproj.filters b/Encodings/Encodings_vs120.vcxproj.filters index 996de9ff6..3ff7ad8c3 100644 --- a/Encodings/Encodings_vs120.vcxproj.filters +++ b/Encodings/Encodings_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {1220f3dc-1e22-4922-99a9-14b5a88651b4} + {c168d0b6-c8f4-45c3-b6e8-2e0c5d7f175a} - {c0a42369-7b44-46ba-81fd-c6ef459783c7} + {0b668360-962f-4a97-9afa-7a0e9dcc9aba} - {cb73745c-3646-483c-bc19-c58ba7233ce4} + {ba9f521d-205d-457d-b739-97ba60f906d5} diff --git a/Encodings/Encodings_vs140.vcxproj b/Encodings/Encodings_vs140.vcxproj index c0e6aaba5..9a8c2eedc 100644 --- a/Encodings/Encodings_vs140.vcxproj +++ b/Encodings/Encodings_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_vs140.vcxproj.filters b/Encodings/Encodings_vs140.vcxproj.filters index 7220b304f..fce57d6f7 100644 --- a/Encodings/Encodings_vs140.vcxproj.filters +++ b/Encodings/Encodings_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {fa8399e7-48a3-47af-82ce-4f5376e2fb04} + {46441dd5-f910-4f58-970e-093e46e6efe0} - {9497a859-477b-418e-b514-84c970deb3d4} + {66bb2c8b-3d47-42ca-8c01-584b8caa6eaf} - {2851012f-ca63-42c9-b2d3-cf0695acf1de} + {1a0eed93-c5b8-455e-8b9e-35d96b2506f4} diff --git a/Encodings/Encodings_vs150.vcxproj b/Encodings/Encodings_vs150.vcxproj index 3382b67c0..b045398ff 100644 --- a/Encodings/Encodings_vs150.vcxproj +++ b/Encodings/Encodings_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.4 + <_ProjectFileVersion>15.0.27625.0 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_vs150.vcxproj.filters b/Encodings/Encodings_vs150.vcxproj.filters index 8212081be..0966f5053 100644 --- a/Encodings/Encodings_vs150.vcxproj.filters +++ b/Encodings/Encodings_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {25e4f9d1-f081-4e2e-8e8d-43bb9598c651} + {c58d78b3-187a-449b-bd82-f78877046f86} - {a9f595a1-13f6-4b55-a704-30f19b52f4de} + {0da67222-7053-42f9-90b8-4b878b9ab28d} - {1c136854-e34a-4264-9766-f253b50e0044} + {96b274e1-0a0c-4a0a-a17e-7c84e2e6a4e2} diff --git a/Encodings/Encodings_x64_vs100.vcxproj.filters b/Encodings/Encodings_x64_vs100.vcxproj.filters index de3b29457..8bf4c726d 100644 --- a/Encodings/Encodings_x64_vs100.vcxproj.filters +++ b/Encodings/Encodings_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {8a720583-b0c1-4da7-a814-ac31474552a4} + {34d08c09-0c7a-4f3e-b034-2a1afb4b8d41} - {e0afbb0d-e79b-4df5-81eb-06aa90ee1cb5} + {1bba0102-1d98-49f4-8c86-d6cc964a5fcb} - {3c60e666-2bc8-4846-9d2b-b0b0adf15290} + {727f3ad2-44cd-4059-87ca-3ce3a8bfc723} diff --git a/Encodings/Encodings_x64_vs110.vcxproj b/Encodings/Encodings_x64_vs110.vcxproj index 2122616a4..aed120f91 100644 --- a/Encodings/Encodings_x64_vs110.vcxproj +++ b/Encodings/Encodings_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoEncodings64d PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_x64_vs110.vcxproj.filters b/Encodings/Encodings_x64_vs110.vcxproj.filters index 15ca85c43..783018eb9 100644 --- a/Encodings/Encodings_x64_vs110.vcxproj.filters +++ b/Encodings/Encodings_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {7fddcd46-339e-4892-a48a-ee3cb474e7b0} + {c8e1ce6c-25f6-4cfe-ac2d-cf6a835abdb5} - {56ff6c06-3047-4df8-b4ff-8aa8112bc572} + {e0989893-d4e5-4bfe-a198-a880483a2d68} - {bd4735d8-f011-4fb7-9826-378d158af9e4} + {c7addbbe-9e1f-4021-83ad-4ca6e0434e51} diff --git a/Encodings/Encodings_x64_vs120.vcxproj.filters b/Encodings/Encodings_x64_vs120.vcxproj.filters index 6b9b08d4a..94c569320 100644 --- a/Encodings/Encodings_x64_vs120.vcxproj.filters +++ b/Encodings/Encodings_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {4afbbf71-80da-4450-a3ec-913f83c57c7e} + {be7133e4-003e-4b06-b9ed-acd180699a56} - {ba7f55ff-6ae2-42c5-a7ce-e0f09852c937} + {cc0f1338-56d3-4e74-8f01-24a1740086dd} - {d547e80e-38ca-470c-a48e-b5800b7494c4} + {a1511967-70a1-48c4-9245-d0125e9b8992} diff --git a/Encodings/Encodings_x64_vs140.vcxproj b/Encodings/Encodings_x64_vs140.vcxproj index c0fdee2b6..f8c9f1d23 100644 --- a/Encodings/Encodings_x64_vs140.vcxproj +++ b/Encodings/Encodings_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoEncodings64d PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_x64_vs140.vcxproj.filters b/Encodings/Encodings_x64_vs140.vcxproj.filters index 63cc6524e..806c514ec 100644 --- a/Encodings/Encodings_x64_vs140.vcxproj.filters +++ b/Encodings/Encodings_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {e52cd067-940d-4de9-b2ed-ec66e2bb9dce} + {44025d70-192e-4d43-97e8-6973713b2682} - {1c0df9f0-b912-4986-8e04-dac903446eab} + {4928ce16-cb65-4730-bc80-cc972ef5d192} - {e346d2f8-a59d-48ec-a1ee-a715df206486} + {811dc66e-8f41-44e4-bc56-dd81413fe892} diff --git a/Encodings/Encodings_x64_vs150.vcxproj b/Encodings/Encodings_x64_vs150.vcxproj index 7573ae60d..4931a9b93 100644 --- a/Encodings/Encodings_x64_vs150.vcxproj +++ b/Encodings/Encodings_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.4 + <_ProjectFileVersion>15.0.27625.0 PocoEncodings64d PocoEncodingsmdd PocoEncodingsmtd diff --git a/Encodings/Encodings_x64_vs150.vcxproj.filters b/Encodings/Encodings_x64_vs150.vcxproj.filters index 33d1386e7..b803370ff 100644 --- a/Encodings/Encodings_x64_vs150.vcxproj.filters +++ b/Encodings/Encodings_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {40db684d-e018-41e6-b26b-8bb64ae404b1} + {80b8a764-78ad-4662-9072-64fe64be2042} - {3b916edc-87b0-4a1f-a302-de1a596bbd28} + {64d859fb-ba8f-454a-a331-5c5f1ee13ae2} - {0c6bfe97-9bca-44a2-aa22-c9b7d5a54008} + {18e06686-5d18-4013-85b0-418ecf4adc86} diff --git a/Encodings/testsuite/TestSuite_CE_vs90.vcproj b/Encodings/testsuite/TestSuite_CE_vs90.vcproj index 121e13398..188c2e542 100644 --- a/Encodings/testsuite/TestSuite_CE_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj index 6a2e31bc2..26d5317ae 100644 --- a/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -3,7 +3,7 @@ - + TestSuite diff --git a/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 68304b5c7..b586ddbb4 100644 --- a/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {00745ad6-062f-4701-b5f4-6f6ca335d747} + {ab75eece-c934-4669-a986-2728a8f6c11e} - {acb7726a-afde-4d3d-a212-4d1b868859a2} + {25029889-3ffd-41eb-b755-96bac21218ec} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj index 77f56ad06..15becff3c 100644 --- a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -2,8 +2,8 @@ + - TestSuite diff --git a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index fe63a356a..19df20ae0 100644 --- a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {07d54ed3-c64e-4b4a-8289-830856facd79} + {0862493f-1ef9-41ed-9309-e698de0e189c} - {affc840d-20cf-4edd-95a0-84ac315faf6d} + {72ed1cf8-63fb-4e91-9a64-c62661274e19} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_vs100.vcxproj b/Encodings/testsuite/TestSuite_vs100.vcxproj index 35a395369..22026692c 100644 --- a/Encodings/testsuite/TestSuite_vs100.vcxproj +++ b/Encodings/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/Encodings/testsuite/TestSuite_vs100.vcxproj.filters b/Encodings/testsuite/TestSuite_vs100.vcxproj.filters index 1c274764b..20c4bba55 100644 --- a/Encodings/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {1ed83f5e-752c-4980-9f4d-8419e1f24295} + {7b795fdf-617c-4c9a-8169-b16fa0c3bf0b} - {48a878bd-dfe3-4981-a97f-dff0c6515acb} + {5cd6a950-8d6d-49dd-9bc6-fd60ecff47ac} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_vs110.vcxproj b/Encodings/testsuite/TestSuite_vs110.vcxproj index 046035261..f656d713b 100644 --- a/Encodings/testsuite/TestSuite_vs110.vcxproj +++ b/Encodings/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +308,7 @@ - + diff --git a/Encodings/testsuite/TestSuite_vs110.vcxproj.filters b/Encodings/testsuite/TestSuite_vs110.vcxproj.filters index 6f2abf7d9..f8f2131d6 100644 --- a/Encodings/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {0dc9f1d9-07fe-4c3d-8566-550845fd2c06} + {e3f210c6-c173-4f7e-8cc1-6d1bfb0ce1bc} - {b5763771-47e9-4bc3-891e-594da0a067e1} + {3c331928-8f2e-49f1-a7bd-ab85a669e00e} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_vs120.vcxproj b/Encodings/testsuite/TestSuite_vs120.vcxproj index bc4853af4..7da7e62f3 100644 --- a/Encodings/testsuite/TestSuite_vs120.vcxproj +++ b/Encodings/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_vs120.vcxproj.filters index 63371c9fc..96e7d0b1d 100644 --- a/Encodings/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {e3558828-ddc2-445e-949f-bdc9be723231} + {c1e0781b-4fc4-4117-b1a2-b33cc4c60d0d} - {b4127118-c66d-415b-a2ac-0a6cb96a280d} + {7988a6d6-36ef-4a08-b750-3ad4ad6ce120} diff --git a/Encodings/testsuite/TestSuite_vs140.vcxproj b/Encodings/testsuite/TestSuite_vs140.vcxproj index 7000316d4..eeffa4cc8 100644 --- a/Encodings/testsuite/TestSuite_vs140.vcxproj +++ b/Encodings/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_vs140.vcxproj.filters b/Encodings/testsuite/TestSuite_vs140.vcxproj.filters index e807fb328..33025f4ea 100644 --- a/Encodings/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {365ee5a4-ea9c-4791-a402-04955f3312e5} + {635c052b-3214-4d63-b3f7-7d9051a67ad5} - {a13d804e-ad65-4098-9837-7e03758369f5} + {44e0d005-32f1-4f8c-add2-2e223ade2fa7} diff --git a/Encodings/testsuite/TestSuite_vs150.vcxproj b/Encodings/testsuite/TestSuite_vs150.vcxproj index 6bd8b9824..b82eb1422 100644 --- a/Encodings/testsuite/TestSuite_vs150.vcxproj +++ b/Encodings/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_vs150.vcxproj.filters b/Encodings/testsuite/TestSuite_vs150.vcxproj.filters index 9edba9917..d892fd867 100644 --- a/Encodings/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {cff4b17b-ded0-4cb9-84aa-381dd51305bd} + {b84f6ba0-a789-483c-b7a4-34fe9a5a1cf4} - {6340741a-dc52-48f0-8e8d-0f7f77d75f71} + {f72d23da-1351-454b-9537-6421885998a2} diff --git a/Encodings/testsuite/TestSuite_vs90.vcproj b/Encodings/testsuite/TestSuite_vs90.vcproj index 95b846578..618f1297b 100644 --- a/Encodings/testsuite/TestSuite_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj index 4194c0371..a4ae503da 100644 --- a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters index 156f4123f..ceb45c8cb 100644 --- a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {34d61074-c142-41c6-8cc4-e4d8198e925b} + {9d5a5caa-6e54-4b9b-a7f7-e42ff73b107b} - {96379473-2baf-45ae-8d39-12b46ce8756f} + {01c85d58-ab31-43f2-ae11-9fd7480dcf77} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj index 72378a104..69e9ee15d 100644 --- a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +308,7 @@ - + diff --git a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters index 002f476b6..af96ec43c 100644 --- a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {6f4705a7-4621-4185-9819-c0e59e503450} + {f3fac9f7-5fcb-4bc9-a1cb-e74b4663916b} - {f7fbdae8-41db-492f-9e2e-17831c4ee7cf} + {0ec2cf4d-2f89-4d39-915f-53b1dbea4885} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj index fee0f19ec..37d4d3ef6 100644 --- a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters index ce42141f6..583410c95 100644 --- a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {824d913f-2777-4a5c-bed7-7e15267b0d93} + {d60cf7dc-a706-426a-8bd0-4e8fa4928c46} - {e34ccd9b-980b-424d-8083-6ecd18ebffd3} + {e43e4e28-631f-462c-9ee5-50461c64c09b} diff --git a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj index 7e4e5836b..5de7d9c79 100644 --- a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters index 4bdccda7d..f8b24bb1a 100644 --- a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {24fd67d9-2b04-4ad8-a732-9aa41aa20d56} + {0daf700a-1988-4c77-9419-09e7a7b7434e} - {dd0e1290-a54c-444d-8198-4aa5388713fb} + {3f4d45de-6888-4e14-a0cb-8908a322c5e6} diff --git a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj index ba7eaec9f..0f841c221 100644 --- a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters index bf001a9ef..6073315e1 100644 --- a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {b488d527-f296-469f-a4ba-ffc7eb07cb54} + {24450d56-34d5-4f83-a068-7140d7da615b} - {3820db3f-d0fb-43a9-a82c-a647d5be76c5} + {19be3fb5-3645-4a6e-859d-df3a0bc0acb3} diff --git a/Encodings/testsuite/TestSuite_x64_vs90.vcproj b/Encodings/testsuite/TestSuite_x64_vs90.vcproj index 6b3899303..8b2420ee7 100644 --- a/Encodings/testsuite/TestSuite_x64_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Encodings\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Encodings\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj b/Foundation/Foundation_WEC2013_vs110.vcxproj index 09cc73230..aea5ce388 100644 --- a/Foundation/Foundation_WEC2013_vs110.vcxproj +++ b/Foundation/Foundation_WEC2013_vs110.vcxproj @@ -1,30 +1,245 @@ - + - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Foundation @@ -35,75 +250,12 @@ SDK_AM335X_SK_WEC2013_V300 CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - true - ..\bin\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - false - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ + <_ProjectFileVersion>11.0.50727.1 PocoFoundationd PocoFoundationmdd PocoFoundationmtd @@ -111,1200 +263,331 @@ PocoFoundationmd PocoFoundationmt - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - NotUsing - Level3 - Default - ProgramDatabase - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\$(TargetName).dll - true - true - ..\bin\$(Platform)\$(TargetName).pdb - WindowsCE - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\$(TargetName).dll - true - false - - - WindowsCE - true - true - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - NotUsing - Level3 - Default - ..\lib\$(Platform)\$(TargetName).pdb - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - NotUsing - Level3 - Default - ..\lib\$(Platform)\$(TargetName).pdb - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreaded - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\$(TargetName).lib - - + - - - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Document - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - + + - - - true - true - true - true - - - - - - \ No newline at end of file + + + diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters index 59a26fdb3..85bb93afa 100644 --- a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {185c1200-1c1b-4fc7-9da0-b650d0c1bf77} + {78bea417-5d9d-4461-a225-b3bdc41ed346} - {e4438cfb-753c-4882-b6a7-37f1b2eb7924} + {8b5b3c99-dc41-45e5-b98b-9410a0c0fe88} - {5fef2634-dac7-4251-8cc6-685a55fb6b69} + {0588d0d5-1318-4af7-aa28-0db07f0fc873} - {27c4af78-bbb6-41df-a186-f2a592f6dd7e} + {3ed468d8-e9d9-4a35-ac3e-bc6cd69448db} - {faa6333e-8acd-42d3-b72c-37cd0e19d162} + {609de201-a24c-4431-afb5-e6beb798c249} - {d5c0096d-097d-40c2-ac9e-c52501bca586} + {84928494-f329-4734-a28a-22f8bfaaa62e} - {341c25b8-2c02-4356-98af-e9cdc028d65d} + {0c6eaf16-2f75-47de-ba3a-6c0c29b744e4} - {dcfb473d-2dc0-419b-82e5-49a02e866436} + {f77ede58-612c-429d-b524-c3e27808115b} - {82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8} + {c2546b06-ae9e-44c9-9e50-ad8ed113f0f4} - {2cf5d5b6-8945-4a08-8382-b1ae4760d23c} + {bdef5bd6-e3e7-40f5-b4fd-595a52899c8c} - {d7d8f3d7-1f4d-40b3-b2be-69b169947e81} + {457ba010-95d8-4d89-a5e9-3dff6d5ebd06} - {4eac0cd3-fa98-44f0-ba4b-126eea40690d} + {c6c4ec03-161d-47c4-bff0-3a9dcc9f27fb} - {641198e1-de95-4b94-8f88-740c2b199cf7} + {c621205c-5091-4e93-a088-5edfc997884e} - {69ead8e2-e830-4352-b858-3b7fa83c6f69} + {cdd53e93-ebd4-4109-bf20-69e82a1afc0b} - {86878c35-6789-4bed-96b4-27ddf9c57acd} + {60226828-7a54-43bd-ae7a-b194f0cc18ad} - {7de594c4-642c-4ac5-b236-7056ccaa6191} + {f5a466d2-8719-4b81-8148-5761ed093944} - {74d499e8-5aec-4f63-9522-26bc8b2e4e1e} + {9b56b8c9-20ff-479f-8740-2c9deb814106} - {aad0de07-cbb7-4cf9-acbb-46b3c529ef72} + {92854f17-ff9a-4e53-b2d4-bab099707047} - {59eea661-94fe-4cfa-a84a-3ed55d6fc6c2} + {a5c72900-cc75-4c21-b9e6-3ea90b06dde8} - {0b1828a5-18ba-4155-a8f9-2c488e582c0d} + {ea17bf51-d7f6-426b-8914-e9aa6c547047} - {ddc6a944-851d-4fae-9ae2-58c7abb800ae} + {b30e8fb7-baa2-436f-8f2c-e7fa33f9524d} - {96f5ad60-2335-463a-8e23-da1476ed46f2} + {f2ee217e-96c4-4316-8952-f5c849aa8661} - {06229b8b-13a0-43b1-8f11-53373321e5cd} + {6aa1b393-3d04-4e14-b9ae-7e99fd02cde8} - {5274aca5-2472-4212-a11a-7d23ff583083} + {49729d79-ebd7-496b-88f9-deeb2de8f50c} - {c9340af5-5ac1-4082-8fee-f6343b9ab2e2} + {3a978819-34f8-41d2-9814-07d7afa59d31} - {d723209d-84d0-4890-ac64-4949699f6e3a} + {fa9586fc-7951-41ff-9034-0a6277fcb82d} - {44de33ce-ef79-4671-8258-65dc5ef863b8} + {922b77bd-22ab-4fbf-8a66-a585c6826db9} - {39e651e5-e5c8-454d-b1f9-456c809dcf92} + {65a155f4-4506-4998-9ef0-11c213a8b0e3} - {732e2c8f-a8af-4318-9ab9-0d8d62afae54} + {26a3dfb2-abfd-4451-970b-ad642ee6577f} - {5d4bc826-9b0a-4014-9302-cc9f88646ff6} + {1d45f089-6894-491d-880f-b60186609e33} - {b8210208-8698-4cda-94fd-3e906f9ca78f} + {d70bd62a-e2ff-4b07-8524-adcf2ef70b99} - {af751147-0509-4d3c-9ab3-b20c20974341} + {7426dd17-1e9b-41e7-ab4b-89a3198727c9} - {359ad015-e38e-423e-877e-c827eed229f2} + {dce49618-b67c-4d25-b445-75ffe3a06639} - {3a817f74-6edb-4098-a29b-8347840a09ae} + {409ced24-fd86-419f-bb07-d5457deb73ea} - {a07318ae-554f-44ec-bdfd-6fe0929c3dd3} + {3f9052a9-9da6-4d98-8e91-c29c8b076b75} - {ece427ab-b6ef-4700-9a42-312b8507a010} + {f6769cce-2e75-46fa-aa9f-c953a2019819} - {eb8ddeab-7b2f-4537-aa4a-939268a1a9a4} + {8f529a2e-120a-4259-8278-da54d5b80e76} - {4bcbbcd9-3409-4bcc-b999-f9e360d45a09} + {d7f24490-be94-4505-a445-b15f57697f5a} - {48f74d8c-d6a2-4e5a-a322-55702b35b221} + {045d8af9-49dd-4049-8c59-52b2aac983ff} - {6c702a6b-e1d8-4d6e-9c48-dab631371287} + {b3bc33d6-6f3d-47e5-89e5-e9d2c807d484} - {e3e8d759-a950-40ed-9271-17bf7e9baa8e} + {04a80598-6f4d-4036-89b2-d1a9c9d04b5c} - {3ef3d3a4-84a1-4026-85dd-53e71f3f820f} + {9e165880-4857-4173-8548-adc30acafb68} - {665d566f-5f8f-45d0-b883-a43185dc8ab8} + {cde0989d-65f3-42da-bc4d-66d0b6d444e6} - {51e1620d-85e0-493d-819f-960bc0957f0f} + {f9232ee7-e315-4181-adcf-a474d63a1ed7} - {ee3f4314-64e7-420c-88d5-df016f15dd4f} + {49b4bb8d-37aa-4827-98fd-dc6ffc817901} - {bc06eae9-3602-448d-8290-4a9a68adbe8b} + {a0f5ff84-3188-41a5-8f2a-0ddad296a62f} - {1a21c5ef-d4a6-42dc-94be-5a0a791ba589} + {6c2bc1ba-8672-47ff-acd5-f7cabcbd8126} - {dafee4e1-a8e0-4af9-bd00-378430a364ea} + {a58c6f1f-ab85-4dd9-8d58-beac73d37534} - {cb46df12-6010-4ef6-9f85-937585263f3e} + {e6624acc-138a-4a7b-8d15-453ea0cd4ef9} - {50d1f7a3-d675-41b8-8370-2718b2e95c2f} + {37cec8d6-b4c5-4605-aea5-4a237d5aebb0} - {f2886094-2ba3-402c-b5a8-dbfa0500e3d3} + {548cb19c-cc0f-4bb7-8d3f-b622a960760d} - {7237275f-8924-4f26-96de-066ba722f9c6} + {edc126ec-077c-48f0-af6b-7ae96bbca8b8} - {cdb9c09a-2a19-4203-a6f4-87455a799508} + {8adb3d8f-5218-40ad-a1e8-52b3031325e4} - {040f6767-8762-4b80-9db2-45a2b18c1d86} + {51713fd6-170a-4d34-8ffc-91d6343adb17} - {3fd772e7-f8cf-42fb-8b1b-5c49b9f79562} + {cb3567d3-1ac7-4f97-a65c-1f6523832dd3} - {6e184876-2a72-4dd8-87e0-a42022d17513} + {59e54732-2d3c-412a-9db5-e34d032e7419} - {251118a8-6f5b-4f8f-b19f-b953058b3820} + {4a23cec2-169d-44a6-8743-6a7fb6fd5b6a} - {20c16777-1fc6-4272-bf38-fef730596f73} + {1cbd40b8-a0d2-416a-8747-a38427aaadad} - {da88549e-329c-444c-85bb-b2339bc09505} + {5ffbd909-1a77-4c5d-bc20-7b909c8eba50} - {1ad862ca-df95-43f5-a87b-a714b9b84303} + {602c73a2-0d74-4696-8712-aab56dd97774} - {918536bd-29fb-4b4f-a706-629925dbb66c} + {a952f60e-e0cc-4381-814f-5c14c0e21769} - {4d00a3d6-7a50-4553-a62a-8eee081c9fb1} + {2b96e931-8eef-4d9a-89cf-0cb69b8c7ec8} @@ -207,6 +207,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -246,6 +249,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -258,13 +264,16 @@ Core\Source Files + + Core\Source Files + Core\Source Files - + Core\Source Files - + Core\Source Files @@ -297,6 +306,9 @@ Streams\Source Files + + Streams\Source Files + Streams\Source Files @@ -483,6 +495,9 @@ RegularExpression\Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -492,24 +507,24 @@ RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -519,22 +534,16 @@ RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files RegularExpression\PCRE Source Files - + + RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files @@ -543,6 +552,9 @@ RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -561,6 +573,9 @@ Logging\Source Files + + Logging\Source Files + Logging\Source Files @@ -603,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -660,10 +672,7 @@ Filesystem\Source Files - - Filesystem\Source Files - - + Filesystem\Source Files @@ -810,6 +819,9 @@ Text\Source Files + + Text\Source Files + Text\Source Files @@ -837,12 +849,21 @@ Text\Source Files + + Text\Source Files + Text\Source Files Text\Source Files + + Text\Source Files + + + Text\Source Files + Text\Source Files @@ -876,45 +897,15 @@ Hashing\Source Files - - Filesystem\Source Files - Dynamic\Source Files Dynamic\Source Files - + Dynamic\Source Files - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Streams\Source Files - - - Text\Source Files - - - DateTime\Source Files - - - Filesystem\Source Files - - - Logging\Source Files - - - Core - @@ -977,6 +968,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files @@ -1004,10 +998,7 @@ Core\Header Files - - Core\Header Files - - + Core\Header Files @@ -1034,6 +1025,12 @@ Core\Header Files + + Core\Header Files + + + Core\Header Files + Core\Header Files @@ -1055,6 +1052,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files @@ -1301,6 +1301,9 @@ Crypt\Header Files + + Crypt\Header Files + Crypt\Header Files @@ -1367,6 +1370,9 @@ Logging\Header Files + + Logging\Header Files + Logging\Header Files @@ -1409,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1475,16 +1478,7 @@ Filesystem\Header Files - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - + Filesystem\Header Files @@ -1625,9 +1619,15 @@ Text\Header Files + + Text\Header Files + Text\Header Files + + Text\Header Files + Text\Header Files @@ -1652,12 +1652,21 @@ Text\Header Files + + Text\Header Files + Text\Header Files Text\Header Files + + Text\Header Files + + + Text\Header Files + Text\Header Files @@ -1700,6 +1709,9 @@ Events\Header Files + + Events\Header Files + Events\Header Files @@ -1730,12 +1742,24 @@ Events\Header Files + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + Cache\Header Files Cache\Header Files + + Cache\Header Files + Cache\Header Files @@ -1814,15 +1838,6 @@ Hashing\Header Files - - Cache\Header Files - - - Events\Header Files - - - Filesystem\Header Files - Dynamic\Header Files @@ -1838,48 +1853,11 @@ Dynamic\Header Files - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Crypt\Header Files - - - Filesystem\Header Files - - - Logging\Header Files - - - Core\Header Files - + + + + Logging\Message Files + @@ -1887,9 +1865,4 @@ - - - Logging\Message Files - - \ No newline at end of file diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj b/Foundation/Foundation_WEC2013_vs120.vcxproj index fa419b483..32e4e1158 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj @@ -1,30 +1,245 @@ - - + + - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Foundation @@ -35,75 +250,12 @@ SDK_AM335X_SK_WEC2013_V310 CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - + + + + - <_ProjectFileVersion>10.0.30319.1 - ..\bin\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - true - ..\bin\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - false - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ - ..\lib\$(Platform)\ - obj\Foundation\$(Platform)\$(Configuration)\ + <_ProjectFileVersion>12.0.30501.0 PocoFoundationd PocoFoundationmdd PocoFoundationmtd @@ -111,1200 +263,331 @@ PocoFoundationmd PocoFoundationmt - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - NotUsing - Level3 - Default - ProgramDatabase - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\$(TargetName).dll - true - true - ..\bin\$(Platform)\$(TargetName).pdb - WindowsCE - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;_USRDLL;Foundation_EXPORTS;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\$(TargetName).dll - true - false - - - WindowsCE - true - true - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreadedDLL - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - NotUsing - Level3 - Default - ..\lib\$(Platform)\$(TargetName).pdb - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - Disabled - .\include;%(AdditionalIncludeDirectories) - _DEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - true - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - NotUsing - Level3 - Default - ..\lib\$(Platform)\$(TargetName).pdb - - - ..\lib\$(Platform)\$(TargetName).lib - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;%(AdditionalIncludeDirectories) - NDEBUG;Foundation_EXPORTS;POCO_STATIC;PCRE_STATIC;%(PreprocessorDefinitions) - false - false - false - true - MultiThreaded - false - true - true - true - NotUsing - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\$(TargetName).lib - - + - - - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - Document - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - mc -h "%(RootDir)%(Directory)." -r "%(RootDir)%(Directory)." "%(FullPath) - - %(RootDir)%(Directory)\pocomsg.rc;%(RootDir)%(Directory)\pocomsg.h;%(Outputs) - + + - - - true - true - true - true - - - - - - \ No newline at end of file + + + diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters index 59a26fdb3..da39f5ce7 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {185c1200-1c1b-4fc7-9da0-b650d0c1bf77} + {383edbd3-fc9f-498e-ae5e-d38b8f84decd} - {e4438cfb-753c-4882-b6a7-37f1b2eb7924} + {0e3eb482-51f9-4475-9dcb-e4b70c5f2af6} - {5fef2634-dac7-4251-8cc6-685a55fb6b69} + {38affb0e-8700-4177-ac71-7a659f9c79fc} - {27c4af78-bbb6-41df-a186-f2a592f6dd7e} + {f4ca4888-9d33-4c29-9b2e-a823d82a3e21} - {faa6333e-8acd-42d3-b72c-37cd0e19d162} + {4fb824a8-8af4-4b68-acbe-b9e9b2b922f4} - {d5c0096d-097d-40c2-ac9e-c52501bca586} + {6ab506aa-b16f-4d0b-bfe9-30bb4b0b914f} - {341c25b8-2c02-4356-98af-e9cdc028d65d} + {b6ce9e83-2ab6-4f01-a5f8-bedf99d89191} - {dcfb473d-2dc0-419b-82e5-49a02e866436} + {48e84cfc-c865-41dd-9436-6aaaa00fdfaf} - {82d7f0b3-7dcc-44f9-8982-ab3afbcc8cd8} + {b96a1b01-3230-4640-adea-6816cf784120} - {2cf5d5b6-8945-4a08-8382-b1ae4760d23c} + {99ba9947-918a-4e2e-9f0f-5782464a243d} - {d7d8f3d7-1f4d-40b3-b2be-69b169947e81} + {b8ed8d12-8048-4c95-b65c-d9215c7c5c38} - {4eac0cd3-fa98-44f0-ba4b-126eea40690d} + {75f8140e-9504-4beb-bccc-db7313d6f622} - {641198e1-de95-4b94-8f88-740c2b199cf7} + {0303852d-7dae-49de-abc4-0888851ba4df} - {69ead8e2-e830-4352-b858-3b7fa83c6f69} + {c2b1bc37-9295-4afb-8cfd-7626d03b1fdd} - {86878c35-6789-4bed-96b4-27ddf9c57acd} + {524db27c-22fb-4f2e-a54a-5fa714e3a48c} - {7de594c4-642c-4ac5-b236-7056ccaa6191} + {2407b905-ce7e-48ac-851e-84be5be98e2a} - {74d499e8-5aec-4f63-9522-26bc8b2e4e1e} + {42979991-6b87-4614-9b10-9d9695a3881e} - {aad0de07-cbb7-4cf9-acbb-46b3c529ef72} + {7912f417-9c9b-411d-b842-2d1521d09522} - {59eea661-94fe-4cfa-a84a-3ed55d6fc6c2} + {bcacf2cd-5524-4aa9-9eca-dae0abc2b77b} - {0b1828a5-18ba-4155-a8f9-2c488e582c0d} + {b5f40a10-f468-46b3-9c7d-8dbee912154d} - {ddc6a944-851d-4fae-9ae2-58c7abb800ae} + {9920e90e-7a07-4635-ba63-6835050a17d4} - {96f5ad60-2335-463a-8e23-da1476ed46f2} + {9ce92f66-bd8e-4531-8399-d72606289829} - {06229b8b-13a0-43b1-8f11-53373321e5cd} + {caae2cba-b49e-4a70-ad20-ebac4e2c3f47} - {5274aca5-2472-4212-a11a-7d23ff583083} + {47bce673-02c5-4f21-baac-3aa345e12aec} - {c9340af5-5ac1-4082-8fee-f6343b9ab2e2} + {34ef49c9-6251-4db5-b3e7-b449cef2d46b} - {d723209d-84d0-4890-ac64-4949699f6e3a} + {62dc9a26-7a7c-4cb2-83b5-644b3d67d61c} - {44de33ce-ef79-4671-8258-65dc5ef863b8} + {9b9dc4db-4bb6-415d-b7a4-82b7449e9419} - {39e651e5-e5c8-454d-b1f9-456c809dcf92} + {3ba4e3c1-50d4-43ce-bb0b-f242dcd042df} - {732e2c8f-a8af-4318-9ab9-0d8d62afae54} + {dc49258a-8ee8-401e-a2cf-3c902a259f70} - {5d4bc826-9b0a-4014-9302-cc9f88646ff6} + {b16461e9-f4fc-47f3-8fc6-7bef9a9a889f} - {b8210208-8698-4cda-94fd-3e906f9ca78f} + {2c81bfdd-6ea4-4ea1-8c52-3c379c191b45} - {af751147-0509-4d3c-9ab3-b20c20974341} + {79d030bf-8db0-4308-bc2c-218ae683d12c} - {359ad015-e38e-423e-877e-c827eed229f2} + {9391b769-d3ce-487e-bfab-f90cb3e8ace8} - {3a817f74-6edb-4098-a29b-8347840a09ae} + {1870d4ac-586a-4653-a4fd-5be5a2bb278b} - {a07318ae-554f-44ec-bdfd-6fe0929c3dd3} + {70168f0a-e045-4a75-a91b-2f83cac98c4a} - {ece427ab-b6ef-4700-9a42-312b8507a010} + {39598ded-0c45-4028-8341-7a4f24a9e11a} - {eb8ddeab-7b2f-4537-aa4a-939268a1a9a4} + {6499451a-49af-4c0b-a1dd-2ef9192aae23} - {4bcbbcd9-3409-4bcc-b999-f9e360d45a09} + {4c5ce1e8-8058-4765-826d-e90b899be861} - {48f74d8c-d6a2-4e5a-a322-55702b35b221} + {e0f55ffe-fb1d-4d3a-80a0-e58676ec9f46} - {6c702a6b-e1d8-4d6e-9c48-dab631371287} + {1ed0be10-98be-4900-ac5e-714f4532f4aa} - {e3e8d759-a950-40ed-9271-17bf7e9baa8e} + {6baa2e5e-18c2-48c2-bb24-4be80bfb5902} - {3ef3d3a4-84a1-4026-85dd-53e71f3f820f} + {edbe7ded-c813-4151-b2e3-c81faa29d261} - {665d566f-5f8f-45d0-b883-a43185dc8ab8} + {e77021c4-6568-4207-b5c1-2191a3e5b9bc} - {51e1620d-85e0-493d-819f-960bc0957f0f} + {5b77876a-b6e6-457c-a03c-17543aa0a6a8} - {ee3f4314-64e7-420c-88d5-df016f15dd4f} + {516ce7d9-a9f7-4c3a-ab47-f244969ad479} - {bc06eae9-3602-448d-8290-4a9a68adbe8b} + {a9948ee6-8207-45b0-8d44-12649eeedb69} - {1a21c5ef-d4a6-42dc-94be-5a0a791ba589} + {ac6593f8-aaa3-4f1e-aecc-80d52e7e0735} - {dafee4e1-a8e0-4af9-bd00-378430a364ea} + {4bbe15f4-c980-4450-a351-2cc5993ccdda} - {cb46df12-6010-4ef6-9f85-937585263f3e} + {9aa51fd2-9a28-40c8-9721-06802e1ed60b} - {50d1f7a3-d675-41b8-8370-2718b2e95c2f} + {8caed74d-81b7-4e80-a816-73b8b794b5df} - {f2886094-2ba3-402c-b5a8-dbfa0500e3d3} + {6ac15795-93de-4397-9650-f04b504ec64e} - {7237275f-8924-4f26-96de-066ba722f9c6} + {065f74a7-ab8e-438b-bb56-dedd671725e5} - {cdb9c09a-2a19-4203-a6f4-87455a799508} + {eeb57074-22fd-475c-b8d0-60d4e78235cb} - {040f6767-8762-4b80-9db2-45a2b18c1d86} + {90751ed6-c85f-418f-aded-a35e8053a6a0} - {3fd772e7-f8cf-42fb-8b1b-5c49b9f79562} + {47a4fc11-e824-4b43-b8ef-b04fa677604f} - {6e184876-2a72-4dd8-87e0-a42022d17513} + {ffd35eec-9c8e-41c4-8560-c8652bcf4683} - {251118a8-6f5b-4f8f-b19f-b953058b3820} + {ddcba694-7748-457f-8b1b-f762f16795bc} - {20c16777-1fc6-4272-bf38-fef730596f73} + {aa908e6a-03be-4e28-9c0f-09593f865921} - {da88549e-329c-444c-85bb-b2339bc09505} + {61657d2b-a861-420d-b0fb-a690f8bc47b5} - {1ad862ca-df95-43f5-a87b-a714b9b84303} + {4e755808-0e4e-4397-8ae0-b5f91eed0689} - {918536bd-29fb-4b4f-a706-629925dbb66c} + {6dbb21c4-313a-4198-bd21-fea0ccc7aef3} - {4d00a3d6-7a50-4553-a62a-8eee081c9fb1} + {3fb2fd86-5236-4a8d-94a7-a6d9e5acdc90} @@ -207,6 +207,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -246,6 +249,9 @@ Core\Source Files + + Core\Source Files + Core\Source Files @@ -258,13 +264,16 @@ Core\Source Files + + Core\Source Files + Core\Source Files - + Core\Source Files - + Core\Source Files @@ -297,6 +306,9 @@ Streams\Source Files + + Streams\Source Files + Streams\Source Files @@ -483,6 +495,9 @@ RegularExpression\Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -492,24 +507,24 @@ RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -519,22 +534,16 @@ RegularExpression\PCRE Source Files - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - - - RegularExpression\PCRE Source Files - RegularExpression\PCRE Source Files RegularExpression\PCRE Source Files - + + RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files @@ -543,6 +552,9 @@ RegularExpression\PCRE Source Files + + RegularExpression\PCRE Source Files + RegularExpression\PCRE Source Files @@ -561,6 +573,9 @@ Logging\Source Files + + Logging\Source Files + Logging\Source Files @@ -603,9 +618,6 @@ Logging\Source Files - - Logging\Source Files - Logging\Source Files @@ -660,10 +672,7 @@ Filesystem\Source Files - - Filesystem\Source Files - - + Filesystem\Source Files @@ -810,6 +819,9 @@ Text\Source Files + + Text\Source Files + Text\Source Files @@ -837,12 +849,21 @@ Text\Source Files + + Text\Source Files + Text\Source Files Text\Source Files + + Text\Source Files + + + Text\Source Files + Text\Source Files @@ -876,45 +897,15 @@ Hashing\Source Files - - Filesystem\Source Files - Dynamic\Source Files Dynamic\Source Files - + Dynamic\Source Files - - Text\Source Files - - - Text\Source Files - - - Text\Source Files - - - Streams\Source Files - - - Text\Source Files - - - DateTime\Source Files - - - Filesystem\Source Files - - - Logging\Source Files - - - Core - @@ -977,6 +968,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files @@ -1004,10 +998,7 @@ Core\Header Files - - Core\Header Files - - + Core\Header Files @@ -1034,6 +1025,12 @@ Core\Header Files + + Core\Header Files + + + Core\Header Files + Core\Header Files @@ -1055,6 +1052,9 @@ Core\Header Files + + Core\Header Files + Core\Header Files @@ -1301,6 +1301,9 @@ Crypt\Header Files + + Crypt\Header Files + Crypt\Header Files @@ -1367,6 +1370,9 @@ Logging\Header Files + + Logging\Header Files + Logging\Header Files @@ -1409,9 +1415,6 @@ Logging\Header Files - - Logging\Header Files - Logging\Header Files @@ -1475,16 +1478,7 @@ Filesystem\Header Files - - Filesystem\Header Files - - - Filesystem\Header Files - - - Filesystem\Header Files - - + Filesystem\Header Files @@ -1625,9 +1619,15 @@ Text\Header Files + + Text\Header Files + Text\Header Files + + Text\Header Files + Text\Header Files @@ -1652,12 +1652,21 @@ Text\Header Files + + Text\Header Files + Text\Header Files Text\Header Files + + Text\Header Files + + + Text\Header Files + Text\Header Files @@ -1700,6 +1709,9 @@ Events\Header Files + + Events\Header Files + Events\Header Files @@ -1730,12 +1742,24 @@ Events\Header Files + + Events\Header Files + + + Events\Header Files + + + Events\Header Files + Cache\Header Files Cache\Header Files + + Cache\Header Files + Cache\Header Files @@ -1814,15 +1838,6 @@ Hashing\Header Files - - Cache\Header Files - - - Events\Header Files - - - Filesystem\Header Files - Dynamic\Header Files @@ -1838,48 +1853,11 @@ Dynamic\Header Files - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - Core\Header Files - - - Streams\Header Files - - - Text\Header Files - - - Text\Header Files - - - Core\Header Files - - - Core\Header Files - - - Core\Header Files - - - Crypt\Header Files - - - Filesystem\Header Files - - - Logging\Header Files - - - Core\Header Files - + + + + Logging\Message Files + @@ -1887,9 +1865,4 @@ - - - Logging\Message Files - - \ No newline at end of file diff --git a/Foundation/Foundation_vs100.sln b/Foundation/Foundation_vs100.sln index ac7c3f1e7..52a5fea1d 100644 --- a/Foundation/Foundation_vs100.sln +++ b/Foundation/Foundation_vs100.sln @@ -10,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index c245549c9..8cc688f26 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -2,190 +2,190 @@ - {8bf49364-2fab-4b2a-b54a-198162cd8f5a} + {52cba2e2-162b-494b-922a-21f1e3c16255} - {398cf0ed-7e39-4bfa-89d7-4dc7c0418b14} + {339020b6-c45b-4a42-8bde-d1867eda8931} - {10134229-ccce-4a3f-9454-8ffe666c1cd2} + {98a47f21-d49c-42a7-a309-c7936ba45e72} - {41ea4147-daf4-45f8-a67f-8ccfb597f933} + {b758e8a4-e703-424c-9dc5-aebff277cd9d} - {9bca93f0-5ed9-4630-a1ff-3960279956af} + {0cb8bf2f-41cf-49c4-8479-5cf3f537b965} - {1b831b2a-9563-4407-bfef-796300215d5a} + {b7ce8eef-1957-4503-b4bf-1879a5f542c5} - {712e61d5-055a-4db8-8c3a-70d223188f43} + {c30278f2-ba4c-4185-b426-f244a035acfe} - {bef2e247-aed3-467b-81f5-fbfa821d7228} + {d5a6c9ed-b42f-4d5a-8023-30e2badc0f67} - {526bf7e1-4a24-4d60-b298-c3b4616b7632} + {c003796c-48fc-4bea-bf55-8d8f88d3a5c5} - {4893e2f3-fd02-4cb7-b35d-30d0eb4e3ac4} + {7dc23971-2351-40bc-b3b1-657adffc85e0} - {1ed1dfb1-8db1-42d1-a49d-17e0bec1a3fe} + {930bb813-bb57-4e10-aab0-f39251501f55} - {d22d0d44-8f43-4a6d-993e-8f8693010535} + {b875bb55-0732-4bc5-badf-3cc957fd12cf} - {c9dc82c5-7aaa-4378-9dd8-e0e97868df4e} + {092593e0-2b1d-4ab9-99af-9be36d1db999} - {c2913a74-194b-4dad-af97-c9da97c59524} + {f94ca9c4-9cf5-40d1-aba5-112350824b7b} - {247bc685-c4f4-4233-a232-4694fa2e2f55} + {fc4815b3-a9da-4e9a-a2a8-88a0e0b504da} - {bfa55984-601b-4926-a436-c9cfc3b344fe} + {6409890e-211c-4f9a-ba64-62c138461e0e} - {2948b609-8f0d-4813-bb80-d1d7920b5191} + {0e0e0d8a-55fc-4216-9dd2-14076e67a56f} - {a980bb80-c95b-4ba5-b38f-6de2673aab7c} + {e3c825e5-1778-4fd8-a82f-5f6feae28864} - {68d504e5-b85b-45b2-9b2c-d4006a4b5bc3} + {e29a283b-804d-4f83-9f52-4749061f2395} - {516d1f92-5876-4e3b-a648-dc1a04000562} + {241cd7c0-05a0-4701-8b22-7f4ab4bf346a} - {48a5636f-cdc2-4321-b59c-950de2fe31f7} + {71c203fc-ce0c-4468-9d73-258dfbff2903} - {817f9749-a4ae-48a0-b777-37bebe929b8b} + {4ad20cc4-691e-42c5-a5fc-a795fc949f17} - {bc8a33bb-ccfd-45ca-846e-ec417e0b4f23} + {70a0bf00-41a3-4e25-a3b9-269003ad0201} - {64a3530b-83c0-4ce2-9f55-87100be1f9cd} + {114fb7d2-ddcc-41d9-bc26-ebbbdbe4ae4a} - {f9d2a0c8-cf90-44ed-ac67-1d07460f9297} + {a11b852b-79d6-4744-8b42-9a68a0b5a928} - {319fe7cd-beab-4776-886f-1984a29b9d9a} + {3aec826b-907a-4572-b0d6-df1ea8846ef5} - {a882f2a7-b0a1-4318-a178-e5c7cbe08ba7} + {0308a9de-26f2-46c2-86d7-8060ea22ce17} - {bec56968-563f-497d-a569-c9cc6612774b} + {1e093607-5e05-49d0-8523-d48855eefdf7} - {d4d02b7b-ec73-4883-ac09-166753fb6f2b} + {a13a4ebc-35f0-422f-a279-62b7aef688ba} - {59c1e671-040a-490c-9672-e6a512f5e88e} + {0b0b08f9-ee86-4a86-a277-66d85f7ab61b} - {ca8469d0-4651-49f5-a414-02b981383e9a} + {96b5f945-aba5-4eee-842a-897a6cfcc300} - {32728fc8-8bbe-4237-84f7-50538b48a060} + {26486aa4-9006-4966-ba17-2b19b120b9a7} - {46b5e70e-626f-459c-87f0-639063e8a566} + {124d754b-a27c-4742-bc4d-3a60b5991594} - {0fb72bcf-bd97-4207-b7a4-84ebe17c5cc6} + {f0d75592-bde0-4771-9bbb-455f83de5c0c} - {1c148f35-393e-454b-8f76-a67a33f865ab} + {938aaa8f-c856-4e2f-b09c-bebf4eacf288} - {ca832198-30f0-4d9d-89b0-1ab01d595c3e} + {7237bf1e-9b7e-4080-8c03-16a85c426f4f} - {f2350a1e-baaa-414a-bce7-dcab8f096efa} + {70efdc34-e977-46f5-a501-533108fb8ec1} - {8ba66f31-3f64-4fd8-8f80-316486dfd094} + {6e6f58eb-d27f-43b7-a589-66cfa3d91a4a} - {e719cd8b-3b24-4a8c-b960-d04bf8625577} + {4a479b5e-6660-4d9e-b0aa-4188dcc2778f} - {637eb86d-ab66-4a2e-9bc4-2a817d26615f} + {c5f1e239-1744-419e-aaef-23bf5cfa88ec} - {ecbb2dd7-55f6-4680-b3bd-bd7a0ab291a9} + {5df25ca3-879d-4841-a459-cab2d77cff29} - {b4798c15-4251-44bc-87cc-f9c4b11d5b50} + {4f6d720a-3b67-4a65-89e1-85c006f5165b} - {e24b1fe1-aa05-4212-9241-d00d92d1cc87} + {fa21a963-a7f1-42af-b8ac-724ebef27c09} - {84512758-2856-45ca-b3a5-d9b62518cddf} + {b27b567a-4e7e-4a9f-a9f4-992114e0a89d} - {4302a75c-fc0b-45ce-b7ff-c46f4e6d66e1} + {8942ca53-5d83-486d-ae7a-503617dfb863} - {dcb944d5-6cc1-45d0-ab27-bbcee8b05242} + {8d529571-6ae0-4f3d-a888-8b0f7ec346d2} - {fbf20756-656d-48ba-a123-81852216cab5} + {38db0c40-9d10-45ed-af8a-a5746547419b} - {d011e5e3-212f-4272-9e49-072ca53cfc1a} + {3accb9e0-4c7d-469a-b96a-2d0a6b8fef10} - {0a6ab2cc-a481-492a-ba22-9017717681e9} + {d5919b64-a572-497f-ad40-eb6f4c2b1dd2} - {dc0e40bd-552c-4c47-87dc-be6a2b64d743} + {b0185421-b29c-47eb-8d0e-4b6916f38c5a} - {03dcd278-844b-463d-92be-609eb545366f} + {81b8dfb4-7efe-4dc7-b0c9-ca6323e934a3} - {10d1dcf0-605b-4751-83fa-55fe2d3e8ec1} + {8c90da37-72b6-48f5-8e9b-50da3972928e} - {b27115ff-2d52-4370-a70b-f957f6f75416} + {df929f68-0665-4979-bea0-a0d25ead217c} - {f47df2ef-dc4f-4efd-833c-13fb111add91} + {7b100dc8-5233-45f7-9544-bfa316a7e82f} - {c86ad5cd-46c2-4858-a363-aeb01fe4a308} + {33896767-a954-4ce2-bc3a-498f5eaf93bc} - {c42efd10-e3cc-4efa-aeed-13c927b4d792} + {986e2c01-e885-42f8-9656-f282acae1ae4} - {1cd92aa5-eab8-42ad-9ac4-d1be3c9f7167} + {b83ff634-e348-4673-977e-af02b7955566} - {4baf59b9-6502-4101-aeb9-a933ed8db85d} + {2d9d6047-ea66-4d70-a5b2-e6ab9ba50d3b} - {eb8db3d6-1061-401c-9a8f-bae2a8cf9e63} + {be6f851a-2faa-4e30-befc-253753ed0cb8} - {f31e0c5e-d83c-4b70-92cb-6055bfed371e} + {e885cb09-bc30-4c2a-8909-b7fbe71f7214} - {8b0fc4c1-399a-46c5-8719-1d6d8d3c3668} + {3dbf1768-08fb-4380-bb53-879d996f353d} - {1acb6718-6453-4ac5-8dad-7cdb908d9eee} + {c23f9eb1-ad36-4c94-9c2e-a27b9e3277d6} diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index c0d16c5d2..e4948674b 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {b25613d9-f564-4a20-860a-f7c3a9aa22f1} + {41b5ba8c-3c3e-422c-a42f-9e2d767e2ee2} - {0b7157ee-24e2-4a4e-99dc-bb0c879522d4} + {87434da4-2ec0-4dbd-8aaa-428d0b7ef02e} - {0488e27b-daef-4fbe-b25d-974b1ae56267} + {45777816-798f-4256-86ed-93b1d4a3c619} - {f2b3ab94-2684-4f83-89d1-276c4966c926} + {5795b431-b90a-467b-9100-19a0abc66824} - {0df1bb4b-b085-406d-a92a-5cbd74d80c57} + {e67beeee-3b61-4b29-a92d-9e9de30f6655} - {1783c042-3227-40f1-b9d9-f612cb0e335f} + {886b6218-4627-4209-8813-a53b94e5f26d} - {fabbf9bd-c315-41e9-af7f-951db4bee589} + {1aa709b2-6f80-4bb8-bc96-5cee482dc280} - {fdf56156-29dd-45e2-80d1-99ca24134a6b} + {7e61c09f-6cb1-4443-b906-2cbc3fb83654} - {7ce6759e-9cb1-41d1-96eb-4902554a988f} + {16b63361-f06b-45d2-8c79-5135ae81d751} - {e8b9cba4-354b-47a1-9bc4-c8c5841a06f5} + {e156af29-8879-489d-abf4-8b17f4093aab} - {14e78196-a3a4-4e5e-b262-027a8bb014a6} + {6ea770e5-9bc7-4b4b-a884-eb1f5786f999} - {bd55dda0-40fb-443d-88a2-8855c8b672a2} + {adc5e3dd-e3cb-460b-8f1a-a0b7e33e2b7b} - {2c222612-ef53-4366-baec-bdc52a23f110} + {adac77e4-d9a0-444e-bda1-471156bf1be2} - {6a5cd2d7-7ea9-4d60-be1c-89ed128d63c2} + {34b28831-7570-4673-a48e-f11500b8714a} - {46bf08c3-9915-4e3d-9b02-e41a3d823a51} + {ced64246-f94c-4bb8-89ec-de6cfd5953bf} - {3e8a8459-6c02-44c5-99cb-0111a3ff9734} + {bae6ada8-c82b-441b-83be-9ee030ba087b} - {e31be549-abae-426a-8079-cf18d95971c7} + {fcb48608-c8f2-44ab-bacf-472f9d5a2baf} - {5e5bbd89-c130-42b7-b339-b4176a8b0c0c} + {90cb497e-765e-4a47-8e9e-5e9641d59af4} - {cdbcc3d6-30fe-45f7-938b-96d425ff4d37} + {bf5df3ed-5eba-4d40-a336-05ba406eeda4} - {759d5738-c093-4181-a73f-dcfcc5ac952f} + {10082dfd-970c-479a-9595-c065be277594} - {c0a53236-b455-4bee-8823-97aaed0136a4} + {5f154a7d-3b2f-4e8d-9f35-49fc48b83fd5} - {fd86f89c-8c50-46cb-bca2-c3532ed558b0} + {2b1ed49f-2951-45cf-8586-a760cadc8d48} - {13e6ef75-6723-4b1c-9a17-2462052cad45} + {63835493-7204-47ed-a2c2-dc6e37bf0c5e} - {4f53c373-a2f3-42c8-aac6-c941394e1831} + {2ae507bb-2791-4307-8bee-4111fca9f01c} - {49537b39-5142-4d44-95a5-45ae52c4efc3} + {6d1eaf7f-fd32-43c4-81f4-b3864b539dfe} - {6f32ba07-7b4d-4067-b58e-8da2cf2781a1} + {e34f8ca0-9a10-41fb-8695-05f3391a30ce} - {9a00ff73-dfed-4234-a39c-8d01d948838a} + {f8f3a6de-c721-4977-ae2a-6e0278762bb0} - {36eef95f-0613-462b-be3d-aae45870a2f5} + {368ce686-12ff-4580-9372-fb8aa8b33fb7} - {ceb73937-685f-40fb-8da8-2f280363831d} + {453193eb-cfbf-4605-9a14-561948fb4d6b} - {a15a8bd4-1ba0-4b2d-a335-e860f6449eed} + {aa81958c-69cd-47ad-a713-fe60d6169956} - {238c7ca0-6fda-4c32-bd83-f3fe35ba442b} + {160435d3-1897-443b-bb9f-b8226ca4fe18} - {732f1f8d-42a6-461f-b14a-3ff951b067b7} + {59938b5c-cfac-4785-ba51-3e09747c7b98} - {735681bf-a843-4ccc-8a2f-af7bbb54ebc2} + {0c6b2baa-2e44-4e2e-a973-f89d08663a89} - {e21dcd09-23d9-4cb5-b095-8b9055ff09a4} + {4b706973-3779-41f8-ae9a-c9f45425ae7f} - {ec50240e-4b3e-4e42-ae8b-03d694a01d66} + {a31aba6a-fbf8-4666-9399-6b681f6ee9cf} - {267134e3-1ba4-4ba7-9ca3-22211782471c} + {2e951320-6426-4d70-a9b6-19a4c9cca520} - {221c8876-f8d5-41ef-8b15-ee7cb60a549d} + {d1b9f267-bcde-4718-b468-17862dd35792} - {3064c4f4-39e8-4544-9bbd-51cb9d6bd688} + {392010e1-15cc-4f45-b0f9-ba61016dcf5f} - {39d3d561-d860-4530-9d0a-8731a4645458} + {bc36af1b-fd5d-44b3-8de2-5c012099dec6} - {25382f04-0332-42f3-b44f-d1b8d82d60fd} + {ea2d0543-c075-4a3d-af40-89876af3230a} - {40ba14d7-baf2-477c-b720-a9ca5ae9f415} + {ae200e6e-ad36-4e94-8cc5-2cf86655ead1} - {3b503af9-cdaa-4082-a528-b748492e65a3} + {d50af406-b8c9-43f0-a4a7-57af420a4c83} - {e89d2786-9d05-4d84-9a18-d67e091b72be} + {a3e7d2a2-62d8-476b-a957-c1c3c720b6e1} - {5c6c65a2-662b-4fd1-ae42-9fbe0ac5c216} + {ab9e4766-60af-45c6-aae4-a5eaca76c2cd} - {452548c8-13c6-43fb-9e94-1ef31387ced5} + {a4dd8fc9-a260-4060-94b0-84fcf624ec1b} - {9bc6b20f-5a47-4e9c-866c-f42e1f9f164a} + {c4da5088-691e-467c-8c91-ee6036cc9886} - {e10997ea-47e4-4d42-a148-e8309ff0b48a} + {364db276-d1ab-4d40-b68d-ed45754328c5} - {9bd94043-c583-4d41-ab22-7eb22fd801bf} + {0c6306ec-4038-44b8-babc-50dac71fd822} - {22f9bcb1-a897-4610-855c-420bff7ebbe7} + {775493ba-54bb-4679-93cb-515b39f4e501} - {18aba08e-d249-435c-b5ad-8322b58bea51} + {a90503a6-40e7-4090-afda-bafda06b7d61} - {834af3aa-5aed-411e-83d9-82ac1ee8e095} + {6ba43af7-0a4a-402c-8528-c9febc23cefc} - {38958f97-a4a9-4d81-8447-82a05f92aa7d} + {8a67fb95-7271-4948-855c-f4553c8da9ec} - {ef0e5b4e-92ef-45e4-bb76-af731e999eb4} + {bd3393f6-3d9b-4f9f-9c8f-d276132203d7} - {fae92309-4667-44d0-8995-cd7c077b89d4} + {317e5db9-097d-4dc3-a22b-78858b022c60} - {f3df7456-5573-4af8-81bd-0c6e0661d5db} + {0e3ff088-4665-4360-a138-96a8f0fc6006} - {5f5535ee-a130-4576-a2e5-f797e7204a28} + {9502a7c7-c00d-4579-a4c9-610ce3f3d081} - {5b16e7a7-21ed-4906-9712-e24fa908b849} + {ef8968b4-bba3-4eba-bc22-3613eb9a52a4} - {46994c7f-dcdb-45ea-9fcc-1ad516eab371} + {444f6aba-9fdd-49fb-b7a7-b44ad97065c5} - {54e0e1c0-41bc-48ed-983d-74dbf45ba05a} + {7771a394-e373-44da-a10c-fd14f1a71661} - {3726df25-c7e0-4286-858b-c1a1cc2eecf0} + {366c9306-34c1-4385-a6fb-501f7e59af24} - {9ee1709c-93bc-4c07-85d6-a24e2d4d36ee} + {08be8ec6-fdf8-43ca-8676-4d2622b414c6} - {d9827a63-61b3-4c73-afd5-cadbc1dc66c1} + {c3e7ac0e-5932-4e48-8353-0e8d0b091ef5} diff --git a/Foundation/Foundation_vs120.vcxproj b/Foundation/Foundation_vs120.vcxproj index 2a2fcf863..919869904 100644 --- a/Foundation/Foundation_vs120.vcxproj +++ b/Foundation/Foundation_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoFoundationd PocoFoundationmdd PocoFoundationmtd @@ -279,8 +279,20 @@ + + + + + + + + + + + + true @@ -290,9 +302,51 @@ true true + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + true @@ -319,8 +373,76 @@ true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true @@ -362,245 +484,22 @@ true true - - - - - - - - - - true - true - true - true - true - true - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - + + + - - - - - - - - - - - - + - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + true @@ -630,15 +529,14 @@ + + + + + - - - - - - - - + + true true true @@ -646,15 +544,7 @@ true true - - - - - - - - - + true true true @@ -662,75 +552,6 @@ true true - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - true @@ -781,6 +602,62 @@ true true + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + @@ -808,6 +685,7 @@ true + true @@ -833,6 +711,81 @@ true true + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + true @@ -858,15 +811,71 @@ true true - - - - - - - - + + true + true + true + true + true + true + + + + + + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + @@ -886,61 +895,134 @@ true true - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -948,84 +1030,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1036,204 +1141,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1258,7 +1258,6 @@ - true true @@ -1267,6 +1266,7 @@ true true + diff --git a/Foundation/Foundation_vs120.vcxproj.filters b/Foundation/Foundation_vs120.vcxproj.filters index 4b9db87e5..dc10e8120 100644 --- a/Foundation/Foundation_vs120.vcxproj.filters +++ b/Foundation/Foundation_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {39a6aa90-7053-4332-8f2c-0b81c6a5ddcf} + {bdf2c2f0-9d44-41c5-bd23-72d48d005272} - {e1097c17-51a0-4f07-996b-cf4ec56dd36b} + {002e0871-b541-411a-8db3-74899f33bea5} - {0eb767c8-bb8a-435c-a59d-4c40cbae5f77} + {a1bb2239-61c9-4cc8-9ff6-357b145dd5b8} - {c81d6efe-6597-46dd-b74c-89288d1bd2ba} + {6cbdb636-a15f-43cc-8592-dcde38680f5c} - {24799c9f-1ba1-4bcd-b3eb-423af5086056} + {024cb185-c686-4c56-9e97-56f88c8c3236} - {2cbffd2e-632f-4e08-9ecb-96d88c359e00} + {8311d56d-f9ef-4781-985c-fe0c7e0483bb} - {ebfc5a32-02ea-4ba5-8740-fd47e5e6c93f} + {40fff905-8e57-4d1d-9c3d-dcc5b44eb9e2} - {9e2a3e96-138b-4a4e-8e65-f52ccc3ccf59} + {8f5c2d81-ffa1-462b-a332-bbee9709c07f} - {1b2df9f7-4dc8-4928-97be-5df100d00403} + {66358f0f-7b8e-4725-9437-045c9397d211} - {a633fcb0-614c-452c-91d4-184c1b637035} + {6f33fdb8-f745-4ba0-bfc2-42e1ec1cfb08} - {7ba54db3-5396-4086-8201-78f835f17c72} + {7a9e711f-3866-4b61-8436-b03b2ce59f60} - {1fd72ae5-621c-4047-80b2-807662c83610} + {47c640d2-5087-427c-8032-9194e05d0370} - {dbd0132f-76d8-4882-85a7-b754eacee84b} + {9e57158e-6afc-4985-a51c-592609981192} - {ec0ade9d-2692-41bb-a0b7-1235e138fd36} + {5873deeb-cf46-4274-986e-57d15e2e327f} - {dc62f31f-120f-4686-8140-2a98b09800b6} + {4bdf2057-32e3-4e25-b03c-2eb865016c76} - {0ab034d0-dd37-4d06-b42f-90ac8ace7e87} + {7f97e359-0e16-419b-90c5-1e4e18304699} - {7336e29b-e342-48b7-bb8c-4ee6a9fdd3cf} + {93534f31-a335-487f-b50a-dab8e292b9a0} - {b10fc6b2-40cf-4002-a8d4-32c2b57e37b1} + {0ffcca20-b7a9-486a-91c5-e81da3401d71} - {22966825-2d4a-4da5-8299-86ac1cd1169f} + {24ac78a0-8e86-432a-8867-37d3a6ca0c2d} - {fef6ea96-b5eb-4784-ac8f-8cf78d600c87} + {7909e70f-715e-4947-98a9-06c206aaf2b5} - {492783a8-3e47-4830-8cea-c223cdc7f62c} + {a122a6cd-0485-4b8a-8db6-2b1e1d39029c} - {27659cbd-451b-4ddc-b2ce-865baaa9c6c3} + {7a273870-9473-45dc-94e5-11418d82c86c} - {c720b059-77be-4359-b902-2295cc3b3d78} + {d5658ed8-7ef9-4cc5-9680-7c9b54356078} - {fdad9527-4d91-4a34-8e35-f617785f9c72} + {229c6198-4d22-487d-a388-05e80ab36f2b} - {e1a7f315-a84c-4a2d-8ea3-f5103f98c4bb} + {7fbec778-9d8c-40b4-942f-d91915aa4911} - {d65aeebe-a0e7-483c-8c16-f38e9b240730} + {b0dfeecd-c4ed-4a1f-b4e1-4ecd262cfac1} - {9dba442d-8e57-4bdf-afb9-057aed500c42} + {d2b4b204-00e1-4c20-ae5c-685999098442} - {91ba7e3d-60b3-47f1-b1a1-cad845085d86} + {b01689ae-c28f-4ffe-9924-8c6e2506c5ce} - {10d84a56-4e96-403d-b278-67967591b737} + {f0d90687-ccd9-4649-a1c9-13b93f570f16} - {b3db2aaf-29ae-4e4a-967e-956bfebd3531} + {b3056754-20e0-47a4-8c81-633509ad9088} - {a5063eed-bf7d-4aaa-9b87-14d914256b6d} + {3bf0c2d3-3a78-4dd8-b287-58069d5c155d} - {51ff137a-6320-4d4d-93d8-b08778739194} + {a2e9aacb-e807-4ad5-9563-b9cfa1d0aa64} - {a561347b-aa22-4a85-b78a-997fc3ed4b5e} + {34287f29-3545-47e7-af9f-2f3bbb9f3862} - {95a9b4b2-8b84-4e76-9a73-4809ab6a8345} + {83fad5ab-1394-479f-b151-e8ba3c031bff} - {426e5298-2ff1-434f-a2f7-2f25623d1be4} + {8fe5cba3-06d7-4f8f-ae36-20c2be221f79} - {9d6cfbce-374a-496b-ad2c-4295dabd5fd5} + {724aee4f-eb01-4158-975b-60be6b52bafb} - {44c05617-8174-4fbc-a832-1803f8a93008} + {ee7e7b53-12b7-4d05-9ad8-d1be05917ee6} - {7e4d5ec7-eb2b-4a23-84c1-9cb44f57b07b} + {169b8212-e727-49fd-82a0-fba1cceccde7} - {6a6b8aa2-d7ec-4459-b5dd-fc1263750a0d} + {53b31728-614c-4163-b577-d1552a8e32fe} - {5cf3d2f8-a13f-4ca3-976e-4c9b4de4eafd} + {e98e47c1-6e07-4f0c-97a7-9491cc56badd} - {5312937e-7750-4e90-804c-639e4d56831f} + {975c3ded-5533-4b3d-8db7-27b25b43512e} - {ae054a56-3076-4074-8c7a-1c1935b037d4} + {344235ba-93ea-4e47-89d7-38af0300ce5b} - {e52c3e53-903a-408d-a3df-8debf00e7f1f} + {4a288fb8-aac7-4645-9513-e9088b6063cd} - {7a45a1dc-0f5c-4c48-91a0-2dcba025f5f4} + {e6a28f2e-087e-4725-ada0-4cb7d8c3f84f} - {aae1c024-0dd1-4dd0-9ec1-2926283e19e2} + {1119e321-f3d6-477e-a1a9-325090c03fb9} - {de02b453-95a3-49c5-bee0-329e67ba1787} + {73e08604-7dbf-4a06-a310-0f812c3a1e69} - {2fbc401c-264f-48df-9f18-a04492f17129} + {e0180476-33ed-437f-a9fc-36f942b18539} - {c02ff21e-0f52-45a6-b9df-8b3253f8da5f} + {50ec99b5-3c25-43fd-843c-e81373916c6f} - {f0932012-6cb9-4256-b647-c3673e54f31c} + {080ace04-a37e-473b-9e1c-8596ca3b4c1d} - {511eef0a-8d3a-408f-9071-355da2cd5700} + {f968d3d2-486a-4bf6-9a19-1f67136f6233} - {ab385240-8b7f-4ac3-bb0d-321c1ca1cc3c} + {a0edd351-dc0e-4432-8f9c-eb22e8f7ff0e} - {9c8f39be-20d1-4d78-bbd7-17bd7d7486c6} + {23dd0fbe-bac3-482b-8ce5-e8c11de31488} - {0d7fa7a6-c6c6-427c-82bb-046da6ac4824} + {74066b32-90c6-4892-a984-1bf785c3d16a} - {0efa5e58-dfb2-43b9-8baa-17c8c3bee329} + {3ac8f95a-56a8-45d2-873b-856b7334c029} - {b9352f88-4a36-41d9-8d80-66df2849ca64} + {e96125cc-77cf-4d55-81bc-68756b4e98b1} - {0768cb90-d035-4e9a-9f00-16cf1353aeee} + {ddcaeef7-7272-4fa2-82c6-d1b9e0e79028} - {fe8a9877-5116-4295-a1e8-ef57e60e2bf7} + {bf736a23-89b5-475a-96fa-6fa7956d3fbc} - {7cb74105-ab8f-44fe-ba93-631bb92e5cb1} + {b7b83ff7-8290-4291-ab54-bc39271dbfb5} - {878aa8d8-fb36-4e8b-92f4-7d1ac3d27d14} + {d54291b5-8aad-4909-a8dc-7c0e8a751d00} - {502fe0ed-7ba0-4030-9f87-d72fa99b14db} + {8e5e8d6a-eeef-4f5c-8b87-5ca7813695b3} - {210ec78c-1bf7-4ed9-99ba-d3915acf7b20} + {64808beb-9abc-41c8-8775-0f90d5c7c659} - {a40d684a-51e2-4b1d-a2c2-51959e70daac} + {dadce1a7-1bde-4153-911e-fc73c978d04c} diff --git a/Foundation/Foundation_vs140.sln b/Foundation/Foundation_vs140.sln index f82a82b56..e270ad521 100644 --- a/Foundation/Foundation_vs140.sln +++ b/Foundation/Foundation_vs140.sln @@ -1,10 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 14 -VisualStudioVersion = 14.0.25420.1 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs140.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs140.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs140.vcxproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}" ProjectSection(ProjectDependencies) = postProject {B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F} EndProjectSection @@ -12,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Foundation/Foundation_vs140.vcxproj b/Foundation/Foundation_vs140.vcxproj index 67d56dc76..789801610 100644 --- a/Foundation/Foundation_vs140.vcxproj +++ b/Foundation/Foundation_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 PocoFoundationd PocoFoundationmdd PocoFoundationmtd diff --git a/Foundation/Foundation_vs140.vcxproj.filters b/Foundation/Foundation_vs140.vcxproj.filters index 41d4a0e19..57b3164fd 100644 --- a/Foundation/Foundation_vs140.vcxproj.filters +++ b/Foundation/Foundation_vs140.vcxproj.filters @@ -2,190 +2,190 @@ - {55b1de5f-ad1c-46a7-8a82-f949bedda360} + {3a9f9533-4af1-4f99-a855-4bb03b37a02f} - {7ef651b7-ce73-4963-82c4-b3323bdcccf1} + {7b33cc7e-37a8-4349-be80-4b2279643deb} - {991368a7-ac73-44a2-8290-b54a1d1daa42} + {f0cbed52-9189-438a-bdbe-df4d579b813a} - {e54dfe40-6fbe-4626-bcb3-abb55a3acd76} + {b3d47c94-42f5-4120-9a9a-f119a0e83c6b} - {9898de0b-1013-414d-877e-f16f2e4d40ff} + {6839304c-d247-4768-b68b-fdfdf3e138b9} - {441eaa7b-3969-49e2-af84-2cd654825342} + {4eae0491-74be-424d-ad37-1c8925ca10ef} - {432697a8-44c8-475a-a655-e7753fbfd3df} + {5f0ee561-41a3-464d-8e98-46dbdbeb3842} - {842ae020-8247-4a82-b54d-b8376c1894de} + {3d70c50f-ac3b-4246-b5fe-737c4addeb1d} - {7e8febc1-3956-4646-8d2c-04a70316c6f5} + {4d98d9a4-1ff4-4829-a4c9-f7f6413ad4c4} - {f7712fa6-622b-4ba9-8fff-ff599abc85bc} + {ad4c23af-623d-46b9-92ae-c98441ceaef4} - {9844b24a-223d-4917-8bb4-8d8a322ee35c} + {3422648b-9103-4b09-af16-a5ec8bd86991} - {5da0be6f-3569-4b98-9626-0ccbc91c2bbd} + {4bd88e98-3ac5-4281-bfaa-44b39c58ef70} - {ebd1f2d4-7ab9-4c7f-a867-686fb86863b9} + {cfad16e6-d178-4017-8970-e45dae1b46dc} - {28ba31f3-98ff-496a-8508-c6d5c9ee8021} + {2b370316-1df6-4cd7-be3d-b8a78a0c2f3e} - {f1fbbb01-344f-4bd7-81ad-c3f822973252} + {2c27e247-e051-4ae2-8c45-cd6dd647897e} - {5d7b3153-de25-449d-bba6-193e59de80a7} + {7ccca224-84c9-43dd-8888-47a79c70a03d} - {6bc1cfda-8ec4-47f5-a15e-7cfed652de7f} + {43f07f0d-31cb-481f-a7aa-58a41be3d950} - {419fd63d-e507-4579-a14b-e976f150526b} + {ed9c3d1c-dd60-4ee0-a312-90440793849b} - {7d861ba1-dea6-4b25-a19d-b78eb606c4e4} + {e0bbac9b-5783-4b9f-a78a-7b1f872cfa59} - {e5af3f47-6d89-4872-8183-77feea0804f3} + {29cf0db2-8407-40f9-9ec0-9ad470cb8ec8} - {423663a1-8c17-4eb7-8492-6c9e28731883} + {ef46aee1-692d-4da0-9ef6-b16586284dc1} - {791ddf5d-6f81-4cf6-a7e4-dcc31e828b63} + {1a34a726-a09e-4927-8192-1c867f3595cb} - {ea4cb289-7d0a-47dd-9e9b-7c4b7d37b8c6} + {660de2b8-5c91-4e12-bcdf-7342f8c5d2d7} - {cf8ad697-ecfe-451d-ab56-1aa46ef70dd8} + {169c3a2b-bf9d-4612-93fb-14501a8bea98} - {d2d14850-d82d-466b-b1fb-a12aa3f59606} + {26005e37-235b-4b8e-936c-70161a51c04b} - {968a2361-9b94-4a86-ba60-f74436008e6d} + {8b85183b-5079-4470-ad61-3f29030be93d} - {1bae9daa-1d97-4c29-97f9-b83d167968c9} + {dc92f1f8-af3b-4149-adf8-8a6ac907db8e} - {cf8e885a-f28a-4021-9fab-92ca5e52c4cd} + {920824ad-2afd-4fa7-b99f-48fb79a679d9} - {65d15353-cd76-4d57-b308-aaa8963711b7} + {7f188339-c688-4c86-a884-d2455581d320} - {7c023861-6519-452c-b4e2-79983f30e3e3} + {6b6ec6cb-473c-494c-b6e7-d92926607a4f} - {e79d257c-4165-4890-8b9e-44e0d8c0156a} + {aa20c9d3-2718-48c3-a71a-931dfdbeefd5} - {8c704258-b840-441f-897f-5ca1f3e414d8} + {00cebd98-8837-4857-8c1f-30a34a509f11} - {f728dbc8-0c63-4a87-8401-2641cebccaa3} + {dae0380f-1661-4332-af4b-bcdc2636d9dd} - {f9d306f4-5417-4ffd-af3e-1076b3a696e6} + {2dae9699-88d5-42c8-9a60-9b5ed2e3fb0c} - {29a0030a-b5da-45f4-8862-31b32ac27470} + {771b888e-da3b-4af1-801e-e4eb25d91a0e} - {3e5c4ac1-15b6-4b34-8ff7-420f6a0d3e64} + {200926ca-875f-46f0-a8e7-2e0ad29f156b} - {fc6a5957-93fa-40fc-9fc1-67fbf5ea412e} + {81803cfc-c78b-4c66-b9e2-87032d34a620} - {794d49de-89cf-48d8-aa6c-45ef2bd6e5f0} + {4823bad5-91aa-4bfc-823e-d962801b8d56} - {d2474a71-9daf-474c-bf01-905dc921aea8} + {3cfda263-9490-466c-8b02-eef5dbdfbef9} - {0560ff0c-c151-49c2-bd2b-33244904c2dc} + {5dabbef2-e04e-4081-81e7-6745b9946ae2} - {4b9fd21d-426d-428f-847f-944cc1b5d6af} + {a2583012-1511-43c4-986b-35976882d41d} - {393cd513-9b6c-433d-9688-52ce23f58edd} + {3260f65e-ec4a-4ba5-9157-075b5aee818f} - {61388df4-ac48-4f8b-a700-5d8503681c14} + {11a6f94a-5247-4985-9070-4be4d568c825} - {29cd9490-b34a-42b3-bc57-ef3e66091464} + {ce889420-92e6-4dc4-b234-a6378f9ddb30} - {4d40e255-7603-4ed8-9970-acd192a1c18a} + {189c10fc-ed89-4f2f-af81-53628e427c17} - {2544709a-b0f7-42cb-8d9d-8376a2786719} + {991de0de-cea9-404c-8ea3-44c4faed3aac} - {8088ef84-fc84-4240-bfbc-8f29deff8a54} + {8802191d-08b5-42d8-809e-030749db74ef} - {e846c388-50c0-4c85-b2cf-fe37b4ec6330} + {2a84f750-ea77-4170-9534-80df8a0e29e8} - {eee203d6-6d2e-4554-9692-e007c4b1a14d} + {e28cf7ca-46e6-4efd-9135-620f599f57e3} - {e080cb6a-8b50-42ae-a0ea-4ea746aed1d5} + {fc678075-f458-4ba3-a47b-9b31483b7f28} - {f338bb97-110a-4b12-a736-6c4d2295cd7b} + {5a724854-6514-43ff-9740-463fde1cb2eb} - {b49c4309-fe7d-4b0c-948f-013414a08fdc} + {4d1cada9-2de7-4061-ae7f-9ffc46fc5be9} - {be099dfd-be0c-4ee4-bd0b-64a2e0832455} + {9fa965fd-719b-41b9-98f7-c9d5817b23d4} - {11cd7301-6c14-4ae8-9534-8ef00432148e} + {0b787529-43fd-411f-8100-dc580df757c8} - {d031bb42-c73a-436d-911f-8cf2fe088708} + {ab419774-5139-421c-8616-5e3427e9c13c} - {6861e9af-7bef-4a0b-9016-7a226fdbfadf} + {7d2d5610-1a46-4c33-9585-90eb3d50adeb} - {9973203f-0d25-4297-9bcf-d6552aa31c1f} + {97d3d0dd-46ea-455f-9ff7-c015f3b86b15} - {aecbae5e-fb8a-40fe-9ec3-b47073b3bd54} + {219f84ad-c5e6-44f0-aa7f-2da58f400c52} - {5104c445-16b7-410d-86c7-3f00688b13d1} + {bca561cb-b31d-4661-b69e-32c6481a2aff} - {70943829-ef94-495a-b968-7ef9d968c0a6} + {4ba25e05-5cc2-4a26-a58f-ada788fdeb5f} - {458b2af9-bd12-440c-8f81-363f749d6d63} + {aece2588-f871-4196-9951-ce4b696325c5} - {9584259e-5d11-44e8-b686-914dc7433f64} + {84f67049-a19d-43cd-b3de-1f47b3db3b11} diff --git a/Foundation/Foundation_vs150.sln b/Foundation/Foundation_vs150.sln index aef3333df..4abe64c9b 100644 --- a/Foundation/Foundation_vs150.sln +++ b/Foundation/Foundation_vs150.sln @@ -1,10 +1,8 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.27004.2006 -MinimumVisualStudioVersion = 10.0.40219.1 +# Visual Studio 2017 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Foundation", "Foundation_vs150.vcxproj", "{B01196CC-B693-4548-8464-2FF60499E73F}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{F1EE93DF-347F-4CB3-B191-C4E63F38E972}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs150.vcxproj", "{C812E0B9-69A9-4FA1-A1D4-161CF677BD10}" ProjectSection(ProjectDependencies) = postProject {B01196CC-B693-4548-8464-2FF60499E73F} = {B01196CC-B693-4548-8464-2FF60499E73F} EndProjectSection @@ -12,54 +10,51 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Build.0 = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {F1EE93DF-347F-4CB3-B191-C4E63F38E972}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {9FB78A81-2F41-47A4-ABA5-2AF3DCE0FCFD} - EndGlobalSection EndGlobal diff --git a/Foundation/Foundation_vs150.vcxproj b/Foundation/Foundation_vs150.vcxproj index 715d2116b..68c29e6e7 100644 --- a/Foundation/Foundation_vs150.vcxproj +++ b/Foundation/Foundation_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 PocoFoundationd PocoFoundationmdd PocoFoundationmtd diff --git a/Foundation/Foundation_vs150.vcxproj.filters b/Foundation/Foundation_vs150.vcxproj.filters index cd1ebc3ab..f8211a6e7 100644 --- a/Foundation/Foundation_vs150.vcxproj.filters +++ b/Foundation/Foundation_vs150.vcxproj.filters @@ -2,190 +2,190 @@ - {9127d9ab-1557-4ee8-bfed-4d66f43120fc} + {b43fe869-70c3-46e5-93b5-2eedec5fb0e5} - {485c117b-f22b-40d8-b567-8580012403e3} + {26c01ae6-e9e1-488c-bd93-923e420b082e} - {e3f0e20a-f405-4c64-924a-f3158cbcf671} + {abaf10de-d03c-4339-b0dc-621841126989} - {fdc26e3e-7d0d-4687-bff9-477265760672} + {d1118a77-bb51-4663-8487-361675fe2943} - {337ec2d1-76db-4c90-b88d-1d898557f293} + {61984ce5-ed84-40c9-bbc1-ad60e00924cb} - {54740783-5ffb-444e-b089-71ed7ef59037} + {68c637b9-0c5b-4807-87b2-482792170c13} - {43f46f8e-cd0d-4910-887b-afd7b35603a5} + {f798c5a4-d88c-4f07-b810-49709c30d789} - {16b81006-9413-4d67-9f6f-f67947928171} + {f9d96824-718d-45a2-a562-cc4b03ab0f83} - {2d3deffd-2060-41ce-93a8-d04d6201dbba} + {59736458-f603-4895-8834-59b2a3324c6d} - {e3f564b3-9763-499e-a14a-daf5bff1e5fa} + {ef2c265c-659f-4ed2-8cc5-1eaa3af60355} - {883b6776-3d98-424f-ba79-1a6babfca88c} + {75c831ee-ce26-457f-b7a0-113cf5fa68d3} - {f72d7d71-679a-4187-ba2d-e2b9d109c786} + {61ca55d3-8366-4ac8-8b7d-7d8eaceeb262} - {cccb5212-d9e4-40d7-a3b8-57eb3a204cb1} + {84c9e630-b1ad-4eb6-9a73-dbf14a6f6744} - {854462ed-0ce2-4ff7-b435-01bf33c6cabe} + {ca3769ff-6d1c-4818-ae28-69698274b5b2} - {df853dcb-dbe6-4ec2-8fae-3c167590b788} + {2a73a164-38b6-459a-b9b7-69bbbef1aa9f} - {315cc9b5-dfb7-4dad-8f29-b722d947975d} + {0d45b9fb-8f18-42fc-857f-0d8ad45b99f8} - {81f2cb16-5b94-4276-b6b2-fb5bd763b72e} + {6cf56ef5-38be-4bc8-9e6f-f1ab09e3476e} - {452b1c26-6feb-481e-988b-3aec432497fa} + {e344427b-d197-4f28-8009-cc55b8e698bf} - {c7c444f5-f0ec-474f-8894-eed8f6051d07} + {b119b884-a9fc-41b0-baaf-95f098b7e5ab} - {5d9a13ff-3abe-41dd-bd0b-3c8073c9cf95} + {6ba97e98-c42c-421e-b822-7f34c13a99cd} - {7cd46f55-f619-46e3-8f30-de18ed5054a8} + {85ae1744-483a-4940-b1b8-6a198e297674} - {1eb41019-88e5-4ac8-aae6-743d985fbef8} + {16a49f83-1df8-4e7a-80a5-9f2e9c65618c} - {50fd3373-8c7d-423d-ac03-8db2dcc66d26} + {224e9eb3-8115-4f36-bb5e-be98097b4af4} - {a05ea08a-6d66-4b32-9690-c04c4f908e8d} + {61a3dfcd-d78a-48d8-ad03-2c16a87dd130} - {caebf232-ab95-449a-83f3-9f6a5514ac2a} + {7d10e041-132d-4098-900b-60ef642b5f10} - {28ffaa2d-e878-4721-8cf7-aeb531293f46} + {a276039b-222f-4387-a4c4-1bac4f3f8dde} - {d037ab26-553a-4f88-896b-30ac8c74f364} + {d9575bf1-356d-46a8-83b5-dcdf639534f7} - {d0d982a3-923f-4ca5-8c43-ce72d9ffcbfd} + {a255ab83-085f-4c33-8042-e52f0c190687} - {bea300ac-5ef3-4a49-9163-cd02e749786e} + {a687495f-ac9d-4156-9638-419757c4ce5e} - {63567b42-d35d-4a44-a25b-41218a8f29be} + {efd876d8-e043-4246-b0e4-a484b597c90c} - {fd98ed47-34ba-4d59-b52c-c709ec5f926d} + {d4d547b2-d236-4c5c-a2bf-547f77b490b4} - {17814f9e-4eca-41c1-9ac3-3d65cb66d008} + {1a6bde07-4f60-4cb9-98b2-602008e0e2a8} - {10e8e8b7-76db-4023-994d-a48ec46a6615} + {85591070-9e97-4473-9cca-d88e2beb4b02} - {f38bf6b6-18ea-4761-b8cc-8bbbfc1a6b23} + {a3288357-266b-4e1f-9e0e-c71d55f2ec33} - {9642c757-741a-4e3b-902f-961c3250a783} + {f34ecf50-440f-41a5-a232-8bb63b579aac} - {0fef879b-6696-4c9e-bfeb-f6de31384da9} + {27757d4d-0323-4d32-a0b1-ab358b0bf396} - {4a8e8e29-cfb1-4ead-8ff2-28e37432ee2d} + {bd8ac8ba-29f3-406c-b5de-d37a62eaa0cb} - {9fcc9075-4301-44c3-aa1e-711e88da891c} + {3d406974-b11f-461c-8778-53ba53b7e65f} - {0d06bf3f-603e-42ce-9cc7-526e414cf72d} + {36cfd4b7-1322-41e7-ad9a-c1df4e7006e4} - {18d225b2-e1e4-4f03-bfc8-285b4c41b28e} + {830201f8-9e0b-4809-99a6-44546de51077} - {5206c5b6-a270-409c-9162-b626850af4c3} + {f8698cc5-6800-4a0f-8e52-c5d725381333} - {823f91b1-0966-40d1-9560-5e788d4a4e68} + {da61c406-1718-4ef8-a52f-2f28221c5374} - {94a25d5f-84be-481a-a68d-ce7d0af1216e} + {98391c7a-0b6b-4fb0-ac3b-9db4b51bd7c1} - {2ee6d93b-3f7e-4f74-a1e8-8a70c8a9f9e0} + {ad197afd-1bc5-4b0b-99a4-3c44f4a6bb7d} - {c62cb612-1f63-42a4-b201-aae7bec0d70f} + {74ebd284-e25b-43a4-8a14-e21e36c1c9bf} - {5e526994-9a5f-48f3-8b05-8fe1f8f0bb16} + {160fc2e4-5064-4aea-8f25-6af1e338c17a} - {a3ba31d2-9df6-4887-a9f3-979bbb6becab} + {f0572b30-2cc2-4529-9490-615f212c2019} - {c4461253-0742-464f-94a9-e6d8c66f2194} + {e62c0e73-11e1-4329-8228-4fdab09a9910} - {059f6343-7602-49e5-8ca2-e5ed2e8adba8} + {f3d0d395-3f70-4575-95af-d56e0cb3ce38} - {13002559-b5e4-4948-9622-298aa3d29f9f} + {bc7be3e3-9c1b-49fa-b8aa-b5bf68a94578} - {de989010-3c13-4808-9d1d-e8f91c5044c7} + {62b50d54-3559-4bf4-b643-acfe1d3ef0da} - {57a7e070-5d6a-4e26-82ec-c0a6f98d5b44} + {456ef2df-595d-4479-877c-b2582cae7265} - {b436f231-fe34-4aaa-8394-8761f09f3140} + {7d1a0ffe-8ae7-45e9-a74f-585d69223897} - {d333bdd2-1c73-4596-a886-154a9b175a1c} + {0071316e-b442-4680-8f71-2ff0a8f48122} - {4d0cab44-8f8f-44d6-b15c-d271365a9d7b} + {cd484e5e-2b89-47ab-bf20-3617e96a9827} - {d6b974f0-2b9f-4e4a-a380-49460f9b1701} + {132bd3b5-775d-41af-9b57-78539098bb7e} - {32ddb25d-b43c-4b62-936b-218586f422b0} + {2adf3dcc-199e-488e-a187-f3acf5e001dc} - {cb69e4f5-dda0-4bda-b515-76622855243e} + {e3ea8557-78a7-43e6-8c0e-8a267258b79d} - {e13474ea-a6fc-43f9-a812-a9edeec0ad8f} + {cadf0869-7e61-4156-86a1-36ed6b3a89c8} - {08fec92e-86f1-4910-814f-78d2227deb2b} + {605dfe57-0f3b-4b9b-a7fb-4804d3f071ce} - {78f66266-5d81-4192-9054-413a61a1350c} + {d4d63a6e-03db-483b-bd48-3d841ab6e839} - {1c28c978-c475-416f-80e4-db72accc4822} + {5ab8a5f4-aefa-4eb5-9c33-fa0926b35f39} diff --git a/Foundation/Foundation_vs90.sln b/Foundation/Foundation_vs90.sln index 9b4d0aaab..ab68254f7 100644 --- a/Foundation/Foundation_vs90.sln +++ b/Foundation/Foundation_vs90.sln @@ -10,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - debug_static_md|Win32 = debug_static_md|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 release_shared|Win32 = release_shared|Win32 - release_static_md|Win32 = release_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 release_static_mt|Win32 = release_static_mt|Win32 + debug_static_md|Win32 = debug_static_md|Win32 + release_static_md|Win32 = release_static_md|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.ActiveCfg = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Build.0 = release_shared|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Build.0 = debug_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.ActiveCfg = release_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Build.0 = release_shared|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index 7780b39ce..d74bac1d0 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -2,190 +2,190 @@ - {04a76802-f232-4d53-8da9-06152d6bf777} + {153a4a73-cc45-4307-bb8e-2bfbb4e43be1} - {a537d4dc-1a8a-4536-87fd-98ed7558a421} + {e0b7226b-61e4-4258-9027-c8d153365527} - {44250c22-68fc-487c-b374-9903cf31298a} + {3e1a8fb6-0a71-40d7-bab5-b6bb02a93906} - {b5fe7411-1854-42ce-a659-b15a88b313b3} + {d4a6bee5-1069-4e96-a21a-992eea1cd1c6} - {051a1d93-fdfb-40dc-a5ba-cedf3e240ac5} + {ca32fe90-680e-4686-9219-f6027f1a6a52} - {f9b431b4-2bb5-4b94-9a1d-b6921fe2193d} + {2b7e1260-2270-40b7-9ca6-01aa38e7a672} - {d6b2c801-f69b-4393-8acc-0725794d4987} + {ae5f9e4e-edf4-4ed5-9083-4fb3e508ddd0} - {541dcc18-9c3d-44a5-b683-8a56e9639304} + {d99b0aab-8807-4aa2-99fb-30eab7596fca} - {d2b84041-fc45-4d60-8772-a711c5031c20} + {cd82204f-7c1a-4805-8824-ee383218444d} - {9d27d243-2735-4db7-a730-8881cc9d00bc} + {b2b479f5-9430-4efe-a6b8-c672df8b25bb} - {43d52ff4-e583-464a-b165-5289aa7077dc} + {ed62161a-fed1-4ce0-aaa5-13d71657c596} - {a5d5d4e9-f75b-4868-b8d1-5be40b664bd6} + {9437dbe0-68a6-46f8-b687-03d83ba8605f} - {e5b64780-61f2-47dc-b4b7-1f4671dea871} + {601edad1-d7de-4f8d-905a-4f6c230c67a7} - {e66cd3b0-0f3b-4c38-b629-737595244bfb} + {8f2cd978-02e3-4f5f-b9a4-01bda6dafa36} - {fee53b48-c027-4a92-acd6-570af653e075} + {9a5717e4-3f2b-4ddc-b640-04729c335868} - {f3e61191-68ae-4cf3-852a-32ee0aa71181} + {936b9637-3ce0-4c20-80e4-d8da9ae7030a} - {74f42c03-e29b-4f2c-a186-50dd8385d612} + {2c871766-17de-4949-b3c2-dceaee053c6b} - {5ae4062c-61ca-46bf-9d30-9b22e927335d} + {7429aaeb-646a-435b-a1a9-6db2706bbaa7} - {bb0db5dd-755d-44bc-9554-6cfdca5a1c10} + {7e4f5a12-7ec5-41a7-aaba-d18dca7750ef} - {869c11a5-5d2d-4dfd-94e3-cdcfcb784359} + {acc8a2e0-f358-42df-ac61-a2e5bc3ad911} - {bc7b77d8-4ea4-492f-bbea-6c9b28e1070e} + {b79f9f21-4b23-4f63-aee9-1f838d983901} - {c4d171fd-c6e3-4b76-a503-4fca663d5132} + {7c17cbfe-f89c-4718-b97f-665dfb4fd111} - {c7e086c1-48a4-452d-a3b3-38b64dda4727} + {a303e7f0-810d-47e3-b4e5-b479bf8b34e4} - {93c864dd-1430-4ed4-9776-e0db5f665d2e} + {1df5b44e-1553-4fe8-bc02-9c07f728b1e5} - {76e362a2-7600-4229-b563-7abb96ee320a} + {a052809c-4d27-45d2-b72d-40c10828ecbc} - {cd362141-75f1-479f-96dd-d82222851ff2} + {a9ad3f96-ee62-49d1-89d0-296fd6c4010e} - {bdf1e029-f570-4e40-8981-83d798316424} + {b82669d0-4f30-44ac-b2db-5417b57468c7} - {da02d926-df92-4739-b436-5b497c60615e} + {b151e110-052e-4e06-b616-d198ce1e456b} - {5d69d997-9fb6-43d6-8abe-9d61fb7118ba} + {648b3e3d-9e0e-41fa-8b77-1a0d9aeaca12} - {bc79af31-bc27-4d86-8342-c0a539af440b} + {9d58ff27-1053-494c-b11a-1e70f11765b3} - {7044fd1f-b85f-4880-98b1-855662247412} + {3b718dda-910a-40fc-aa37-d5d59adfcf7c} - {7bb32f6d-f485-4850-a655-25db4d3e84db} + {7086a4d1-0ca0-4ff9-9853-033b91b84c5e} - {7feae980-edff-41a3-812d-e99cce0a9b74} + {43c26c01-256e-4576-8464-f0fd0a9b503e} - {ce33fbdf-bfc2-4425-b89f-dbc443a864be} + {28c58a43-dccf-46c1-9f91-45593543abdb} - {88b42003-9e32-4ba0-92ae-0b15c074f6de} + {1dc9e9a5-a0b6-4729-ae51-905846235f12} - {6fb9c435-59df-430b-9291-a1f10ec82df7} + {c5e64d0d-c6f5-45d5-bc29-a815b4a0a828} - {a651f81e-ff75-4b73-a44a-164e6160605c} + {37f77088-f341-4c24-8078-8b61c144dbed} - {38af8a9c-9899-4c73-b53d-e3c90fadc63e} + {8e5ae426-c89d-4d93-b04d-974ccf0698ec} - {896ed984-e199-40be-a298-12e9565d49cf} + {f9852d31-32c3-4645-8a9c-e0de84db0046} - {8e90f1fd-3850-4356-b11f-7b1688f4268d} + {068fa217-5b2b-4559-9538-ee6e961af87c} - {57248516-7401-4921-b8ee-f66029fb6eb1} + {e49a9ee6-00d9-48ef-b561-bbd2d9958023} - {288fbe20-7d67-46a0-bcea-e324a0193ccb} + {2ecece09-03e8-433b-a7be-bb5dabfcd65f} - {ab735872-2572-47c3-a045-fe4255ed0a14} + {604dba4d-63eb-4c9f-a784-e1ddd1ca30d7} - {92f3bf7a-3599-40d4-a9dc-684ebb6e1f7c} + {88a6f265-503b-4a98-aac8-2e14a7846460} - {52a84ccb-c4f5-4c5f-84ca-981634044a03} + {6850256d-1cb5-420c-86b2-e6c1af48fb03} - {7a252e11-f211-42ea-8541-be20123fc5f5} + {1c245ec1-3033-4ef4-91d7-e05a9f1931c3} - {4a4da375-f819-43b8-8488-5d4e834e8a5a} + {0038641a-77bb-4817-b14f-4bd4b73edb20} - {e5bdcf0a-a56a-4db4-a1b9-bee264ecbd25} + {30dc118a-daf4-4921-8d81-998286c0f35b} - {6a07a2b5-a344-4eee-b775-15d59103f090} + {dba95ac4-7979-4099-9d55-618c0a877ca5} - {2e88c144-f999-4af7-bca5-92cdac49cde6} + {c32ec75b-0164-4196-9c2b-dbe1068ffc8a} - {837965bd-8ff4-4959-80ba-978e7b717008} + {1ab02b0c-826a-42ff-a8c3-d8910d416a8d} - {00a7e43a-b026-40b5-9d0c-0b7efac79b0b} + {031d1ae9-9096-4798-84c6-32bab2faeff4} - {a3e9b7ac-8450-4acc-985e-28cec4e49934} + {a5ed1392-0502-48ba-8841-991ab3295273} - {780f52fd-6f26-4932-a4c5-7ff747a38267} + {b276506e-37a0-49fc-964d-f75303949fd5} - {22399d1c-1954-44bd-82e2-f1d6f0cd244b} + {d3e840cb-c8ce-440c-bffc-6d8d83ab30b1} - {f8beeb03-1898-49a5-a495-54d9c9f1b52e} + {9d9abdb8-4707-4e68-ab76-de54770a6711} - {0bc3dea4-4e82-4494-b789-eb2eb670384a} + {bf8ac50e-0e1f-4e88-a210-756481568b65} - {bcb8d116-45f8-4ea7-9861-b55f6306f15d} + {0c43481a-e22f-401b-a081-5c39a1405365} - {6a953c1e-219e-468e-bbc2-b7a328dca59d} + {401c2c0f-aba6-4434-8b17-08bb02bf2c88} - {c5344ec7-d2ef-4fc5-b4f2-53055529fd8d} + {8e4e69e7-9ac2-48af-a98a-c7e571a168a0} - {4fd73630-3633-4e39-933f-9d4ef1b3f8ef} + {be70cd67-accc-4e92-9bd6-f805ad8b9cd5} - {aa26d97b-0dff-423a-903f-84097553fcda} + {232e3443-b1d6-4782-9fed-48b568ab79c2} diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 80a3a1de7..285c5ecf7 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {be156e21-a24a-40b2-96d0-afaf7f109421} + {8e474ea2-00f0-478d-a791-ac91b65f323f} - {e7e76e0c-63d5-4fd2-9c19-4fa34b7ffd0b} + {ef8db1a2-05e3-4832-bc70-cdee9d2b8d7a} - {a0b96781-32b3-44af-b583-7c42ec02d2f1} + {dc898815-22c8-4e3c-a0b9-77cb227cac36} - {668b0d89-a733-4397-868e-5affdfc6d991} + {8ee3cc3a-306c-440e-9798-188f33e93ca3} - {4734b565-f338-4761-bc52-7c4be9c6a70a} + {c053bb84-0bdc-4948-8268-f1c9bda0adc7} - {e6419439-ace9-47ab-9878-2db7d5cb241b} + {d9fd72de-95ac-4e58-bc66-c2cfb83e9f97} - {06158bf3-9e93-4462-8288-696f53059a76} + {2c233f4e-9721-44b2-83ca-5af3fdf5ec85} - {4aefeb8c-4ca3-489d-9051-1f8454c2d29c} + {c1b8a6a3-c954-459b-869b-25f3b2e21341} - {48aa5794-da5f-445c-aa28-30b01d76b804} + {bbb37169-2380-4ad1-a862-92d62d79b444} - {5696f766-550d-4c0e-bb8f-e1f2baf4de4e} + {29b5eb8d-3232-48c8-a28c-6786500eecfe} - {d7e61e01-6265-48d4-875f-bfa8f0e39b20} + {47c26f96-4cd0-439d-a206-cf6a27cb775b} - {9a19caff-d8ec-4062-91b1-c3f5dfa08c32} + {9e89f738-9b97-42da-8f3c-4940d671b4f6} - {ef7e0e50-7f3e-4132-aabd-f527264d2b4e} + {9cc623aa-e351-496a-ab42-1407b4e82f31} - {fa277f19-acbc-4e41-a574-28c74c8d7433} + {25064556-7f49-45dd-9f12-a374cbd05e1a} - {e9646687-db42-4785-abfb-c883080050da} + {ef67d075-2170-466f-b648-8071eec3f9c4} - {9c831805-e977-477a-b38b-bef7b45bd28d} + {f0ac4ba3-8bde-4267-a087-6505ee700d6c} - {369e3d4f-09d6-43e5-a202-f28955019338} + {915d90ac-5ac3-4e6a-af69-eb0721979650} - {073b761a-b8c8-4954-88fe-da141278902c} + {a541d6c9-f64d-49fb-813f-9470229ab64c} - {9fe6707b-4173-4b2d-bd12-ef95cea84fa3} + {162e21c7-5391-4256-9dca-ddf715e3a216} - {0efa93c9-2055-4198-8343-91f6ed80006e} + {effc2266-84ca-481e-ab60-d6ef10f64fa7} - {9db84ca8-cd38-40b0-a25a-97cd1fb2ab03} + {cf316847-547e-4376-b660-f122072dce3a} - {9e47bbfa-75db-43c2-b661-e97c82590943} + {fdf79a5d-8a96-430d-ab44-296c8983fc0e} - {c85b5b76-f77c-40c3-9047-f369baae2279} + {59ae0338-db07-4f76-86b6-d2ba2874f5e3} - {bf060120-8aac-43c1-b6b5-71574848933f} + {803c80e2-16c7-43e1-9835-4944a15b1098} - {cd3e8d29-55bc-4b68-a175-0efee9472241} + {5cb834bb-a993-401f-9f19-a422dcf51199} - {7a98f797-80f9-4471-9347-d7893f62e260} + {bab05fd0-0595-4396-938e-455137e5a3a9} - {24644742-4eb8-4811-8a7b-d746a6249068} + {e02a4e32-8b44-4726-94c1-45e3b3a876ff} - {1bd040be-555f-4f61-8ec4-776ccce1679a} + {67ae6962-c11f-4e27-bb64-440eb8da8938} - {a69c36ec-210e-4b16-a3dd-e6b546a9a6af} + {d6671d89-e065-4666-88b2-25a18d609c90} - {2e802823-99ba-49af-be1d-4b38ad3531d8} + {4196aad5-d456-4ba9-80cc-48a212616de6} - {97fe7c81-c534-49ac-b1f4-4bcd33d9fc8f} + {18142b21-afa4-4e1b-972e-57f663dc5ee3} - {df8c1031-577b-40bf-8db9-7845dbe94113} + {ea710b6e-a817-45d2-ad7c-1e21d0b7d351} - {d602a174-221b-4626-8bcb-a2b41d17190b} + {195d4ebc-9b1b-4de7-a205-e11a7c593c64} - {3ce1d2da-9c76-46ab-bf2d-07bd2574c097} + {4a7f4e06-9b07-493f-a9d5-534b2ec41f9b} - {9a2e4241-3948-42b7-85db-0744547da309} + {ecf97dc5-a086-4204-b9e9-457b9aaac650} - {64068007-a99e-462f-af89-b81165d696f4} + {b66567c1-e720-4312-9969-1697ace5609c} - {cb352ed7-e249-44e7-8061-fed566ae27ee} + {d59909b6-b5f3-464d-b0b1-42e750bb9c8d} - {e51bf4ef-d65d-4f24-ab2b-35744fd58e54} + {6b2ea5e6-9f31-4813-ac70-32fe03529c30} - {4b254753-ceb6-4c62-a937-35df9f134ee0} + {7ec62c73-4f83-46a6-b124-4723ca9877b2} - {016630ed-2ab6-4de9-8b73-32b50d1614b8} + {4cd64e12-d803-4524-a7bb-0d403a0eed26} - {ddd2dcc0-17d8-4554-8559-1c47a2c3db67} + {8cc7b4c1-b87c-42d7-9bcd-d654a869e530} - {3a84761f-e9b0-461b-8e86-e6f7b865aad9} + {c8385a3f-4787-4ce4-84e9-f53222665976} - {d1623a56-7117-4b4b-b83a-a34ba2039492} + {ad15ee31-c11b-474e-afda-767930819eca} - {3c9a6275-c8ce-4ef6-9035-b18e5ccbd441} + {07e60d76-2bb5-4877-9888-affbf090e8c3} - {fdfcc304-87a5-48b7-b40c-d0025fb21860} + {b8ff3f91-47d5-4674-9e3d-7ec280b15400} - {cfb5ead5-17e1-4512-97e3-4dc959da1391} + {66bd8ed5-d6f3-4a14-ae50-f256a5257527} - {90fa7308-3147-40ef-8357-ff9af4b4ba1e} + {eeb8f1c4-8e26-4b67-8c5f-8bd9eb41a74c} - {5ed75c6e-9ae6-435b-a247-50bd6135f0ce} + {c2eea5f6-f70f-45c6-9c72-f15308b354b3} - {c6557a65-39d0-4977-93d3-6fce3d5fdca5} + {38187c6e-1cd4-4596-a224-8d3310aebb7f} - {11c89c9b-440d-4682-bc60-ecc2dfbb16f3} + {2cd66cd7-5101-42ba-88a2-3acc4beeec4c} - {79e6d802-535a-41ce-bcec-8d2d1148001d} + {4e8ea193-b1d2-4e6c-ae3d-a9037bdf021a} - {597636e6-08c0-49b3-b00c-d6e23fc23221} + {a2d11785-deaf-4f1b-9637-a6fd2644850a} - {e3bcdfe7-2552-457a-8ed5-f8a9bba425f0} + {766b18b1-a462-434b-afbe-eec17091c907} - {73c489bc-9484-4b14-a999-1141bca20744} + {f3919cf3-1acc-4f8b-ac55-ab15ad0d6f91} - {9295da37-a20e-430f-8d81-76aabb7ae2c0} + {884f70e6-1496-45a7-91a4-746b25543e9b} - {51270def-e96c-4c55-b9d3-545dac1d8286} + {c64c4ef1-18db-4b42-b632-7e3b3e147c1d} - {d1021922-975e-47c8-b3bb-457ed3354819} + {f732695a-48f2-463f-9f64-42568ab775c4} - {55300add-2872-4fce-88c1-8604147b42d0} + {789f5dba-d6f5-462f-b654-0dabaaca3e1c} - {aab9bec7-e446-4bd5-95af-21978c487f29} + {f7730268-d0cc-4284-bc45-b2035617a6e2} - {4ac8840d-5248-42b6-a4bd-aef26c4003c0} + {f1ca1b6f-a9cc-4327-8057-d5da93433274} - {9e0dcf96-0500-48d0-846d-564e0975bd72} + {54352605-e8a4-4f8a-9fba-827e8a40b071} - {6c6d9856-de14-4bce-b9c5-ea2631dc4da6} + {50d70556-e97e-4b77-bebb-4781d6e568fa} diff --git a/Foundation/Foundation_x64_vs120.vcxproj b/Foundation/Foundation_x64_vs120.vcxproj index 1952f4330..78df89d5d 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj +++ b/Foundation/Foundation_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoFoundation64d PocoFoundationmdd PocoFoundationmtd @@ -277,8 +277,20 @@ + + + + + + + + + + + + true @@ -288,9 +300,51 @@ true true + + + + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + true @@ -317,8 +371,76 @@ true + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true @@ -360,245 +482,22 @@ true true - - - - - - - - - - true - true - true - true - true - true - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - + + + - - - - - - - - - - - - + - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + true @@ -628,15 +527,14 @@ + + + + + - - - - - - - - + + true true true @@ -644,15 +542,7 @@ true true - - - - - - - - - + true true true @@ -660,75 +550,6 @@ true true - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - - true - true - true - true - true - true - - true @@ -779,6 +600,62 @@ true true + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + + + + + + + + @@ -806,6 +683,7 @@ true + true @@ -831,6 +709,81 @@ true true + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + true + true + true + true + true + true + true @@ -856,15 +809,71 @@ true true - - - - - - - - + + true + true + true + true + true + true + + + + + + + + + + true + true + true + true + true + true + + + + + true + true + true + true + true + true + + + + + + + + + + + + + + + + true + true + true + true + true + true + + + true + true + true + true + true + true + + + @@ -884,61 +893,134 @@ true true - - - - - - - - - + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -946,84 +1028,107 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -1034,204 +1139,99 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + @@ -1256,7 +1256,6 @@ - true true @@ -1265,6 +1264,7 @@ true true + diff --git a/Foundation/Foundation_x64_vs120.vcxproj.filters b/Foundation/Foundation_x64_vs120.vcxproj.filters index 85b4e9e3f..ffd5fcaaa 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj.filters +++ b/Foundation/Foundation_x64_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {047be82f-83b8-44be-8e0d-950f44d0a924} + {97e8a458-671e-4d59-8f01-5489c7e49283} - {c25aeb1e-04d8-4bbf-955a-60170befc8f6} + {a3ad01dc-7939-4ab3-b0d5-2a7295a9191b} - {0bded1da-79ab-4fb3-8af7-7b66748ef8db} + {ec12eaae-48c5-4c3f-b493-bde4a272d041} - {d5e357da-b8c7-4ad5-bd7f-1056be16099d} + {367afbb6-ab74-45d3-b601-b18c30710229} - {8abc87b9-8f9b-450f-8e65-ccd84d247089} + {680a9f7f-f740-4c92-9684-dbab04272c94} - {e9c03677-3d1b-4478-a11e-52a4c1440c91} + {e4281361-81aa-477d-b7a0-8e37dac3b3fc} - {1ccd6c7d-7550-4a67-bde9-2fab5978f14b} + {b7fe71e1-e73e-46bb-9ab7-8848c27baf7d} - {c235dac9-0e42-461b-8275-abd88b3d4e99} + {f883afec-b42f-43c2-a114-be74c9b7058c} - {2f5af19c-2182-491f-9858-bac7457f5268} + {6dea5fe4-634b-441c-949c-45d7055d2372} - {ff5b72d2-8ad8-4b9c-b15f-74e85bd675e2} + {36f5b46a-3e24-48a9-8cc8-96ff807eab51} - {9637890d-0ece-468e-998f-360f010e5ef2} + {95f6d6f6-6bc7-4e90-8378-983bed0c60ae} - {84cbca91-c0d6-4ee1-9a0c-910c2ce02501} + {43fd7f5c-4f74-41d3-aa52-8e85c490b76f} - {89ec1c3c-898e-4506-a7f5-07df5e26e481} + {fdde71e3-b0e4-4cd5-af14-afbae5eada2e} - {81498d98-505e-42d7-9d1b-c4569e12bf5c} + {3e570a54-1637-4f62-8f9b-c6d9831a81fb} - {f0b6f9df-5ae7-4177-bcf6-d9c7b7eedb5c} + {4675f943-a80d-4af4-b065-27e66193b37c} - {c35c695b-20d1-43c6-8d9a-68fe1d93bc7b} + {c795102a-6237-4234-b582-391b15de9b34} - {69b4cad0-5d68-4fed-9329-69fad5d34aef} + {a9de6594-7a49-403b-a1ce-50c19b03c622} - {f56db1ee-44ba-43f1-941f-07a3f82d7023} + {cbb0f0a7-a706-4c75-b183-ee076623fc1d} - {7a37f426-b68d-4116-a561-3b6465448082} + {dd8f27a1-5ff0-442b-8f1b-889946bbc351} - {df97637f-ad49-4272-99bb-8dfdf0959ce5} + {a7a5576d-fd1a-493f-a5ee-4a9ec8f3cd5a} - {4765d743-0f18-49e7-bdc3-0930939412b3} + {a7892e85-e440-4e7c-9558-425c95539222} - {31d5deca-34a3-41aa-9fa4-5c93f98b2cb2} + {ad169458-1ec2-4043-8aa0-0451c95cdf9b} - {a6ec2cf2-595f-44a7-8447-b5a34008afe4} + {3da3feba-6ff1-4bdd-98a1-a667eba8797f} - {8709ce4f-af00-4e69-bf33-82241c526c7c} + {5f4d30cd-b610-4fd5-8f5f-92e0d15768ea} - {6e1c74e7-1f53-46c2-a8ce-d8bc80c7e688} + {3c1817b5-7cca-4576-82fb-bd913bbcf843} - {1e6b0b19-7d90-474d-bb22-93eb41403924} + {5f2c057c-8384-426c-a1e9-1931cfc60106} - {361b511f-eece-4d1e-9611-d7510cd9513b} + {bc0df219-4e12-43ae-b272-ad3762a37b4e} - {52942832-dcd9-489e-8d25-43794cc34fb9} + {3052447c-04a8-43fd-8d5d-72b458f47325} - {1a0265a4-6dd8-4831-9ad2-126bc522fb37} + {21c55d61-bc0a-4104-9027-e503119ee472} - {2124382b-0944-4362-b985-fedcfe57ebbc} + {4a2c192b-b6bb-4658-8da2-f72eca1fb119} - {4024bd19-a6dc-42f1-81f2-25f4fb679fc0} + {6693395d-7a83-4418-b266-dfdb6581bb93} - {b9456eb6-4e6b-462b-a795-d305230a8fee} + {957926e3-5949-4666-8c62-14e10cf6419c} - {613f3443-0ca6-4d2e-9d75-5c7adffe56ac} + {9496c192-4cbe-4238-9dd0-99948be21c21} - {a621e1c7-7aa1-478d-9599-1bcf4e13f4f6} + {49e2a84e-3af2-4c75-8e94-a2ea91ccd391} - {0ff08f60-93fa-4dbe-81c8-c243d55bc8a6} + {6270722b-da14-44ef-80e8-8d2697658546} - {aa36208b-ff1d-43e1-b9f8-5d242fd42437} + {8f6f5569-584e-4c1c-aa20-d0f089e6d7cb} - {43031440-ca0e-443d-b2f3-c73f3a1c52ba} + {4dcda167-2791-407f-ae01-11af5825a47b} - {39ede6fe-b402-4615-a766-bf414c2d5b42} + {0aafc190-c31a-4a91-afb7-8a2af9a9b25e} - {eb47bf8d-4b3a-412d-ba8f-2df2eca6d7ab} + {864453a5-d188-468a-bb1b-6cf37c1791e3} - {6d9a8dac-635f-4de9-bbc9-7924d5463c17} + {d85ed256-627e-4b2b-9e2b-b731fd72b39a} - {3b845b73-e97b-4ec7-b1f6-2a4077b71696} + {c4dd4e05-f0f4-45a3-b656-40a8f1c7ac8b} - {853656a9-bf0f-4ebc-a467-bd6bfd610eb0} + {2a1bcf7b-ed4d-4b91-b94b-4b48ac5f86a9} - {c73279dc-ea32-42f0-8705-17b4ff223e4a} + {4f9a35ed-d443-4430-8e19-455b722afca2} - {5becdac0-841f-4741-8f0a-1c6f15b5a204} + {fce425e3-6375-49d9-82ae-60913ab5e336} - {265c1866-a3bf-4fcb-83eb-4d2a2abbbfd8} + {b6ed0740-d773-46cf-8040-f576c25c955b} - {dc907795-69b6-4606-b87b-59c5cf87abf6} + {cb2cf158-97cb-4f69-8976-31a737a56afd} - {f70bd31d-9ee1-489a-a2ee-c529638e8b8f} + {5217cf87-4fdb-4726-a71d-a3c9e606457d} - {7c050991-6d19-40f7-b528-0ac7dc573163} + {c8a6c1c3-4774-48e7-ab8d-81a6c8760f32} - {39472e4b-44af-4bab-a2ca-109073819a07} + {a0636a77-99a5-4f66-beaa-f0450e9b2540} - {c267a3cd-7bd9-4933-af67-edbe24ef1983} + {88100646-2fe2-49dd-b67c-89450990eb51} - {377f7f15-63d3-4daf-b14b-55d54430ceec} + {7fd56610-4381-44eb-950a-850c9f5020ff} - {bb3f77cc-98f4-4ecf-a1e6-8cf4cdbead01} + {d7a5d919-635a-46ed-bae1-3ae8db6fe895} - {5f997d6c-fbf4-4c2b-86b1-1706ca9b6de6} + {32f9ca93-8787-41df-8e4c-40a120800422} - {89e4d512-e29d-4ff7-9ced-e7d25b15614c} + {242c50ea-2cbd-4e30-91e1-951b7621a837} - {66a101d7-e30f-44a2-8c5f-a3810e6d6bbc} + {72d3f08c-d230-4367-9925-e3f85ff47f5a} - {64b41325-db3d-4632-b1ab-78ba4fa1dcf8} + {f08bafdb-b1ba-4709-ab75-1592d902b2d9} - {6b6c2083-55e0-4189-a5a4-d6e937efc017} + {5e6a07a7-e124-42a1-987a-5d60a00cc8cf} - {d2358115-1ab7-475e-991b-fd2d0451c29a} + {5348e835-4926-48f5-86e3-44ee792590cd} - {c6c00c87-8382-4494-a719-5a5d0e42c6af} + {5c414a9b-41e9-41ee-ac17-c20ea9c5c9ef} - {16b9384e-c6bd-4bfe-939f-cdb986a8cd53} + {2b7892d4-53fa-4b0a-9656-261c57e0fdbe} - {da56e190-6839-4cfd-b0c8-06b40c754076} + {17cd247f-c33c-42c5-add1-60c7e12c3399} - {d835fd7d-6fbc-4c24-a795-a8e142451079} + {b874e13d-2219-4677-8d06-e07f9091bc17} diff --git a/Foundation/Foundation_x64_vs140.vcxproj b/Foundation/Foundation_x64_vs140.vcxproj index 9cda64afa..31156226b 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj +++ b/Foundation/Foundation_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 PocoFoundation64d PocoFoundationmdd PocoFoundationmtd diff --git a/Foundation/Foundation_x64_vs140.vcxproj.filters b/Foundation/Foundation_x64_vs140.vcxproj.filters index 313fa5cc2..b9a866497 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj.filters +++ b/Foundation/Foundation_x64_vs140.vcxproj.filters @@ -2,190 +2,190 @@ - {3d8a6556-ae41-4f93-970d-8d07740326e6} + {5b55f393-dba7-40fa-b071-d7d2ae1fcafd} - {fd425b7a-915b-4012-8016-aadfc3eef510} + {cab2a78e-490a-4bc8-b44f-e345ddf3d1be} - {f78533cd-970d-472d-9288-79f064e5443f} + {cc172f4a-f81b-4fd4-aaee-4b54d05d32b0} - {29ae67d6-265a-4558-a2a5-b5e10ccc33f0} + {1640a075-1d9c-4625-b353-c7eb12508f14} - {0c88dd20-716f-4713-b19c-ed33370a5ff9} + {45c1bea2-c297-4966-b3ad-a3002d060235} - {dd4068d8-13fa-48c2-a8c4-e3791935ffa8} + {993d8812-7af9-4d56-89f3-284ca93ea808} - {5ed147cc-3aff-4993-9074-e952ec2a1257} + {ad38af66-4e34-4f2a-b81e-8a25b16af82b} - {6731bf34-dc6e-41d2-aec0-0cdc2d9882f5} + {887287f3-6a57-448c-bfe6-5d19faf409ae} - {a4f4247d-306e-40da-a916-9897829ea050} + {1284512b-d93e-482d-8f49-b15955201764} - {c47e3c85-e051-4b0d-8d2e-3fb037b60d8b} + {f75ef309-df4a-4921-b781-be1c6a4e16f5} - {86b92d98-889e-4fa4-a38b-cad65ddf5a6e} + {a13f9159-f298-4c2c-b8f9-4ddc4b05dd3e} - {1f8c3bb5-86f8-40bb-9783-567dc44ceeb4} + {720a8de3-db43-47b2-946e-36bea23811d6} - {d7cf1472-b9fb-45c3-bade-8e401599353f} + {92b437e2-cfe1-4dad-a0d5-bb1037380f26} - {41986150-a086-4352-8199-27c798295156} + {8245d3bc-9cf8-4c12-81ac-0b74eaecae1c} - {d37e0b18-657e-4466-89c3-2c62b40818e5} + {5de3e11d-0c22-4fd7-9eb3-d33ba5a7919d} - {bae376b0-ac7a-4fad-a27e-4722cb2ee37d} + {1ad1bfb8-43cc-4e06-a3df-26f98263ccf4} - {d2f28fb7-9b8b-4cad-88bc-bf35e0eb368e} + {f703018c-e58c-4cc1-ab71-d63dcdb75190} - {72659d4f-a860-4e75-bb28-3624e94992dd} + {f6ba95cd-e5ee-4f4f-8241-5a9340744d66} - {538b6453-e90b-4876-aa64-c69fe456c32c} + {9428452e-7368-4a03-87b4-3931d10587e5} - {c719ff8e-d337-4d5f-a686-bb6508643fb1} + {5ab0904c-0ed3-4f8d-a7d9-9375cce2ce2c} - {88506811-1dc9-4a53-8b3c-62d1e6f01a8b} + {c6bdcd17-3398-43b9-b81a-d609c93d6968} - {4d0a3fe9-9dc0-49ac-90df-4388ce8add7d} + {4ef76796-3dc4-440a-a453-d3a34972cc1c} - {de170caf-951b-4bc6-9c4a-1f066e233455} + {9e94a680-9e63-44b6-9f0f-1bff4e22482d} - {a42b0c12-34e2-4038-8674-b2b5dca78deb} + {c1c021dc-e870-449b-8049-582d2cf12c51} - {07738d05-9146-4c29-a7a3-fd0611417cd5} + {48732df9-b903-4326-a0f2-82d734067b74} - {d3b38358-1587-4a4e-b8d3-63bf2cebbd3b} + {1ed0e990-9167-4197-9c78-c0f7470b23da} - {68a74dfd-48e7-4042-acb9-a1cbf1b7a5e2} + {854cb417-daed-47bd-ab24-636e41d2a276} - {00354bf7-7017-4f9b-82c3-568d7af67515} + {dca2e8d1-57ee-4ba4-bd80-be1e781c12cc} - {5b5609c0-9e67-44ae-bfbf-070645f1acdf} + {6c7f05c3-6951-41ab-82f0-8ad33761c894} - {9f486a15-c6b8-4493-a051-33a19ad50388} + {c47c05f9-97c7-49cb-aac6-f3a896ffc4a5} - {4d458e4b-1c50-4f80-af84-6bda48367d23} + {5f5e5221-75fc-486b-84c4-3e04b3137e15} - {471d903e-5ae3-48dd-8744-a2ae38a71721} + {7e2ae042-8800-4237-b0d2-e445b6f690aa} - {bd94780d-cf27-4eec-9dfb-994a629d14e5} + {0e44d80e-25c2-488f-8aee-0ed25857b3c7} - {4964e53d-2b23-4c02-8d19-0035ad3c4918} + {2c445208-54ba-4b4b-96b2-5429f8ae68c9} - {b05b6993-6b3e-49ec-8530-2aad3f1ab1aa} + {6a2acd35-2427-4eed-b61c-29234d8cca2f} - {9b5a1bac-dcd1-408a-ba4a-41caf8a92065} + {da0ca0e3-ea0b-4020-890f-995bc12d9447} - {0c5e09b0-6c99-4a65-938c-067c4767a081} + {f5b6fa56-fe43-4bf6-93ae-ed74b564462e} - {91a4334a-3d46-471b-a50a-94753376a390} + {c7faf65a-41b0-40dc-a910-97f728ffa209} - {e7f7ff4e-3882-4b85-99a7-ea977437e93b} + {85646df8-6088-4a00-8ccd-d3b912373c83} - {4ec5cc49-3458-473e-b39a-12ee95104660} + {ace5f470-eddc-4f9f-b9ba-5ac825abcb90} - {3962a563-35f6-4b6b-ba77-b3a29075a38e} + {337498ae-c198-4054-a1cd-ae02f24e20a5} - {902d2a35-99bb-4417-8383-36ceba410be4} + {0673734d-bb08-4cd0-882f-887dc57b9feb} - {0dbb71b4-e120-4486-a00c-95ae282d11f2} + {00330a71-7edd-41a1-9d0b-f0678b6bad44} - {c7b0bbeb-284c-4fd0-84aa-227e25a36f79} + {121b9ab1-1e6e-4191-b20e-d0b4b912767b} - {92fe1433-b5a6-419f-ae2f-a09c425f4e5c} + {61cb4558-a5d7-494d-aceb-e26c0a4ccdd6} - {60a6a847-8b35-4eb2-8bcd-76f60f091ca1} + {5aa6347b-a25d-4200-b47d-93728ef25fb1} - {156ff6a9-4dec-474c-8e5e-f1098b202e13} + {0a031f5f-f890-46de-b412-905c14b84fba} - {3a03957a-d940-4de2-a7b4-4998cc63ade1} + {bd04b9a0-0ceb-4e4f-8f1b-fd1bbe1c1df6} - {65fe8ec4-4659-437f-a969-9ea348df7012} + {7749ce0d-8b52-4151-ba3a-4f38afc8a03f} - {d24459a7-dcf0-433b-9d4d-d70313c20e79} + {0344d264-831c-44f1-8fea-63cd70da295e} - {7e58c77f-464a-4c82-a529-fa09fe37c3af} + {b48e0972-364e-4339-bddc-470bc224a1a8} - {542a08cd-873a-4409-9ac2-f36145f3b0da} + {4cf8dd2a-a86a-484b-9416-784cf5513ac4} - {b81ea964-6bf8-4bb1-82d1-3c10187a5d40} + {3979500e-db81-41c8-8cb1-eb84c0084c9a} - {1483292e-8010-4266-83ca-d41dd766d166} + {ed52db00-25df-4187-886d-117192d54c9b} - {efad3f8f-3d88-497a-9715-ad5d785208a7} + {b23ab93a-5f49-47b6-948b-d9b10a09e777} - {255a1102-6b43-4d6c-8a3e-9a24410501c9} + {86a46a8a-8ee9-427d-bad3-440944e02625} - {4c98985a-1d5c-4f3f-8e19-e35415e2c290} + {83506617-9f89-424b-90f7-9bffbbfb74f8} - {3dee5251-3666-49ac-a7a0-183bfe43bace} + {84937f23-8d9c-4a77-b25f-af1220b8f2e0} - {0ccbb706-84e7-4511-9add-db814b561d0d} + {9172bd31-31bb-4774-881d-c417b8df4db8} - {666ea898-38b8-4120-881e-64809c25bc11} + {2d231f0a-56f3-4246-9178-bf1849563933} - {d3dc6223-cd7d-4684-a79b-02add4b601fd} + {8b0f1bcf-4d18-4223-a11c-613620630374} - {fbd29390-8e77-4c81-854e-5e220e651380} + {24b11b45-ab92-487e-8f4d-15a61dfecba5} diff --git a/Foundation/Foundation_x64_vs150.vcxproj b/Foundation/Foundation_x64_vs150.vcxproj index e8d548b45..7c0188e23 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj +++ b/Foundation/Foundation_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 PocoFoundation64d PocoFoundationmdd PocoFoundationmtd diff --git a/Foundation/Foundation_x64_vs150.vcxproj.filters b/Foundation/Foundation_x64_vs150.vcxproj.filters index 66f51dbb8..1d45ff650 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj.filters +++ b/Foundation/Foundation_x64_vs150.vcxproj.filters @@ -2,190 +2,190 @@ - {f192dd53-e870-48a6-b739-edbf4a2ebc4a} + {40e183ee-ed5e-47cb-81ce-5c64237048fb} - {e0db7bec-fbfe-4a1f-a40d-ec8e37a54998} + {40f067b1-a112-486e-8b34-4dcd2c566d6e} - {6c717f9d-c65c-4eea-9469-879dc72df00b} + {e6ba7a3d-c89b-434c-b9e2-1810fdfca4f9} - {bb1a6d91-d4e3-48b2-b53a-fd012e3e0077} + {af95b2de-5ed6-474d-89eb-e40c0133de13} - {032ab794-1fb3-4105-b9c7-7747209e80a5} + {a2c47132-2bf8-40a1-938c-30fbd2466bfe} - {4cf9a76c-b3ee-4273-8a70-e22b10f80cc1} + {9ab04eef-6a5d-41b5-81f6-c6c73bfa0dcd} - {c5154a0f-b9cb-443a-b6e1-41e0c829fe51} + {635569ee-c572-4d59-96b1-864ee65cbe0a} - {fb30367a-41a0-4833-93b9-45e644f955e3} + {54fdfb71-e68d-428b-bc43-6feb1ad6d196} - {2542ac33-2181-44de-a79d-d52a6f8e38b5} + {54137b40-d22d-4f01-8e29-f3921543788d} - {c44b38cf-5aae-4082-a596-0aac10d235e3} + {1a93ba9f-4f3e-4c48-ada8-d6d6b12eff7f} - {c875d0f9-415c-41b1-b7df-b60d65d4894a} + {0588e873-9cc8-4c6d-bfed-f42a05cd8a35} - {def9f621-0e0f-4219-a3fe-09723ba8f72c} + {07e00aff-5890-4c4a-ac77-46d2ebf1aacd} - {316e0243-8fd6-40b9-8286-d70df3c512c4} + {3ae28192-173c-4836-9c5b-1086a475914b} - {223fa337-7642-407f-a745-1835c2ecf90b} + {240cfca8-b8a8-4da2-8243-97bcec2caf95} - {fcf5501c-0d00-42bc-9077-7aaabfb1f226} + {961e0e0e-b10f-43c9-88de-8f2a16646196} - {48ff58bf-5d4a-4ec5-85da-2f51da73493e} + {8074ff6a-ef1f-4d06-8e08-573eaec84a0b} - {c69c287a-13a9-4448-ae41-ac249d4f89be} + {905baf77-de66-48b0-a0eb-0b4f17369f7c} - {3bd118e4-739d-4da7-853e-a8df1d0cb4a0} + {58931c30-a184-4d21-a7a1-24ff5234d60b} - {a3774455-82e6-4ad7-9700-b02b1cfaa072} + {e3e82439-28a6-4618-857c-d94bf6b25288} - {3ffbdbbc-580f-4f11-ab66-bb9286947c61} + {eea1ef82-6a9c-45a6-a255-155e8d370a57} - {a654a0c3-971a-4536-adea-5a84ec34ed01} + {4ccdff8b-e4ab-4dfe-af5c-22b95c791820} - {d3416a75-854a-4a48-b00f-6b962cdc60bb} + {8b2e0a08-30fe-4151-b7d8-ff8a868c0051} - {0a9a3516-88ab-40a4-b4d9-d3c0edab08d1} + {fd05e726-5fa5-4c8d-a694-d6974cc0a1ee} - {81e61773-920e-4912-9fb3-f6665f3e8457} + {11ea1e67-ad97-46c1-af29-a4ae9c1d72cb} - {07182b12-bce6-4245-a049-a3fe34b3b995} + {994c7b19-d9de-4a93-ab19-e9dd5f9e7da7} - {38703e77-37e6-4a65-a999-beac621629d6} + {f3c0e05c-a3f5-4dee-a4f3-53b2fb85cfe1} - {3f005a69-97b3-43e2-8262-8ef1a98cf54f} + {9cddef1a-5364-44a9-9c5d-ce6d53eabcc5} - {3ce6b532-c8d2-415a-846c-abe92ef267f5} + {6d46ab1a-1938-402e-af63-a9f013d49d7e} - {7be7c16d-f11a-4aef-9a09-ad958fda588e} + {74ea8f5a-e6e6-43dd-8037-b6471008978d} - {b1e75561-e649-4993-bd59-84d16d933b23} + {f4002e12-f86b-45d3-9d48-f974d8c76249} - {92d16ae0-2005-4d27-87f1-c27159877d89} + {76c4e1fc-5684-41ac-bddd-767fe0eea0b9} - {94351b02-4e68-481a-a38c-1f59b0b07cd0} + {fb137e4e-1580-4810-9dfb-8686962897a3} - {d812c2d4-63fd-4369-b857-68b1720fe6c7} + {177fe44c-4456-4ef0-9327-5b3ca37a6eab} - {67073b8e-77f8-444b-b34d-2ccc1c2e734d} + {787c1bd6-213b-4159-a715-420ccf6c769b} - {1cdf99f6-d124-49d7-8e3b-0e1b1c179cf0} + {81a05cc5-edb9-479a-b5ae-4ebe7076c1a8} - {806d46a9-0968-4a3f-8a08-78f69084b79c} + {53293e93-9aaf-4123-a271-7254b21ed6ff} - {33bfe9cc-d928-462f-a5c2-fb4132add26d} + {7c0d91a4-f9b7-4756-9ee4-430148f75ace} - {8c02c6f1-2fd8-4e6d-a86b-3bf633455821} + {facade73-c82f-449d-a3ab-42ff373e6bf6} - {0e5068de-a0b9-4358-85eb-afdfacbdf206} + {dac5c2a9-27f0-4012-b2a7-d1fe00aab6cc} - {94f70570-6b8d-43bb-bdbc-d74f18516724} + {194a1255-b34e-4c94-b6e8-b03306f0fb9d} - {49321cc1-0ba3-450e-a5e2-698ad7492830} + {78123f91-2fb0-49a0-a654-01f360466f60} - {092bcb8b-fd85-4b66-9659-567624eb5c02} + {003c588c-d4fb-4225-8177-1c0d9f0dd9f7} - {05a8a4ad-f09a-47f9-8042-c5f129adef66} + {19f55414-d819-4ecb-bf6e-6e51271263b0} - {5ebcbece-0c6d-4694-b88f-9a7c65330d01} + {c1b6dbf5-3a8f-42d5-9c38-4e769df49fde} - {b42a52ed-929f-41ab-866b-30e0c7bc1a5f} + {b3cb20f6-0f74-482a-989f-b73b7da33f2d} - {9b0b6feb-d288-48cc-bdff-024f364a0950} + {53dd8197-f3f9-4e3c-8551-34070cf1f8e2} - {76fb66d7-0509-4d0c-aa12-2bec4e983b67} + {4d288992-80b7-460e-88e1-26c75b2eeb0a} - {8dc2f481-b635-4bd8-b37d-10e0e25479db} + {d4921c8a-1c31-4982-a2b9-406ce03af24f} - {f91d97b0-5bb4-46b6-845b-062f50492522} + {091c87e7-adbc-4f81-83aa-f315f65405cf} - {6e537ff4-279f-447d-bcce-fcfa14c440a2} + {66e9fb1e-17bb-4030-a73f-365c8e3e423c} - {94bbe192-dfd2-4a2b-8e47-05d859d5fc5f} + {9ab2119a-8460-4912-9a57-9d1ad0b1ce54} - {b923ba36-f3e0-4209-aaf2-83349af33aed} + {d99ca3b0-0cb8-4724-af43-0e9494dc8aa4} - {0d9d6444-18ed-4edb-9da7-c30db46b68f0} + {7cfc99b5-640d-43d1-a851-3b85a0700842} - {ccee44b1-3142-4cfa-9c6b-b33cd35adbb9} + {35e28716-c765-4d4e-b630-d467aacffa1c} - {f9916cf2-c391-4797-8109-1a4878caa318} + {ac35eab2-2892-4289-be6c-53ab7b00f4de} - {5e249e46-4f05-47ab-a766-d5f54830a3f4} + {24923c90-7bae-40c7-8dfe-8a047c4147ef} - {90f6965b-3b5f-40d8-9aa5-ef4090e94cfd} + {5ac5dca6-3081-4ee4-8952-6a15a58226c3} - {9b5208c6-cdf8-4c03-b56b-7ece1a525972} + {7b5c2060-e46c-4686-8e94-12ac41fa5854} - {a76c71fb-0cc3-4ce0-9b54-08eb62103a6a} + {a8f6764f-7dda-4c48-9b67-720e1f430ac0} - {813e2af5-36e9-4b82-b112-1c3d1fc359b8} + {5724fc50-ea56-45d5-a9c6-f24139640d4d} - {2372ad0a-6fc7-483d-a735-c5b88007927b} + {67205d07-1c71-4eb1-bd1c-9b119d60ac9c} - {79cdf71e-52d1-422a-aa9c-c7a52a9b3bfd} + {9270e29f-4950-4c57-ae75-c10f8c561568} diff --git a/Foundation/Foundation_x64_vs90.sln b/Foundation/Foundation_x64_vs90.sln index 85fad1719..5a370de10 100644 --- a/Foundation/Foundation_x64_vs90.sln +++ b/Foundation/Foundation_x64_vs90.sln @@ -10,49 +10,49 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - debug_static_md|x64 = debug_static_md|x64 - debug_static_mt|x64 = debug_static_mt|x64 release_shared|x64 = release_shared|x64 - release_static_md|x64 = release_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 release_static_mt|x64 = release_static_mt|x64 + debug_static_md|x64 = debug_static_md|x64 + release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.ActiveCfg = debug_shared|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Build.0 = debug_shared|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.ActiveCfg = release_shared|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Build.0 = release_shared|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_shared|x64.Deploy.0 = release_shared|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64 - {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Build.0 = release_static_mt|x64 {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Build.0 = release_static_md|x64 + {B01196CC-B693-4548-8464-2FF60499E73F}.release_static_md|x64.Deploy.0 = release_static_md|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.ActiveCfg = debug_shared|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.Build.0 = debug_shared|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.ActiveCfg = release_shared|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.Build.0 = release_shared|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_shared|x64.Deploy.0 = release_shared|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Build.0 = release_static_md|x64 - {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.Build.0 = release_static_mt|x64 {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Build.0 = release_static_md|x64 + {C812E0B9-69A9-4FA1-A1D4-161CF677BD10}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Foundation/testsuite/TestSuite_CE_vs90.vcproj b/Foundation/testsuite/TestSuite_CE_vs90.vcproj index dfa1c0f1e..08f5bb410 100644 --- a/Foundation/testsuite/TestSuite_CE_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> - + diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 0a5b5a27c..514297aff 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {66e4ac17-8b37-416d-a0e1-6987063ed0c2} + {0156999a-8e15-4786-9450-94bfc3e13dd1} - {0f443f88-d81c-487f-a369-ed88cb5024b2} + {18441cbd-2dc7-41a9-9212-bdd1ed154b8c} - {32eaeb91-4561-4973-aea0-c772dcd5064a} + {f222768c-e9e2-4106-b6cd-41c1d7b050cf} - {9e0597f4-8794-42d4-8aec-b344767229da} + {49cc2b3b-034b-4d25-a871-6224bd44b6c0} - {cb54bff3-40b2-4953-99d8-b2c96d2296c7} + {eabd3ec0-072d-40a0-8f3e-4f2f2cfe6748} - {fcb68891-220b-477d-ab44-b24744cdc236} + {b6c73738-622e-4baa-90c8-aaeaf4672023} - {21810449-745a-4085-88df-c81b97957869} + {3927a6b0-fd51-4f78-95d8-4f71851daf25} - {70004cb7-c3e3-4152-8921-d259bb35e6ad} + {1a4ffe3c-4ab8-4a74-9ad7-d757fb1a7776} - {54353639-b21a-4bfe-9056-dcae8686cf07} + {b8cdd775-9dcf-4c95-8184-7b013ab80306} - {08b236b6-80e6-42d9-826d-ec88d5ec289c} + {55e94b45-2f51-4e77-89a8-3b33b18ca4d7} - {f4ca4ca4-e1a0-4355-aa97-585ce83814c7} + {f160adc2-956d-4086-a2cb-16204b22ea12} - {d404660f-9c9b-4779-b0a6-4d1b3a36cedf} + {3d8f63c0-9a45-4f2d-aaaf-d8ff15da9183} - {1092dc08-5981-4b8b-9723-96f6faf5e383} + {8fb4eb41-1171-4947-8ff4-0146836d160c} - {05cb9662-88a7-42ac-a099-8cbdf3466b7b} + {918bc742-4175-4ec8-b1cc-84560c6357ba} - {2bfaa8c9-782e-427d-842c-efe411f56047} + {c6413548-7d2c-4713-bcb5-b2b75a831f47} - {5dfb067e-5326-4d8b-90b9-ec8b57ed1524} + {0c0fff47-2248-4b58-a09c-3ee006b607a0} - {a3a21023-e6a5-4bd6-8ae6-428bcc86bf2b} + {8d08b285-c7a0-463a-bff4-97b445b396d3} - {2d845c27-e099-43c0-b043-bfa58116196a} + {2a256875-24ee-4876-970f-9a9af4acf154} - {f37d4a17-ef83-4c88-913d-8ed80ad9d2eb} + {e2252a3f-4ec8-43b1-8eb2-cc1137f3ed59} - {344a78df-c420-475c-94bb-217a9e706eed} + {eab00576-0564-4a44-bb97-8ebd84622ecc} - {7b1212f0-9736-405b-9e9a-222345420f96} + {a7ede6c4-ef72-4532-b367-851868fe27d7} - {4416a598-34d9-4697-911c-87cd51524028} + {26a7b1dc-476f-4894-b53c-f3429a14b09f} - {16ce2c72-93b3-4829-8f8e-83cd7dbf3490} + {f849e52a-460a-4b20-813b-bc12db3b10a5} - {16fffc35-e9ae-4d61-8215-09bbfc02195f} + {21450f1a-c665-487c-813d-c7ac6f0d9de2} - {e456c7d0-7e87-4df9-869c-2478963950bc} + {653f6fe4-e526-47cd-9c7e-32f71d778b4a} - {a639723d-d493-419d-9dae-34e0401025b9} + {2ea4aac9-4f50-45d2-9af8-4b2e527f4ec1} - {e5a87d42-d2ce-4196-8202-481988d9f0ba} + {ba9accdd-66d7-4995-9342-0e08fac5e06c} - {30206264-3385-4b12-8651-409a78d3a582} + {62540cc4-b695-4fdc-9e0b-b0a6ead77d97} - {d7200b05-61eb-4878-bb66-8b6e92e3d741} + {30567496-472e-439e-87a8-fe9feb9cceef} - {44d524bd-1b53-4ac1-b440-ec237aea116e} + {ba3977d6-6f13-4725-906e-53aa9a815124} - {9b6c2dc6-3a0d-418a-a164-91753365ae59} + {4c9dfd90-74de-4130-adb3-20efd8da1f43} - {014d36e9-3acc-4880-b91e-1dd09b60f9b2} + {31262cd2-526c-4461-a0b8-986e23ff365c} - {51a891d3-79ed-4e08-81d0-cdd75f633c20} + {5e2aead1-a4ba-45a7-8d15-bd962ed9a4fa} - {d23f4b35-d928-4e27-a44f-4bfa1975ac26} + {bc75d22b-e3a5-4902-b74e-aad74cc49600} - {a7a67319-eef3-46b6-ab93-c0fb12f956b2} + {06df8dde-56fd-4ced-b86a-79ee94fa5a68} - {0e33c44a-eec6-47a1-891b-0afae6f1190d} + {fd43e604-99fc-43f9-92bb-c344697ce074} - {676dd200-b9eb-4486-b91e-5cad4a591600} + {1f31b8af-8638-4a98-ab14-79466d7ee532} - {008645da-0319-48e5-b957-eb3231b89d24} + {3881796c-7d07-47a1-a82a-40ae63cd9ebb} - {987c1ed0-d9c1-4419-9e2d-cba3bb4226ec} + {d12706e2-d501-4af0-b515-64280abd2481} - {2b665289-43cf-4ed1-b2a2-ba3d20c0a04b} + {6c4afca5-8b9e-47f7-9783-d1ed52b7b831} - {782aa628-4a7d-493a-84cd-30051b06b2c6} + {c80549b9-b0cf-4833-a6cc-ac61d333a905} - {ad3c945f-bf9b-40ea-9c0d-4d5a1a763edc} + {9ac2cceb-3c64-4046-914d-13c1191211b5} - {7d8ff359-9e8a-477b-930a-d8c9014a49ca} + {743186ab-967d-493e-9af6-b84309acd093} - {946dc149-e417-48bd-85ef-adfb51eb5515} + {2a28bcdf-c798-466f-bd3d-9c3ad3fc9cf3} - {1b6769fd-d07c-4357-b27d-160a172f5e8d} + {cafbc256-ac47-4860-9b11-42fc04955d7a} - {1a109663-9a4b-4adc-bb1e-423ac3fb5a66} + {4931b059-fb64-474a-bd7e-975790e19619} - {06bee921-505c-473d-bb24-a20aa1823fe9} + {75824cba-ebbc-49f0-b362-68ac86d98ba6} - {efe51571-845a-4abf-8a71-f09d30a2f255} + {4fb9fa0c-b343-4e4c-9fbe-3fa56ab46fcb} - {79b65439-715d-413b-8100-31427b17c001} + {74e46980-2da7-4e85-9221-9f773c914563} - {c79e8cb1-fa81-4413-814a-f9ddf38644bb} + {1ef17989-c760-4d27-87fd-719f6030ec38} - {9764bc3d-6b0e-4251-8576-0e1e1c8b9202} + {1f813fdf-bc69-4508-ade2-7cf0821ef6be} - {56990f26-f7a6-4df6-86d5-362c1be25edd} + {37ba9d6e-e631-4238-b37c-7a2dc1867f07} - {dc1c0f8d-8a6f-45eb-9d0b-3fdcec45eff0} + {87690fbc-94b1-467a-9522-0b032d7c21c7} - {9fdbe9db-ff51-4596-a697-ed72de0fd93e} + {9483f5f5-80d2-4e8d-9761-f14288787fb9} - {157816af-f39a-4b01-a505-514028843824} + {f01295c8-42bd-4809-84aa-23a72a4f0ac4} - {0f23d497-076f-4831-b512-e83a1dee5187} + {7fb57ff4-afaa-4428-aa9b-592823ada736} - {365a750b-0829-4dd8-ac13-0f955d0dc2ff} + {3c55b62e-f6ac-452b-9624-b9cb14021050} - {7d2a776a-96b4-44f0-b411-c01b6992b4f9} + {be955910-9e38-4e7d-b8e8-815d3c054d8c} - {ff9cc406-a7ac-4878-a016-9d99267349d3} + {5526b542-c6b5-43b5-ad72-e23408a04824} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj index 3d954ca81..85e68c8ac 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -29,6 +29,7 @@ + @@ -135,7 +136,6 @@ - diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 1eee21454..3dd39126b 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {4319da27-a179-45a8-b0a2-24ad48c2b923} + {c101483d-29b5-4df5-9751-5f444bc05c8b} - {7020ba49-3ba5-4533-a592-2a2a07632691} + {39cba189-955b-4b2a-9b3c-cc62c1527402} - {13e56b8d-9ec8-47f3-a65e-9e16b09c2617} + {d31e64f7-33f6-4c9c-9d76-c50c756c225f} - {bcfe2831-18ca-42bd-8f82-ebc5beee1bc6} + {e43fdeff-64e8-459c-b5ac-4a7586732ad2} - {a93f6d58-9faa-440a-9d61-781c64d01600} + {37ab5c51-0369-4a13-b5a4-ecdb2647086c} - {1a8df5b5-4f41-40ff-b72a-2f97a553dc7c} + {a8287ac0-f57f-4493-8fef-d54fcc117142} - {1336b5cb-333e-4e74-9f39-7aef3da498cc} + {1c765247-3081-4e1b-b963-23b825050f80} - {184e6b5e-456d-44ac-8f74-3fe904a39d87} + {5e6cbbe9-f213-433e-bec3-0b34db8a2ab2} - {8a8db9aa-0d83-4144-9147-0618a5ee11c5} + {b9ef71ac-6389-452c-bca8-e26532faa213} - {0672e8e1-8ac2-43c2-bd1a-559d83a58ebc} + {0fe222c1-ce47-48b1-a441-a378fae806d4} - {47892879-69b9-4316-b979-2fc3a00407e5} + {ea93c694-d458-4f36-9249-7c1fa72bdaa6} - {1a49faa8-31b3-44e9-83cd-b51ab6254a9e} + {4a2db124-8fbf-43b4-9765-115b4fb15672} - {e601123b-d236-4012-95a5-b29b7ebc16a8} + {91961e60-c568-45c8-a447-a605ad326018} - {71566cef-644b-4523-823d-e439604a3d5f} + {9341d217-89d6-400d-a35e-a5fb261d30d7} - {e13e148a-465e-4609-bdaa-5dc769570639} + {f8c2e231-1687-42eb-87d5-c1fa232dded5} - {b9cb7e00-56d0-41b3-abb5-1f6d567cb64f} + {083a2ff3-1786-4012-9100-549765a4b164} - {d7de7eec-e38c-408f-92a7-857a52131e48} + {fc8e92df-7c65-4ccb-9eca-bd5a48bfdcc2} - {0e5f0580-2bc1-4812-86f8-b7e04580acad} + {95a74205-b5ca-4a9d-b7f9-0830ff4f23fc} - {cf4fb829-f053-4a14-9d40-2ce6822ffadb} + {4bf8acd2-a38f-43aa-83e0-5ae87900b7fc} - {7eaa7f59-95e1-4604-ba7a-26680ec5a6b2} + {736f4bf9-c34e-4653-8487-0892c6cb0095} - {e35f9831-a111-4506-af74-714b3bc814ee} + {1c3902e6-22bc-43e9-9dbb-418b228e9fb8} - {e31c51d5-6708-480d-8c7c-054e535709c4} + {f0c100d2-fab2-4fe3-aa74-3f6b0f75ceb8} - {875758c4-4ba4-49a6-8b95-91896734d262} + {14e6c276-0e7d-458e-816b-ce93e7c7bf9d} - {f58b7962-deca-4eef-b555-0fbb58bfb018} + {8ca4ba15-bb15-427a-8d54-33005312357d} - {e217e2fb-0495-41a9-bf17-3d9dd4309462} + {757fbaa6-e5b6-45df-b3e2-378825bd7822} - {6ce0b2be-9173-48fe-8daa-6e2bf4c7121c} + {1d6025ea-5329-4189-8058-7abe38fb0ff0} - {552a364b-a8e8-46ec-bff9-8bfcb0fbdce6} + {dc65f477-087c-4331-a41e-aa9183884930} - {5cf6a092-2ebe-4e89-94b1-fd54db7f739e} + {b109aa4b-56ff-4955-a3be-10568005f5d1} - {0827ea48-4027-4ebd-ae31-f874d5c6ae98} + {86a784b6-8587-4dcf-8651-5d6cc7410e80} - {faedf63e-06e1-4409-be73-ef446ad2b0dd} + {9180ee72-6fa9-4cf6-aa92-7ed317b0f5ef} - {9af204ef-8afe-4382-aba4-a57b237eef03} + {53e1a8b0-8cbc-456f-adcf-1293552c4ede} - {f490b4de-1970-4b1e-b83f-561e3cae0c13} + {4d0cc963-23b9-4512-b59e-e15b983bb2bf} - {5cc83c03-3bf7-495a-845b-800d3639abb6} + {de66db5e-80be-456f-8745-4a2b66cb850b} - {6538207d-0600-41cc-b833-2c7d19e226af} + {0cb6f97a-20a9-4628-96e3-251b191c2541} - {adc27956-62d3-4191-95a1-8f6db6e6eb6b} + {b7891d04-31c0-4060-89e7-c719a83ab020} - {c5850ec2-e162-42e9-8eb0-c5e2c3a79b89} + {9d85b0da-73ef-43ed-bfe3-70000ecd6686} - {75d61a6b-f076-4f2e-adf5-44ec70b1325d} + {b8db9256-510e-4b2b-97e3-fdf42218da99} - {f0e7bc6b-d4f8-452e-87fb-596bd6677960} + {c365a04c-66c7-4508-a52e-e47298cab2eb} - {4701a462-5ec7-43de-ad56-458568570be9} + {59d99c90-0cd4-4cc0-a5f4-efcc4b554ea1} - {e4c72f98-e36b-446c-8a8c-8a67e0c49186} + {da7b678f-4a7f-4f04-b904-6aebd5374529} - {4e8577b1-30ca-401e-a06a-80a7d6c98b1c} + {6a2390b2-48d8-462f-82ea-908b1c3a7e2e} - {3d722657-b68f-49b0-ac1a-61c963c9ef37} + {c1be6927-088b-4c47-9199-8da2e2ff3b7e} - {d655898f-c5f1-4cb2-969a-8af35f7141f6} + {4d648343-2d37-43c8-a754-5550e940ac40} - {0de775b4-7d2f-4414-a4a7-4d53cc590309} + {c14a1f94-bad2-4741-a8e1-73018c4cda8c} - {ff039c07-fc80-416c-a9bd-14ff69fae10c} + {152720e3-64a3-4509-999b-09024187d6e3} - {b56d6651-8e4c-42ec-b058-571ac47e17dd} + {311d4fc9-c665-4726-8f0e-0839ad44823c} - {ccda8bbc-8814-4b1f-9f48-0e1118605f18} + {ee50f946-8c70-436c-a039-5412bf0dd704} - {81acff56-c04b-40a5-8858-2bbf8c4122ac} + {4fc8b1a9-ba37-4e83-a129-1a5c2927e67a} - {ef063f36-b3d3-427c-b6b4-64ead3db88df} + {6037f16e-fc3e-423a-a138-4c4f23fdb40a} - {0b71a208-9326-44d6-935e-3138f0d636f8} + {cc61e22e-5d11-46bf-bd56-7d6f17b13a40} - {bc83ed37-f99b-414f-97d9-883b99c99098} + {346d2828-e1a9-409e-a9af-def31c46e9a0} - {3f755740-ad64-4be6-8f96-4530936c350e} + {159b9f1e-2ef1-428d-93c1-9ef8ccc494bc} - {d8d34785-9f5e-431b-8438-3694134ecb58} + {eaf601c9-2e67-48d0-b028-dc2cf144c83a} - {b789e36a-e729-4b17-a4fe-2901b7f93193} + {488b872a-55b2-427a-b99d-9bcc38624221} - {cc0c88bb-fba7-4521-a3f7-3730b507b087} + {bc23fc3b-1851-4853-928b-aa93b396d193} - {bed96ea8-5a51-4a8f-a6ce-5654db21f634} + {c0b92abc-5654-4325-803f-23a1e6433be9} - {2c2937d6-e5c1-4fb2-b718-e7d46d50535c} + {130a4cf7-c909-443a-aa7b-880d52a48d02} - {9b0d8fce-25d6-49c2-a1c7-e021bc333e4e} + {3049d550-7087-4206-9cba-21d6d3e48550} - {4c13ba95-ea9f-4aca-8ea9-a66f1946d310} + {c2746350-17b8-457b-8858-d46d411c3c02} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj index b77fcb5c5..c85153991 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -421,7 +421,7 @@ - + diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters index d6c41420f..914e7c4d8 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {ccba9599-38ba-424a-bf95-cfa6c2099709} + {64243182-13e5-4d49-8d85-f155a80b8efa} - {88dd1cf8-acc3-4ff0-ae18-186a9e8a9769} + {cd9814d7-9138-42bd-ad1e-0a83b8e0de93} - {5652c581-813c-4b82-9fae-1fd3966a418d} + {06c936ab-9172-484f-8447-42a9d997eae1} - {9c461eed-0555-4d34-bd39-49780739c072} + {239a55df-d260-4dc6-96ee-12f397d0b455} - {28cdc6c8-ade3-4e55-93a2-9ee7f02e843e} + {097e4e49-2959-4da6-9f3a-19f13901f290} - {35b7ade2-5f0d-44da-8d6c-78d6ca8edf7c} + {322da607-ce86-4f68-b273-85f87f368a1d} - {522a6139-dcfa-42aa-a3a1-204078270595} + {dce127f7-cd20-404a-9fd3-2f30e5b89484} - {1a0a0300-c58f-439e-b049-84b7bd9d7fe1} + {8a52036a-6529-4a17-a46b-40d6a4d69715} - {ff018358-3f57-4219-bb13-5fe90ba48dba} + {7d64be28-19ef-4e51-b5cc-3ebda09cd491} - {50f462c5-22a6-4123-af7d-d0356c3f0862} + {eef22837-2bad-4f34-b445-bdb3dfacd41c} - {e3d2c15a-ac2d-4e5e-aef9-1b8b75905e59} + {41370af8-d4ce-46a3-ac96-004ebdffe80a} - {59fbfbb7-741b-43ca-8672-64db9a0ad5d9} + {f8ea5f7e-8903-4bd9-a46a-9521615baf72} - {55ea4b78-bed7-476b-af4d-9331628fe2f6} + {bee3b694-9189-48db-adf8-728a746cfdff} - {0e4a5448-1536-4f1c-b870-fc7dffc3b9a4} + {845d0292-fc10-407e-bcbd-f5ec180481ef} - {b631a06a-8f77-4f7c-b794-23c66c142ce4} + {49bfa4d5-a7f7-4148-a078-6459574b8e01} - {31e8e73a-949e-4407-b600-5e091d453652} + {89d2cf4c-67fb-41af-a8e9-e9124938752c} - {b9569327-33eb-40f9-864e-aee4af068a9e} + {18feca52-f134-49c5-9dae-79ba79470e3c} - {afe2a3bf-fb7e-4640-a123-67f86d79509b} + {dee0fe9d-ce5a-4b87-885c-4b63e03bcb9c} - {cc6f81c2-c11d-40ca-9e25-e9c0f1e7a50b} + {81ec9ee1-7d8f-432d-af47-54d185a96db6} - {86f6ff5f-8f55-4260-a904-901edc1362dd} + {cd895049-e2a5-44e2-bce0-1af6c5b49032} - {253f39a0-9edc-4d72-8768-7d659124077b} + {2a96c8c3-f8a1-4fe5-9ad3-9b0636992916} - {650431ff-f1aa-42cf-9f43-b8722432ba98} + {6301907b-a3c9-42dc-9385-7d633594e815} - {efcc4542-73c0-42a5-b317-91c081252bfb} + {c8627d0d-6d3f-4191-ad3b-6f217435609d} - {325f551c-4984-46e1-947b-ca39a12cedf4} + {d29ca663-6f6f-4e5d-b50f-30659ee459ce} - {a5f85587-e473-4f15-800a-380e9fcb65f5} + {77a8ed66-5274-4d4a-8a0b-333380c90229} - {13c2b87c-75b2-4b66-aead-043e80a08ef7} + {435f14cc-2408-4526-a9d2-0bb608a30b16} - {8d52a7d4-8f98-4470-844f-4480372ea6e1} + {8f5c2789-5426-4a28-9673-1a6d4f688651} - {0f892ee0-1614-44a5-b2c2-f640b88f4884} + {f4a17573-8cb4-4d43-a256-232f1647d26c} - {1ac95b32-eddd-492f-831e-f9187f6a67c1} + {1aec9366-00b1-4e00-b711-5ec3e5ae01f3} - {300c758f-10b4-4f24-b6f3-37b97ed96b10} + {c0045c73-c061-4799-86d8-ad9bec92f1f3} - {ae2c524f-9313-4994-9dc5-8ab6f9b671ed} + {62e14ab6-fd06-48e8-80e5-ddf60f42a91f} - {0614b2a5-142f-45e5-95f7-7ecda533ce83} + {48b85c66-e6fc-4935-91cf-f5bf3fc0dbdf} - {c40b3746-3942-4842-a5d3-dfc31d479437} + {1b9002c0-226b-41c6-95df-bbd20f514591} - {753dbff3-7446-4160-8b9c-2693cf9b9e64} + {425fab1f-e271-461c-ba79-caf75e6f931d} - {9b33e4dc-bb62-43ad-8d71-086a03b4cbb6} + {738fcf69-f47c-46da-8c47-f845a48afd5b} - {5845fa95-edc3-4f9c-b619-072911155b7b} + {4ab7cf03-2e79-42b3-b77d-a760f130ce62} - {4759dc5a-6b4d-475b-8921-13ea1880f666} + {fd0580f7-dbc1-4c29-8d60-bfcd242eb89e} - {1e7261ff-c389-42fa-a88e-a1377198d499} + {570a66f8-f3b0-4786-b8e2-60c3b60232a3} - {76bd5aa8-aa14-4d9a-a8b0-7ab6069a77b7} + {4f17e60a-a8a7-4530-aa8e-5df8906825a4} - {5a3ebecb-3d61-4f72-89f1-aa25c986ad0b} + {282ff7ea-3c35-47f5-8b9b-5f2bbfa73b32} - {5cfb6770-219f-415c-a3d1-898be558a6b7} + {59b3fdcb-6de5-4e9c-a5d0-f2b3e8ccde08} - {cb784728-2e90-4edd-bf97-881d9464c25a} + {710f3acb-1576-4b59-a28f-905cc21d92a0} - {ff9506d0-0786-42a0-bef8-ea5dd6b42184} + {f823bb5e-762f-4a9e-851f-358a5c811532} - {dd584317-152c-449b-ad63-a782b428f179} + {acacd35d-f46d-430a-b555-3db4c77e6c92} - {4d5f3618-366f-4552-a4aa-687f2f9b2055} + {c417ddf5-2352-4aa4-af10-f49298458f30} - {b3b07f3b-027c-417d-8408-2c1d9beb1447} + {07c14b80-ee4c-48d1-8e9b-ecff5a870da4} - {c712f026-34ce-4e40-896b-cfef7dd458f0} + {f88eaadf-8eda-40e4-b924-3fff5b6916cb} - {dba2dc1a-2ebd-430a-8056-48ef47ada8c0} + {ae49134a-9c12-485a-bd5b-a77d636ca049} - {4b950b6a-01ae-43ad-8d68-e8e697564af4} + {0643f605-aa07-4667-96d2-da53aed0299d} - {a8e32e91-45f7-469a-b8ee-77d4fdac1f16} + {5650fd8f-d624-40a6-85fd-b66ae5eac8cf} - {d5e46218-36dc-4bba-b253-35562ff544f1} + {b3ebb5ce-cf85-4607-8717-e1a14440e3ed} - {1bc5c285-5814-47ac-a3dd-81fa1e686bed} + {62e4e13f-fd1f-463f-a058-b904e09fe5ef} - {53b1052d-0762-4d0e-8850-f3733588024a} + {8b8d7fe8-9d1b-489b-ade7-dc42bd727c50} - {820e2949-2ff8-40fa-823a-32cb8801f8ed} + {17fc173e-4ac3-4ed3-b461-3148391c62f0} - {b9f91d3f-edcf-452a-b741-00c7235f97c7} + {dd495fbd-7ec4-4606-b608-5d08b1a144d6} - {a2a4d1b5-497a-449d-a988-3c62382feac9} + {67874b28-1c33-4c64-a9b0-2a561e59228b} - {204a7927-4b20-4d0b-b500-f6805ce50d2b} + {6ab69ee4-3bd5-4945-b6ef-9b602b763755} - {e30fde0a-6061-48bf-bb90-acc882876d67} + {eca5767f-66fa-4b17-b68c-2cdfe7034ef1} - {f6089c2f-b556-46b8-a4a8-0d8cf4cbf6b3} + {d0f6af29-1a33-4299-85ec-2a6c5e1d5887} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj index d1db74e2c..ff39cd2cb 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -421,7 +421,7 @@ - + diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters index f50ba58b7..e15920c33 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {2cf9337b-668f-4977-af8c-aad7a2e97445} + {d3811182-5aac-42fd-a801-84841c2df51b} - {4d79bb49-d59c-4d9e-99db-5a729204854a} + {49befa7a-2131-4c24-a78a-c550d9c82eff} - {9e9c62af-6ab3-46cf-93ae-eb8e8d98d860} + {120d7663-cec6-4a34-bc37-8aec65dd92fb} - {1e68bbbb-4daf-4e67-9a92-18688a0b0763} + {ac0a2b31-d4e1-4c12-9a80-bfd5d4628706} - {808c4512-3b5a-415c-8391-49d5f96d8d39} + {270e9a44-5b1f-48b2-8f8e-c7eaf81d09aa} - {00799054-8c6f-475f-b4e2-dfcaf2cd2308} + {7214574b-304f-4f54-a209-515893e7afc8} - {f2e1c327-d2f5-4f6b-96dd-5742e1c547cd} + {7c2da74d-91fa-4368-afe1-43daed77b116} - {5064861d-6be7-4c7d-9768-62a9b77ff779} + {9e154dcd-ac2b-4929-beef-e4a7d48908fb} - {cd0867fa-74be-4ffb-8bf6-d2bb40d87c8d} + {88fc6da2-331a-4a74-b2af-81d1bfd2c762} - {d166bf4b-f6e0-4af1-afe7-f5b12f01bec7} + {54c51c91-e8ba-4915-a38b-816c6a5d1d01} - {e4dfa321-251e-4df3-9dd1-4fdf183f0d76} + {18623bc3-e7f6-4e6b-a2ff-db3d87cfe85f} - {1b0b610f-7dc5-42d8-8ecc-7055d834a22c} + {69edcaff-abe0-4f04-a4d2-9c075b82d19e} - {dcd94bb8-0907-4ba0-8809-eae4134578a8} + {ad208ce1-32f6-40aa-a2ed-3bd20857313f} - {481a51c9-4787-4193-96bc-a83825889ed7} + {e5f4e9b0-79df-4854-9e57-3c6e1ace0813} - {503ea4d6-1883-4803-9ca2-538d1da50c43} + {61e855e5-e762-44cc-846e-49faaf86c70e} - {420bed72-2bf5-4905-9d8b-97f896f66b6f} + {984890c4-2e0f-4cee-9a0f-d7e9a639a085} - {b143369c-cb1b-4c92-adce-b5982f16150c} + {6c729910-76f8-4e6a-9576-db58c3c05661} - {885e60a7-1695-419e-b511-e77a4ba951de} + {4e7b005a-2648-4da3-8b56-662c1e2cb23d} - {660b08df-505e-4802-b572-29d7c64cb9b5} + {77cf0368-c717-47f7-838f-80a2e724ce22} - {c60b69e1-156c-4182-9503-2b11c920bede} + {75de42fb-7b20-4cea-9b01-f71f4371b328} - {d2641755-8720-406a-90a7-188eff327833} + {0ff8410b-c425-4b92-8da5-758c17c62555} - {ca4104e9-8b99-4cab-862e-bc5b17356dfc} + {2e3d92c0-4b03-48f5-9db3-595d7f43222c} - {ae85c0de-71de-49dc-8f02-4a19d8e749b9} + {9c6b1ae6-bb54-4f41-b344-3e44fd542946} - {9d6bfcb5-863e-4ba1-b4c8-20a8a346c35d} + {38382d3c-d61d-4d5c-b935-3988c3d658cd} - {ef153f30-b26d-48a4-ba41-30f107d5c004} + {56e394bf-91c7-4ccf-9666-b25428a1a73e} - {54cc18b9-75cd-4f03-ac07-3a53306a9a58} + {b3823ebb-8da8-43c3-ace0-e3a4ef73e818} - {86600a02-3b0d-4edc-b65d-c43bc9a4af14} + {22279583-a325-48ea-bdb7-c263adcd75a1} - {6c3590f4-e1d5-44e2-9539-a6be326b2793} + {43b98517-47d9-41a3-af9e-102117550ec9} - {4e273558-294a-4cbe-bd59-f90ba6fdfb47} + {1f55b5c3-bfef-4979-9090-f1a8e9785c7a} - {7b522517-ff59-45b3-817f-f23f95940f0c} + {19b4fe53-affd-4e71-91c9-894a3e595100} - {d25c0545-c67d-4660-8a4b-39de1cb9a7db} + {797a14c1-6ce9-4547-a7ac-74d0c48388dc} - {0f4c30b6-8676-4d88-90ce-4e87cd2e3af8} + {97b66a71-ab34-4947-9748-2703c30d9f6d} - {b52d253d-bd98-4e91-857b-44e86c3fb857} + {e70bb686-39af-4e89-8a6f-250a15a0ad22} - {7958c81e-7f5b-4b8e-b73e-2eecf5e1c30a} + {32535b3a-d499-4d3d-b96f-ed6c86d3f6fc} - {75361555-298f-4ae1-ab6c-6dee48718edc} + {d274e078-3dfb-4e99-8ffa-eee70d4bcf72} - {e3ec7e50-590e-4e44-90d8-b35c70361973} + {8f7f5e5d-e327-419f-9e6b-9e61f8add4df} - {fff85e2a-336a-4de3-8150-56d93b7307ce} + {3b43a601-c237-40f4-a367-966fa288cc44} - {07ecb369-770d-4719-9f6a-641616a2a864} + {2ca2eb4d-307a-4ecf-9b40-0bbfd58a2c29} - {39931aad-43fd-4090-bb2d-06847f9990f5} + {c5a69fda-acef-4416-8525-4a5693055bc6} - {02f1058b-f890-4239-934a-03ff2eb62f3c} + {d6500df3-63cb-4e4a-806c-3b1b0420280d} - {c6897fae-dee9-4e6b-9036-f6b0606c0f44} + {f2346e59-f47d-4448-befa-5999a7d469b9} - {9c57f18c-07d0-4d7a-904f-0870d5dc9ae6} + {7572fda5-b8db-415b-adaa-230cde24e713} - {20fc5f3f-8f58-4845-b722-b9add44232eb} + {d09f2db1-405a-425f-9b1c-05fabbd667ce} - {1a967571-fea9-4003-9765-c9cc66a34477} + {52e8cfa5-1a02-4cee-af4b-dc8e6a7ed045} - {19fff319-49dd-447c-a344-1070dfb9932d} + {bcc19506-deab-4406-9e46-50a979cb90d0} - {904a05bc-c8a5-4a3f-9ecc-5a5c821e3355} + {2d1115a9-89b4-4cae-9c55-bfb3e0caaf44} - {040a9a58-aa01-4d2a-8fa6-6fc6d67966dd} + {9e42bd3d-9c5e-40b8-b74a-338a46bae704} - {532f72f5-7716-4cb8-876f-98bce8b30bfe} + {08e9db47-3e86-4dc5-86d3-1a560376bf3e} - {c90303dd-d40d-49f5-863b-abaf34774333} + {6ef60503-9cbc-4b12-930b-5e3066623b3f} - {4116f1af-ee37-40a5-b396-7b4441f6292f} + {0460f319-4b2d-4636-9caa-5b2debb1d147} - {367dc360-3dcb-4e27-a0a1-16e14b3ed4e2} + {6101a1ac-294e-4914-b965-724911827fc3} - {b7726a85-4dc7-40c1-a753-1b155d98914c} + {ad805cda-8225-4599-8c2d-6a9a1fe63130} - {9c914d4d-6b7e-42b1-ac02-5fba74b15cbf} + {2050b2dd-c208-42bf-bb84-82db27958da1} - {d77b0e78-f575-4cf4-897d-96963989a1ea} + {ede015a0-e0e4-401e-8888-489439d3af5b} - {b4b03897-ce38-4669-b6ed-aa4d83901571} + {7f701832-eff5-41a4-860e-babac7a9ff45} - {893fff3f-954f-4f7f-81fe-3e11e0d49a05} + {9a083e00-5360-4fbf-9c36-f6370e2957fa} - {55e70d97-68dc-4414-b282-057745a6d3fd} + {a0d7018f-7b0c-48ad-b110-91b6cdfd8339} - {ec0de39b-5cf8-4978-b01e-de7e29ad2af9} + {49694cce-9502-4366-bf2e-70d027e10474} - {0cce3a4d-008b-477a-a415-f895cf42445f} + {28c72147-cb61-4221-adad-d9b485b7d113} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj b/Foundation/testsuite/TestSuite_vs120.vcxproj index 6186723e0..88a9f99b7 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters index 5fb384707..afb4b6beb 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {067a63d8-c32b-4334-a1bd-e779e8353fe1} + {0a1f3d58-f5dc-45c5-9497-4a48873f6203} - {75728e90-6408-438a-a838-5cc35cd7a786} + {7ba50222-a0f4-4679-8954-65278f61f7f3} - {02de0f74-566b-4a65-bc65-4e4ec5e144a2} + {f4d6166b-e4a4-41ae-9416-a01dea80781c} - {0401ebd2-951c-4628-af47-2b01f2b87efe} + {f15dd775-2bd9-43cc-a53f-a8749d15360a} - {53671af1-2368-4930-8b0b-74791fa40480} + {03a36a8d-e525-4cd6-9d44-4874f7ea8630} - {fb3d2ec9-39b1-4a76-8338-e4ee30e1df4a} + {dd4d9c40-c630-47f4-b9b8-e94337ed1272} - {5c4fee5e-3779-4646-94f7-c70bd5744de0} + {bbe2dbbf-61c6-4fc5-941d-16b430ce03ed} - {b10ab55d-1b02-443c-85a4-c70c4de45234} + {1f5a03dc-ad5b-4780-8601-27dc76bb649d} - {5f44bf6f-e568-46d8-8959-8d0761387c40} + {cd9dadba-04a7-40df-bd2c-2d0854d67736} - {3ae94df8-216a-413d-a211-34f301afc470} + {da4ed5d5-fae1-4fa3-9350-d50dde6276c9} - {52d5cd01-9b93-4f3c-bb01-2de18e5f419c} + {d3b48d28-8ae8-49e9-b14f-e2e44d6aecfb} - {1aa48d0e-928c-4a7c-a570-e70a83c48038} + {37b2bee1-c954-438f-9897-86e05318d284} - {8f55dccb-a0e0-4e22-9a25-7355df2e45eb} + {b560ad37-5e1f-49a8-b380-42fed1a618a3} - {46cf17ac-4d95-475a-adee-7ce19e588579} + {0e709e9f-5b9b-4387-892d-22b4f15221a0} - {6280ae6b-caa3-4360-95d6-b716d992bc97} + {4442f0a6-8e47-4d86-b312-a96a45d45f9a} - {b6019a0a-eb3e-4a9f-bf08-d28139857018} + {5b77a06c-1e45-4d3e-9a71-76d78c1f5627} - {27450a08-9ad8-405b-91f4-e89e9b57cdab} + {5dc89e53-f2d7-4696-bc05-68b2f35220d1} - {00e15fd6-c247-4aee-a9f2-c51f0ef14d17} + {a9ed2872-19bd-49a2-b4eb-417d7f504898} - {5fe96c91-5ad1-477b-88d2-778aeba9228b} + {e89ad3b3-fffe-42f7-98ca-f7b3a4d23d96} - {5bcb0d82-9ecb-40de-aa30-9a7d8e318f38} + {b12e727d-d0ec-4779-9a94-d050fd98e3ce} - {6c62ff27-5d50-412d-9a3a-895b1a39b43a} + {8eb86132-af76-4b92-ab73-230ad32d94e3} - {d05479a7-051b-4f50-8fc9-47e57708893b} + {6612bdb7-0e4d-4056-ada6-fcfc9b2dc3c9} - {4cb12716-f7e8-4833-a1c2-78ae5f162d63} + {0b69f933-eb54-4d6d-aca8-129bd18b9571} - {339be982-d937-4d86-b803-eb970668e4c0} + {5e593fa9-c7ad-4316-ac9a-90b67694c2b5} - {6e1f3048-9aa6-429a-8f95-1f3ac354b2b8} + {64825823-9e55-41e1-b847-fc3df6e344ae} - {aeba9595-ef9f-49b5-807c-b9b148dfc012} + {38416cf3-a9a7-4116-9df9-80e5959ea465} - {bb182b46-aac5-42cb-8ab1-9216827af7f7} + {13280882-740e-4225-89a4-b6e74e048cc9} - {af4b174b-11cb-4a19-8ef5-cd8720a207e8} + {449b40d7-18c2-405d-8706-d55b021e8d90} - {a24e2731-9037-4f85-96d8-4ce668452de8} + {c942022b-27e2-4986-919e-1e4d1a59c345} - {c2464f07-678a-41ff-a870-7371c4b793a5} + {e8016a68-a509-4baa-98a9-6f0176b4c1f1} - {e7f75857-b5a8-4077-8f1c-28f4df87b40c} + {1e961483-f373-44b7-9c56-b6a22cc21898} - {ddbe206e-bb39-40f2-b252-b304536f465c} + {d5876e5a-ea2b-48ab-abb8-f04a62b94a44} - {2a10a2e1-5021-4483-ad34-cd872fc0380d} + {2c59dd03-3ec1-4ca1-980a-acf7c1d2c38f} - {2b1c528d-4ec1-47f0-a227-34d90eb04a9c} + {44766935-edf4-40fc-bebb-c1d09f5f4a89} - {f3a9a59f-d0c1-46ac-b577-296b72e43aa8} + {c7be408b-a92f-41b6-9cbd-7736d3d16a49} - {b1ab7dd6-69f3-4e3c-bbd8-4acf18d65120} + {7526dafb-75ac-4b9a-acb3-df9a408a3636} - {8b9ad123-82bd-4162-afe2-e7a96034acec} + {3622f1f5-f0c9-47f4-b163-6e2179a2d3b2} - {618e61fb-6c7d-42b2-b575-a8e1353e21c8} + {3ca44f26-0701-43b7-a339-ec12214077a9} - {4ade8c94-ea80-4ba9-ab81-d8d3a853e42a} + {c702836b-1c6c-4b89-8e6c-138fd3283c7f} - {08048b4d-9c7d-4a27-8cd4-808fde8213ba} + {40c838e1-0ae2-4adc-8677-536228456a09} - {730d25b8-ddd2-4d4d-8bdd-020564951322} + {dd9f36db-88c7-4b34-b2ed-2183050f9083} - {634cb46b-16be-4043-9ebd-db3f556bf832} + {04682295-ce33-4292-9991-ab8debcd83ff} - {b91d8a4d-d07f-465a-9da2-0f4aa57bafeb} + {fb9ca310-be35-46af-89c5-c2a2445e7632} - {74b69ac2-c19d-4402-b5ee-1a278245ff60} + {b53dc06f-365a-4016-b6f2-685fda95dcba} - {fed2de12-d240-4078-8b2d-ab3acfa1a39c} + {1bdeaa00-02bf-4c4c-aff9-baab9d197998} - {a3c8ed2a-bbe3-4562-8d7f-bbea03dd6bd5} + {b0ce17da-ec4d-4119-9bc1-9c077f0e153e} - {b2337157-389d-436a-a3f1-48b581f9e156} + {f97b2051-8dc5-40de-acfc-b0dbd21acde0} - {a29147ea-2942-4741-a7f8-0d326f3f89d9} + {9d4f9a05-3ac2-4dd3-b7f2-43619cc97051} - {143529a1-5f29-4998-8aa3-aae020e863ec} + {3f93214b-bcc4-487b-af32-65d2a30f9633} - {3fc13c81-e3be-4d49-be19-509db35213ba} + {cc1c6506-54e3-46fd-b1e2-4935b4e3b16c} - {5d509913-2b1a-4e6c-8415-475a4f36bd97} + {fa5d17e7-3871-4048-a668-1f3b8d588278} - {1ae9f1e5-b0f7-4aa8-96ab-08fd75e3adbf} + {fe769d9b-f3b0-44b7-91f0-fab1d46f9dff} - {8fff954b-05a4-4df7-8093-df4e6c39c118} + {9d5f9976-9a2a-4edc-85e6-7f7449e5f2a4} - {e9b0ae31-b8c1-4fa6-959c-016c7abc0c8d} + {928a24a1-0e7e-4098-97eb-e4ee5012a1b5} - {b374efdf-778e-4661-b43e-e0f5460a54a8} + {8944a75c-a1e4-4b03-b27d-56a5095329c4} - {ac94d7a6-d8a3-45c6-9355-d85a7ef4c467} + {13fc83bc-de9d-4a22-9d06-f999f2756262} - {9194c34f-4f55-4db5-a1cc-3f55dc1ef204} + {5a48129c-31b2-4194-b6fa-02ce22431521} - {c837ca84-5ba4-4847-b6f2-b9b196587fcc} + {502fd4c9-68c9-46fc-b8b4-cefe0471d3ac} - {65530ea8-0f1a-4c56-be09-a759c2ba9ba3} + {86d41af9-508f-42ab-b820-2780da6cd5f7} diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj b/Foundation/testsuite/TestSuite_vs140.vcxproj index e2c72f96a..2facbd828 100644 --- a/Foundation/testsuite/TestSuite_vs140.vcxproj +++ b/Foundation/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters index fe3434d62..1f1eae81f 100644 --- a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {aa50c55f-0127-4025-8428-03022e69ddbd} + {b506bef7-a643-42d5-9fb1-52137f46deec} - {db49db2a-a6e9-417d-be73-414649e4b341} + {99e8141a-07db-4528-959c-12b8624d4172} - {d762fb72-b1eb-4d62-a767-bea4cd541c3d} + {fa6efab0-e265-4b50-a118-ef600ea2ffcd} - {55f03808-cdc2-4626-8e23-5aabe2e523a6} + {7dc55c74-8a1f-454a-bf8f-76d725b726dd} - {bea7c8a8-e5cd-4aed-be95-cae3a621444b} + {6bb00ad5-910b-427c-b90e-07f967b10d74} - {42a33951-1c75-40a4-9b20-afd589aec6f3} + {fdc274b2-c052-48a7-8b0d-2c47b7a8d1c5} - {c272812d-ce9f-4611-ab6f-888fc4209ca5} + {692ef541-4e6d-4740-8658-93b169b7fa3d} - {086aa867-b077-4ae3-a8b4-802ef6e4dfdb} + {71a16f3e-83e6-4783-804c-ad88f8bb39c5} - {cad36ec9-cb6d-42af-a6f1-062849fc22a0} + {82a87c17-a04c-456a-8967-893c3dd03ea0} - {f5715293-a804-4054-9162-272cd6ac6ff9} + {d69fbd66-4cef-4bf0-a28c-a3413e0cd89a} - {b21f898b-3595-4d2e-8056-3fabb0db5844} + {4eef756e-66a9-437d-bad7-2a3d3fe1a91b} - {6047705f-1b36-4c2d-a474-ab1e45a7c1c6} + {d852cfd8-3841-47a6-8305-2617e2fcf2b9} - {247763b8-9d12-406c-a8b9-0a8bdae95ecd} + {c037626f-30f4-48ec-befa-fcb41f0c5a8e} - {89674938-b7ac-4f9d-8dcb-8cdcc9b338b7} + {bea1a31f-898c-47e5-8f95-14670beaa93e} - {c0b7c435-dd8f-4e85-a7db-3a0c43793df6} + {e8d7195e-bf6d-4e72-bc3c-016c1b6972ff} - {ec70074a-3100-45c5-9bfe-3927810f2045} + {468f2b15-29cd-43e2-a434-1be911dc6acb} - {e1012d9d-6709-46b4-8587-8324c1978b7b} + {83fc76c1-f457-4704-ac86-39926dae65fa} - {bf1678a6-75ad-4b71-8b40-a25c7139001e} + {68cbc6d8-33b6-4099-85cc-df1b982fe1c7} - {34a8025f-eb21-41cd-819c-c26da6d6e073} + {cc24d583-c6b2-4797-a687-ff2fd253797a} - {65079285-0414-4562-8074-4a6f53e9aa34} + {8c74d653-02e0-43b7-ba55-3a240ce2fe55} - {623aded2-e132-4c03-a696-3d8aaaa54977} + {24b4002f-0ca0-4aa9-a7da-d593bef6df79} - {f348726b-f2aa-4182-a600-9471dfd3846b} + {da1a582d-59b6-436e-8e7f-00837d8d4cd8} - {3232c13a-095f-4868-ad80-0d9564d1c1a1} + {a779ae61-18a2-47d8-9401-99a4c5206b63} - {493e4ec3-62b9-48e6-9433-e447395ca7ff} + {cd76daaf-6a76-4268-bd22-13ce6c07b64c} - {72bb6c92-8b4e-41e1-b468-7b59f19685b4} + {8038e90f-0243-4bca-a74a-c214bbcc482b} - {e6d322cd-ac2d-422d-a9e1-bf259a6203a0} + {10526fb9-22c2-45e1-b567-f08a25a10066} - {e3d1292d-8a0f-43a2-8b2d-3ed5b7495c9b} + {fca673e5-2875-4020-b11c-02ee116df827} - {7632bf98-84e0-4429-8c5b-0c51e8ddcd5a} + {6e1d5620-e9ee-42d8-b5d3-a16316924b85} - {eb4592af-8c04-492d-b10c-b500f773d0f5} + {1137a1ea-ebe5-4dd2-bcea-a1b1a774ae10} - {8266afa0-1846-4a98-a593-5ac31e948ce9} + {7f39f19d-e0af-4d38-a7a6-9934dd9c6c5f} - {fcd690c3-d524-4837-b8ca-11cf477674a1} + {46bda533-0785-441b-9868-3ab1b99fa1d2} - {2f60e508-aebb-4688-9343-a359530365fc} + {9ce5274f-4385-471a-8944-6f1ed7bc4dbd} - {2d158a94-72b5-4d90-9bfe-39e8f2c14419} + {76997b5f-8b30-41f4-b190-cf9cef1da30b} - {3e05ee3b-2723-4e6b-aac9-a94cffe8aabe} + {1bd86da6-704c-4db6-a6ce-02fe8fb08dc0} - {f575aebf-c9d1-45fb-bb72-0566bc7a8ced} + {a3ab620d-df81-4180-a7b3-b7cb15558048} - {7edb93ab-2404-4f12-bca5-1351f6ced2cf} + {973a8717-58fa-48ef-8b64-368e63b37ed7} - {1f8090e1-210f-42c4-bd84-2ad48c8fcea9} + {b3276ff5-0c21-4d16-b7da-e7f88d166cb5} - {c070d49a-abed-4938-8b35-f07326db7a42} + {b959df4e-5cbc-40b2-821f-8d5a3667ddde} - {dd55ee35-7a08-4a84-9524-c1a8315165cb} + {944024a6-75d9-45b0-9d51-b673acda6a52} - {3f0001f8-aad3-431e-b292-f825c2be7dfd} + {b0cef2cb-b130-46f5-8e50-e96cc0af7e73} - {26b41663-a8ab-4509-8ba1-be98410d8a78} + {d9c84ab2-f451-47d3-874d-b4a792100244} - {04c5a1a1-7278-4698-a819-fdf638c5a4fa} + {25b879ef-13c9-468e-ab24-eaa676f720cd} - {4a4550f3-d486-475b-b702-8e3755aa1707} + {c6289add-13a0-4d44-8fc0-cece34551f7c} - {a8e998bb-8f9e-4e89-912a-0d61b885563a} + {8011523a-4687-46b2-815e-9320aeb9dfc6} - {9b831c40-d9b9-4a66-994b-fdbd69f0d587} + {0e122859-de37-48dc-ad30-b6be34421eea} - {c295ee55-e635-481c-ae78-6c7de612659f} + {d3f74b4c-fdff-41a4-a4bd-e60908878e33} - {8db16b3d-6542-4f18-862b-cd6bb230a5f3} + {b3a6fd53-0a24-4160-b8ab-e58592b99ecd} - {395007b6-0d1e-46d8-a1fe-a90bcddbab28} + {0da8c5a8-f71a-4467-a7a3-2f88f2ab7106} - {fa32bc88-8b1e-44b6-be80-edb2d947bf7d} + {cedd303d-3364-43ea-b788-8f76b31937af} - {515027f4-ef9f-4766-82db-2759c08fd4df} + {ed3d0901-7adf-4e1d-8d83-ac55537d6a57} - {604edff8-c198-4660-ae72-a381a4630115} + {e13b28c5-42d5-45a5-9a78-1c57624f6ca5} - {b1f17949-b325-47c0-87d9-7d409845c720} + {2c7a8d6e-4d66-46cb-8185-b196997f838a} - {a764f025-bd0a-446a-86ed-64f2334a6de0} + {64a09b88-5b15-4efc-9f54-d5c11184d76c} - {bba5b3b6-11e7-456b-9669-e2af698b3e7c} + {c281b48c-64d8-4fcc-9856-38de9db7d731} - {48eb1bf7-3fcd-4483-9b18-071fc1ac2d5c} + {4a8cd211-a775-48f3-90db-353ac054c491} - {757edb3a-ab84-4644-992a-1ed0f5f98237} + {cfb341d2-23b9-43e7-be44-53aaaccb842e} - {acb780d0-744a-44fa-8a7d-07d01b426282} + {7acaacce-3ac9-4ee2-b0b1-7490717851d2} - {eb451ece-1eae-463f-83b0-f481f81d7eff} + {fdf038ab-4c24-40b0-8db0-412bb66fafa5} - {abe6f6cb-9377-4a2d-ac99-5fa133b9e8ff} + {0c9d16ad-7a5a-472e-94c7-a17989684baa} diff --git a/Foundation/testsuite/TestSuite_vs150.vcxproj b/Foundation/testsuite/TestSuite_vs150.vcxproj index d30667899..056cea4fa 100644 --- a/Foundation/testsuite/TestSuite_vs150.vcxproj +++ b/Foundation/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters index 3fa14885f..88566ee01 100644 --- a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,181 +2,181 @@ - {dbbaea6f-6691-492f-b4b2-98c5c24cb7d0} + {3793e3d7-5240-403a-bc3c-2129b011b3ce} - {113fc6fe-6d82-483f-8ff4-1e901557fcc0} + {2bbb98b9-3a9d-4ab3-8e8d-8a551d153bd7} - {45fd0fdd-fe4f-4df4-adba-b76a74b91478} + {8aaa8fa4-2a37-4ec1-b332-bdee375f6bb8} - {54589f11-2c45-4cda-ac0c-f7497a85791e} + {70157508-bc70-4321-9333-f9a3418f42fe} - {dc4bcc8c-e4b0-4a6f-b223-42049f48e18d} + {d7f0888e-caf9-43b5-a6db-dcc412414f32} - {606e6890-fa6e-47c3-97a9-b46246a611bc} + {108fdc8d-81f5-4b0d-bb89-2f8964285002} - {6961a28e-d1b6-4a95-81e2-d519c87e30fb} + {1cd76d00-f9fd-40a8-b980-30d70fbcda4e} - {e99cb131-a542-42ad-9849-5128d31ab535} + {570ecc21-dedf-41a1-91e4-2457d16a19e5} - {f896f5f5-ae03-4525-b257-6c30b5579beb} + {e3a0ede0-0f75-4289-9945-81d0a22b1ea5} - {dd5efca4-29bf-4e68-b825-ff94f6b8bfff} + {22db7300-3c9a-46b3-9844-e11064ecc561} - {192a251b-c2a0-4273-af70-89d87250feba} + {303739d2-c19c-45b4-928b-23ded1aa016a} - {084024a9-a046-4a1a-81e9-6a647c4c04e8} + {e6e471b0-51b2-46bb-9adc-2f3bad53e3e6} - {d6a5872f-ad4c-46d3-ad6e-2cbe6234a1d3} + {0659a1ce-e384-447c-a2a3-8f8f1452c2fe} - {873ecf01-e786-42a6-aed5-4f4bc7d676d2} + {4647598d-cc76-4f83-83e4-266f20337762} - {acaef2c5-c0f0-44d3-a31b-98282afeb5c6} + {27cc0789-cce9-45fd-a9c8-c30ac5c49fef} - {483af726-ed54-4073-87cc-f59fc365aa10} + {5d913151-d7d0-43f1-9cba-008b6bdb11ea} - {925fd933-22f6-4df3-8d93-bd9ec9bffe3c} + {4b26cccf-7ef2-42bc-b2b9-3550e7a81dc0} - {ae61dabc-6138-4955-8f87-3ce72e391352} + {1a522d82-ea73-4ac8-8e9f-a4f4baa67a79} - {23a6023b-a4f5-4bae-827b-cb248718618a} + {f5fcb110-19ee-44dc-ad2f-abaeb13c6844} - {7aa72de5-9a1c-43aa-ba33-daf71f2e1618} + {dbbca66d-09fa-4cf9-a9e9-2b33f3f16d1e} - {a446f8e6-d9f0-452d-a653-67010754dbb7} + {e6706e39-212e-4d8a-8745-f188affad19f} - {d88e7c2a-1dc1-4746-a7d6-771e6b6cda6e} + {9fce1db1-e614-4ed6-a189-0ca8ee4c16e9} - {30a0bb2e-1122-4d25-a606-f468a061523c} + {451b4833-6ba0-430d-9516-9998fec7ab63} - {9b4c10c2-2791-4ff1-88ac-ee6c4172181c} + {acf93f99-371a-4e7d-ab14-570741bbfbcd} - {c970e820-302c-4b4b-9385-a05cf3841a68} + {b9cd701d-f66f-415b-acf7-133167476b34} - {e21355ef-2f7a-40b1-96ec-56d99de2eac7} + {9dd16842-e86c-4523-a41a-669bbf187cb5} - {170f14b8-33ed-4fca-915a-3d10675a711c} + {fd739745-8b83-4ff1-bc40-4cbc2f04fb53} - {3099720c-74cb-4f73-8c59-252923649ee9} + {e029a313-3061-4c8b-a968-d7450de9b303} - {f842dffd-00ec-402e-9ceb-be4a69f0f66c} + {1f63a88d-1ad6-47f9-8372-521b486119de} - {426db6ed-2399-4457-a15c-fdf6e3b2748c} + {e9aef273-4db0-40f9-82a9-34d0ca109281} - {0e285cf7-f1ef-4918-9b22-cdb69abbe0e0} + {77720d31-41e5-477e-87da-4448501e3cce} - {c9d9e727-1266-4a37-9e98-b8eae0d0f12e} + {78916e7f-11e4-4b09-b278-ab0f4969379f} - {c86866a0-354d-4534-9660-4c2e2633f192} + {55dcdfe6-df47-42e7-8ad6-2cd9a778c1ff} - {9da008b7-7fed-4c9b-ab80-743d064275f5} + {a9ff0fc9-d1b7-4afe-bc44-02036926e51f} - {cae85d18-880b-4688-9cfe-051781064822} + {af2067ea-83ae-45b7-a90a-5f412814fb01} - {20a54672-ce25-40f6-b3af-ce5faf2fac09} + {01a9fb65-1bb2-4953-949f-54dad30375ee} - {24644e3e-6bd7-4b73-8f02-1edd600661d1} + {4999a905-9021-49f6-95a0-bb96c9c3cfaa} - {e8652ff5-d077-448b-9872-25b5d11eaf5d} + {5d137f52-24ce-4756-a151-5bde26714414} - {39288a18-873f-4c32-ac8e-adae1d8eed41} + {4fa8b1e3-3bb7-4218-8363-50708ce6103a} - {edf331b1-f0b6-4467-956f-deb1d0c5d4b2} + {a49548a4-0df2-4652-ab88-2e3912ecc041} - {d42011c8-3347-4763-b0fe-00f210b8a36d} + {4b24df3e-5680-46e4-8aa8-d61d6a9251e8} - {39d93f1b-d7f2-4ed4-bc8f-6bdce38a6e11} + {2b679529-71b6-4a1c-95e2-0419fe182071} - {58558fb6-7a07-484c-8076-d7e33968769e} + {efd502fa-cd1f-4144-9cf7-2573877b9415} - {e97edf08-571d-4bfc-81b7-c66122377ad6} + {0b6c1dd8-df51-4b22-8804-474ededab513} - {935cd0f3-ebf8-4deb-9fab-eef370bfb64f} + {23c8d4cd-f19c-4014-a2ed-6002c23816c4} - {7c933b9f-ba5e-455b-a115-716fb4883a14} + {bedb3bd4-fcb3-4906-a8e3-10884d30a8ad} - {71a8842a-0930-4575-98fc-17fe9468d87a} + {34ee3e9b-0f33-4328-85b5-550f80a7eba7} - {da2a8170-d2cd-43ae-b605-dcd3333cea91} + {891b28fc-3da9-470b-a857-323abfbbf8a2} - {e683ac19-63dd-484c-9496-d7523e6401e2} + {476d4b98-c393-4391-af80-8bef5832c42d} - {8869325e-dee4-4103-9478-85f7a7b3a757} + {eb044bb7-8547-4265-a0b0-8245413e1dc3} - {c5d237f5-5a6b-4343-8476-da6a1d60eefb} + {2af2655b-594b-4329-b826-02ccc0c504eb} - {b27415ce-092d-478d-94d0-b3ee2a8fc39a} + {abe9dbb0-aa3c-435c-85e8-8ff991b26680} - {8b89b6cd-c0cc-4020-9562-96f0c92e3b98} + {5faa6512-9855-4c2a-8b60-ffd7bb279714} - {61369504-0571-4107-82df-b7ec4d84b739} + {e4140e91-ad5c-462a-a45e-8491486b323a} - {91952255-69fc-44fa-8d49-aa35b76b3b3e} + {7ef1a62f-3019-48b3-af7c-034302d69cbc} - {5951ca86-c723-498f-b163-b6139f049920} + {000b6db1-6b39-4924-91a7-6c9b44e2cee4} - {0e754251-d385-4e7a-88ee-6cba23bc37c7} + {a7e7d316-ebda-4c4a-8c6e-5cfec8ca1099} - {bc378e37-6f2a-4c7d-925e-431ca734eb78} + {4d3c294e-3b0c-4c17-bc10-48042c865946} - {6babaf44-273b-4858-b8e5-f8cb9aec2361} + {cfec33e4-348a-415e-b6a1-c855c137a799} diff --git a/Foundation/testsuite/TestSuite_vs90.vcproj b/Foundation/testsuite/TestSuite_vs90.vcproj index 3272c84bb..a1b89132a 100644 --- a/Foundation/testsuite/TestSuite_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -421,7 +421,7 @@ - + diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters index a2c2688a7..8e4cc807e 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {67a891e9-d193-4bec-ac1a-90d7a17be408} + {c87821ee-b63c-4371-8eba-a1ca62dafa1c} - {44beb46f-6235-4592-8225-8f37b37ba62b} + {e7dde6cd-2c80-44fa-b1da-494e7638bfad} - {4d9798e4-5c54-4007-8128-c9d89a4e0783} + {013e6f89-4e05-4174-8e43-87b8d8514df5} - {20c8a954-ec07-4a55-b118-c34e951480cc} + {192e3188-6b37-48a7-9eac-b695df6d9660} - {cff28a6f-5e40-46b8-a70f-5d8ad3a555b1} + {a6410f5a-db36-447e-8c40-b7374ac1c213} - {65e0dd28-77b8-4477-bd0b-305248d2bf33} + {ff30520a-2603-4fda-88f4-3547d5976724} - {f600f407-eaa3-4e43-8091-fc543a6311e3} + {051bff1e-d1ea-48a5-83ce-85953ae40c4d} - {d871e472-f95c-4874-98cf-597cc9631148} + {423927e1-6ce3-43e2-9b0a-41a20daf7edc} - {c20d8e2a-0e53-4883-852c-fb19006e413c} + {f4f52084-fdf4-4a2e-b842-15d9d94243ac} - {2d4b6101-82c4-482a-a186-e7a1d87b5216} + {181f8ebe-0621-402b-aab3-caf95863c502} - {8b3a2f2c-8f39-4f52-af01-8753cde11a58} + {3cb8bd8a-88bb-4375-85bb-055ab79864a4} - {fb77fbfa-dadb-4944-ad5b-96647c73c7eb} + {c925e04a-ef0b-41e8-a713-e092eec74649} - {8f7e8d90-47bd-475f-a14d-24136b121bab} + {984d1f4a-1df6-4da4-a89c-c6b22df5d808} - {0feb95ff-26b2-4139-838f-d7a78cdb5a03} + {9a83f87c-b33e-48a1-86dd-bdbd28250b43} - {94b58275-b557-43b8-8869-ef1a23898da0} + {afc32abc-e532-4cac-82de-475008a327fd} - {70febb7f-22fb-4231-a200-a393458f35c7} + {2ac2c0a1-69d3-48d6-9d5a-963685c99e1f} - {1e169a63-6ea1-4043-8203-79dd81b050a1} + {972b16a9-0bb0-451c-a99c-04afd36ae192} - {9c076f9f-d1aa-4a77-a936-2a9c44e3c52b} + {8601494d-611c-4429-a831-2cec778ba23b} - {f2fa4ecb-cab5-4bc7-a0ee-fef41e88ad87} + {86c0cebb-0973-41f9-9f90-1c7f18a8286d} - {40af934c-67a4-485e-a99b-24e4d497e4f2} + {4285c883-efa9-444a-95d0-62c4dcd26522} - {76a846b3-c1f9-43a7-9c18-6f3ccceb83d7} + {75538a34-5634-4488-84cd-947ddbee7bc6} - {f97770b5-bbbf-4814-a114-3baddc3356ad} + {b68b6300-5e60-4163-b4c7-fe933b1d5784} - {0fedb11a-9a6f-45fb-a5ce-169f833f36f1} + {dbe09aca-9c89-49a8-a965-cc8d3ba12854} - {014c0743-95dd-4d46-b2c9-e5cfacebf691} + {bf2a3cd1-bb75-407d-ac9e-c040ece83e05} - {d30e5552-cdf9-46e4-a41e-f48e0ed1768f} + {3f6d0aa9-2d48-428e-9489-d15ff1ee896b} - {57634f0e-27d8-4689-918a-f6f46a56f463} + {b67cfd48-7d82-481b-b4d9-269e7eaf5743} - {3b295970-b6c9-46c7-84ec-c182a5c9a325} + {e75094ef-1762-4b3c-b5a7-13468fe1c884} - {e8b15d12-2f92-444b-b916-9fea05dca80f} + {a4d7b758-5079-4e49-817a-b834e9301068} - {93b7ce88-55b3-41ba-9ef1-b30cc166460c} + {5c295088-4ef3-408e-b432-8df740ec22bd} - {7780b5dd-c4a7-4a1d-8308-6ef3b696e80f} + {01817bb6-4187-4366-bf25-05c4193f05fd} - {47faa283-225a-48f8-b538-a70da496bf51} + {be0e7135-2253-4020-b989-9c219598e7d9} - {756d0a42-9b3d-4ca9-a34b-23daec8600d8} + {9f919090-c953-454e-9187-14067d71d2eb} - {79070555-4d5a-4d0b-8d16-498019bb7dbf} + {bbb6844c-04c6-4643-ba0f-efd8558aa863} - {96488317-df91-491f-b38f-bf2d903963a0} + {b33a3570-49e0-4d61-9de9-8052d342e664} - {4305d932-0f03-4883-abdc-ba69db601ca9} + {f928a5d8-cec4-42bb-88df-fb6c6861d9ee} - {b10c1a3b-1c77-4443-8d7a-824c0386ebd4} + {7fb89501-b404-46d2-be07-d94b94f42f95} - {8543947e-e8cc-45cc-b368-7248a2ed5926} + {f2685a2b-5e4c-457c-a5aa-cc5ee3ba50eb} - {56fc2f84-2227-488f-b6bf-5980cd3243a2} + {f6f0187d-8407-4d95-81f7-b00e2028005e} - {65d7873d-2827-4173-835c-aff3fa6f4621} + {52141451-40b5-48ff-9a0d-1425c777ed05} - {89b71640-ef68-4b12-99a9-97f9e059a0b4} + {df2a8e64-1030-4e8e-abfc-6173d8de081d} - {a4780593-bf19-4145-a1b6-b821d3eebd16} + {4bb6114c-969b-4b3a-a3b7-0f824e92d60c} - {7a7a13b1-9362-4898-a3d8-5fe5a7bd588f} + {08f0763e-3078-4d4d-a7ec-04e1fb9d09aa} - {946686b3-2d1a-4a46-ade6-11fd0b8a208b} + {28f36fcc-c24e-43c8-8621-36103dda4f58} - {572629f6-4c71-494e-babd-c0f61954a78d} + {bcf1d3b0-9781-436a-ad7d-d8eb42917ba9} - {543a6ec4-5531-46e2-918b-ae15c281216f} + {e80e1bde-1ac7-4864-aa14-3f30408e72a7} - {b9051a1f-005f-4258-b20b-84eb2ff59747} + {c5dec211-ffb7-4f48-bb62-9d0f6fb3e751} - {cca183e8-5021-4841-88f9-d352190b7ef8} + {d1a7d8c1-2ad4-4c57-84fe-97464e2aafa1} - {5016c5e3-3678-46f6-b5e3-c9d5c7f78aa8} + {93ceca5f-ab01-4df6-b1ae-43ad198e541e} - {90f043c1-b135-4f91-99ef-1ff6816951c9} + {87c8bba2-e1a7-4461-84ac-b092e8a9768c} - {a9335cd5-2c33-4565-9a32-96f9fafec428} + {0e5857e4-3905-452a-bc62-0c2034604442} - {8ceff108-0f11-4240-a57b-54e61694ff41} + {f040f3bc-2c84-4693-b2f2-acc097df6a2a} - {e7ccbd0f-44ac-4398-b687-3a572a486007} + {a0c17a07-b058-41e6-b202-063df1d2b8ed} - {1bacce05-0faa-4737-89a8-d7e481006b7b} + {e17a01f0-04d6-42a9-a3e2-cd5a94fba6a3} - {9f9ee6b8-3ad6-40f0-9264-ea3fe1251d89} + {1e656d6f-e869-4c6e-a18f-6593af549404} - {a3dd7087-728a-4be0-a6df-6052a88df1be} + {f0d0abe3-6bde-4144-8bae-22476503ad96} - {42e45f69-3e61-4f20-b27a-5af66b5489a1} + {2a713f89-6631-4ebb-8794-6a7908bc4ec5} - {d280e8c6-6198-4e56-ae62-71916b85e67a} + {3022e674-357d-40a3-aa5a-cb22b5d0a6b5} - {a0d2e5ab-dc11-424d-91ec-b5c829355310} + {91702298-3cd9-45f0-a77c-05a2b56cef0b} - {d35066d2-0ccf-4acc-af1b-cfb6a4bca02c} + {7e36cdde-ec82-4dc0-ac4c-d8924188ab5d} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj index cb4066355..4de381790 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -421,7 +421,7 @@ - + diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters index db0138a15..b887cf9fc 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {f75e863c-54e4-40bb-a0ac-7044600e8cd8} + {7983d238-ebfb-4404-b5fb-7c1af35405b8} - {7e5bcbd6-a637-45c7-90e4-a580d7cd193e} + {263f6be5-e11d-473d-bdc8-dbe9dbc66d35} - {8fc1464a-a36a-4b84-a811-639780a4fb68} + {afe16a72-3ab3-48fc-b103-b84e6c834bdb} - {05fa4b0e-9303-48ff-9722-b91735cd023f} + {7682199c-b1ca-43b4-879b-df8c12ae5f4c} - {5907e6dc-e157-4e5e-abb8-179e3ad9ea13} + {c1fa2116-4415-410a-bb07-08b3396c206a} - {1f6c5c3c-513a-4bce-b515-a8ccd1b12ecd} + {e9fce279-8460-455d-9191-50d1d678597d} - {c2a8c6e8-0904-4eb1-af15-3cef7d2a6e07} + {26290351-e93a-4a5c-b83b-ca25061f7156} - {df250d96-143b-4dec-9df2-adf6ce78c5e6} + {024ffcea-cf00-480e-9691-04ecc408c61a} - {f2048d7f-10c2-4b99-b5c5-d584f2481e05} + {a3ed55ef-ee22-4635-96aa-592b934aac5f} - {cdca8068-7b9d-4bf7-9526-eb3d5f234a4e} + {d075c1a3-e0eb-4f6a-93aa-7f25c1ebad1a} - {8c8d9c96-91db-4218-ab98-233e8ac88c0a} + {43ac3265-9d52-446e-8548-ee76c6fda812} - {b532b1a9-4d7b-467a-80d2-0477bbfd9245} + {0330a5f9-726e-41cd-b6fc-0bdfb74fa09c} - {8a8423db-2b1c-4280-bcdb-bbde4efa1451} + {7704d95a-368f-46af-95d4-4cd5e61e5f96} - {e18bf320-69c8-4fbb-9e30-92aa046a814b} + {49624e71-e393-4e53-b120-21682098affe} - {9b32cf49-cb3b-4428-98e8-21539c7ce836} + {a7f0d70a-f232-4c49-b82e-13cac2dabb58} - {d139fd33-0af4-43ad-99ca-66fa1587079b} + {d389084a-2f86-4082-b5f0-c59679dfbbdf} - {6dc7a5f5-d371-4e83-9d6f-05697b0b529c} + {2cfb96b8-47a4-49d2-b1f8-15d42cd422c0} - {a02f24e8-0316-4f48-9b3b-05e5a5378ecd} + {a3533e53-2286-4e2a-ae38-ee2330e64861} - {1d0056fb-ff0c-4301-8217-376b5697275e} + {f70b6739-5d1a-4726-b836-a9a490150e27} - {01e364ec-6e9a-4bc6-8157-8572400ea2f7} + {483137d2-dd8d-497b-b830-fef4fab057df} - {1795888b-4d35-4258-b155-c9c1d6ef0084} + {97f7695a-b310-49f4-bd1f-0ea0354df4fe} - {23f12e22-5e8d-4561-9b2f-6d922762a3b2} + {0c611d98-fb86-48ff-a74d-35cf3ce0b17a} - {b10f90b2-22e0-4c62-955c-9ff520b3d97e} + {46ea0d8c-54f1-4fa7-a212-cdf700c6f060} - {e5df9e72-dda0-4942-bda5-c487f9fc8568} + {58a5aecc-4b4f-4e9c-bff5-e8e212794a6a} - {5a7ddd60-3549-475c-b1cf-c7141bb81d42} + {949eec30-e704-4ba7-a3a1-318c9ad65fb3} - {b1b977d4-321d-4997-9a81-384814a0a3b8} + {1d92ada3-80f9-4af8-bebd-f8d038ce2ea2} - {e66d317e-6f28-4c96-b8d5-97fc065c3432} + {789140da-7849-493f-a097-3f482b55b867} - {6f84f709-cb7f-414b-9d91-e922eb721093} + {046c9a4e-242c-46cc-9156-4e06c6d08671} - {44697614-021f-4b4c-9940-514e03192571} + {0f8a0a0b-71dd-400a-8175-c64d7a2b0fa0} - {ba63b487-3761-44f8-92bd-a2216ded9623} + {c527c5ba-9c69-427c-a5c2-081588a1cdc3} - {6cd8e263-5f95-49a2-bbc7-1b7958f24f2f} + {4818c497-ef15-4acb-8fbd-e1ac53545996} - {a2b3eda1-f116-44ef-b71b-da0653c248d0} + {31106f4b-8d3b-4878-805f-56b09927fae0} - {a8794f75-7e78-4547-8e6a-83664c366bdb} + {e6e290d0-4404-4812-9485-267b08c947ea} - {838c697a-77b3-4e32-9865-8d9d452c10c7} + {00ae75dd-60d4-46bc-9bec-966719a501ae} - {087ef53e-b59d-4a36-a1c9-91fc8b3c6eb8} + {8b054314-66a7-4a06-8625-13ce3921e1d4} - {d9cb09cf-1b91-47e9-838b-74d9203c3c12} + {f0f64d31-6ce5-4281-afee-95d81b77ebc2} - {b6ad0ccf-e19f-4b12-9bf4-d7bd71c8c959} + {5c364521-5bdf-4bf1-8bb6-e1a4da9dee28} - {8a2c78df-a763-43ba-aed3-4965a4408631} + {988113b2-82d8-43c2-8f12-aca6e2b22861} - {2ef380af-2f9d-47b9-8b97-c2a290453939} + {d680ff87-acde-4235-81cf-b1e737ca1cda} - {e2a76426-d6bd-4d41-90fb-1dabd49fb4b3} + {523c003e-54f7-4678-a997-bbd11d6679d4} - {9ebddcb7-8e46-4534-b9bf-a94623daba78} + {db6e6005-afc2-4105-a959-21d87862f09b} - {0b6105e7-ac96-444d-b5ed-6975c9d553cd} + {6d3dbeb3-4b5a-480a-8a63-5d419625b4f6} - {47906358-6cd7-4873-83cd-06b3a6cdb9e8} + {fd7c0afd-df24-4682-b161-495b6f15ccaf} - {a710f65e-8afe-4f25-b4f3-3e96970dba57} + {ca94d79c-fdd2-41dc-81a6-e48577b4ff75} - {eb6fd0a5-b944-4a2e-bbcb-79f2432db132} + {0419c851-6f81-4f61-bf0e-86efe264f562} - {1fa988be-ae1f-4610-ba3d-209f5a7c3d9a} + {74a6a73c-aae7-4028-9b64-654c246be072} - {54a2b1fa-fd9a-497a-bb43-6ecd23811a76} + {c225c5c3-679a-46f0-9b24-86d203f4ce98} - {e8669e3d-6508-4bd7-af67-93b4df829ece} + {9ab92957-3c2f-4b75-9b08-c76f537c8c69} - {cfab8c5c-599b-4d1d-9783-92f42257e39d} + {7fa08e13-2e35-4691-9126-2dc6c6d19987} - {6527395c-2a9b-4495-a8c6-67e0241fc162} + {51d7a0c4-9c20-4d85-9fe4-9d522af9470b} - {f3a24d08-6848-4f6b-bc0e-0644b68065f0} + {152f2848-ac5b-4812-9503-299305e54373} - {28c6b1d1-213e-4f75-af78-ac88832c6082} + {d5894c9e-4e4b-4253-813d-4a2e1fa087dc} - {0e09469e-6b55-47d8-b86d-372a125a8f1e} + {aad9e45e-08fe-412e-a570-2cda5e951e12} - {605e9819-190d-4dfe-9fda-b6d741691414} + {4e87b113-5441-4b65-b3c4-48a0939d28dd} - {3cc7d3f6-8bf5-4af2-80b0-0bf94e9f3ebe} + {32099410-1de9-4e4a-8a68-8091b8c3f55c} - {c550e98f-bf1e-4a91-a7ed-bb796c33874a} + {9af01925-7f50-4fc0-80fd-bffa2fb7081b} - {4ebeffcd-2b25-4608-8a00-36e5d3284096} + {f14cb9f0-e3aa-4fa4-82d9-bd48c1b40536} - {6447d60b-fa64-4c29-b28a-de4f4031556c} + {45460de7-6ec3-4be6-85ee-4f79cb3dac48} - {5d1fd923-a78e-4178-b703-0446ae61d69b} + {b8633361-cc77-409d-93cd-eeb7632858a9} @@ -507,7 +507,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj index 68574b0d3..380a45af7 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters index 8b036ee10..0ef966cde 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {8e652b4f-5906-4efc-83a4-dcb5cb439ef5} + {b2d33ec1-0066-42aa-af27-267523ea786a} - {8c4711cb-56ce-4ac0-89f1-6324f5ca8f97} + {e32c7fde-5e9a-45d3-b18a-9f97f07c2b1a} - {a0609fa8-61da-4a3a-8d92-908ee83cedc4} + {1d9dab13-37c6-4c41-b14c-060e62b61f8a} - {8ef7cc2b-9a14-4f47-96bb-084a02138e13} + {fe38934c-ec2b-4795-8d0d-80269a0de722} - {0b30cd0d-f7fa-4f72-99c1-5ced5c938a36} + {cbcc425e-5923-427b-a1bf-e72fdb72de36} - {76b24eea-15c4-4c6e-af87-cc602c3f0b7e} + {75b8846e-d204-4030-b9d5-a8199990a9f8} - {55b01934-260f-4dff-ae76-3e9676569230} + {f4622449-67be-417c-a0e5-fec1b8ddb69a} - {1fec0b28-5702-495e-aa90-16bdd6e297cd} + {c85af245-b5f5-4d3c-be74-41256d4ea38d} - {8a85ca91-0c70-4241-88c7-c2a72470d9e0} + {fc40045f-19cc-4f05-b671-0806366e8b87} - {1c54afd7-a3a7-47fb-9da5-6bbcd0c15aa9} + {ce20f2b8-8245-4d3b-b04d-4de267c73bc5} - {b8c8baae-a0f6-4f29-b12b-a77d425d634c} + {6ab0fce2-cb0c-403d-b928-1b05008382b9} - {0b3bc0d8-547d-4181-9462-6ed21d5ce5b6} + {064db034-b29a-49bb-9715-8938caf78734} - {7c100b85-109a-4041-9d9c-a0e0f34cc9fc} + {ce12a3b5-2116-442d-b845-937e9777f774} - {b682035b-ba9e-46dc-9406-ca03cb9091bd} + {7ba3d7a6-9384-49a4-9b75-c31b966012cc} - {4ca51ba9-9b85-4c0e-a6c1-8ac02450e9dd} + {ea3f3138-5c80-4355-8b06-42f37f8a0cee} - {6ff8cf0c-e67b-4e90-acc1-ca37a7fc9ba8} + {1e5c998f-37f5-4e1b-9f45-919dd870437e} - {9bf8028c-efb2-4712-a984-74d58006606d} + {aeb085bc-f03d-4ecb-b804-e2277a331499} - {27fdd46a-17e6-4286-a244-a18907ede3dc} + {6cad3799-935e-427f-991e-b400cf71455a} - {ee957804-086b-4d31-8864-48617b73fd1e} + {26c5e29d-5867-493d-b3b8-0136d92bfa22} - {ff3d6b5d-0e1c-477c-86d0-481f2150d8fc} + {37640602-3cfc-4b20-b831-8580dfa5dc4d} - {446f0ad9-48c2-4cdb-a2bc-89dfc74fc3db} + {2df5e2f7-e67b-4124-a0f7-4c6e70d3bb2b} - {4fd4f28c-50d3-4630-981b-ff9bf3cdfd4e} + {6e710200-6a40-42eb-9354-605f62dc76bd} - {ac7bd278-2595-4dd4-af31-14923a50f443} + {37f40294-c74e-412b-9c43-5390a652f71a} - {c589a3f4-0f42-4397-8807-ea96bfeb9ed4} + {a82aabe3-2a9e-4a27-bfc4-3d795e8925c3} - {1fa729e3-7580-42c3-806a-0e2e7e4e0186} + {2b982acc-8f0a-484b-8547-ac763d549a68} - {28f55230-3e9f-4ef1-a1bc-30502390fe0f} + {a3b44aec-9595-4313-b384-f45ba774dc3e} - {272b90b1-dc5f-4e12-8717-0d0cbbda41a0} + {5aeed7bd-43ed-4429-b91c-0c6c50e7c500} - {88c81497-9761-45ba-85de-a9caf2261e97} + {8fddd644-356e-40e3-bb42-3f0beda35122} - {a6e73244-8da3-4f0b-9f39-156d9caecb42} + {de6d3f0c-092f-422d-9235-283c5d648b07} - {185c25ea-7ec1-4fe7-a50a-927f918bdc5f} + {66da26cb-aca0-43f0-a957-39dbfd5675a6} - {02c6c4d8-0f98-4273-82a8-58c12a0a6cd9} + {242df79d-8b4e-42c1-8440-cf0fd0a03cb1} - {d67a7028-6779-483e-a2cb-df9112a2315b} + {dd603c08-891b-41e6-ae05-67e38c3b496f} - {cd67dc37-2a28-4013-af4f-bc789aaf2252} + {f13f65ee-7ad6-48a4-ba69-84c1c1965021} - {63d4b6df-e8e9-438a-a699-1803cf65f6c7} + {d1fb0162-6e73-4069-ab4f-a9ed1d8485cf} - {4efaea13-9392-4fdc-b5fa-268d73a6a3c2} + {13dc51b9-0cb5-4c7e-b605-656db9400f99} - {2aaf74a1-b8e7-45ac-aed3-59f6c3d861df} + {133d62d3-be19-4065-b4bf-8a0ccd29c058} - {c7d31d12-5a68-4416-8f79-76a754e0a36a} + {0146850d-a01d-41c9-95e4-682822edf932} - {1cc1904c-3f87-4e31-8d43-572095feaa35} + {b644d948-f2a3-4baa-bf58-2eb67e2fac17} - {fba5de30-a441-480e-a27c-8ae98995c9fb} + {6845c358-a605-4e1a-8dab-40d0567cbf82} - {6a2c8b38-f2df-4292-9ba8-5d2f52f8e415} + {51b42186-aa5d-4dec-a718-5d7fa83eac9a} - {35b5179a-f9fa-48c6-bf58-9b8247512400} + {61330c47-330c-4dca-90cb-b5778b8db461} - {974b7752-66f6-42e6-b807-af834ded1cfd} + {4433f61a-cb80-4a80-9281-542cfa7a6b3d} - {6b636ed4-bd22-4c21-88e2-f4912872858a} + {508a914b-b52c-4293-8170-2f61a483b162} - {2b60a762-7b3f-4bd7-9b0f-5e31ffb1abe8} + {fa7a3c3d-15b7-47f1-8c8f-270fcd40b1f2} - {245aa767-a9ae-4f65-961c-317b19f9d76e} + {7b793957-8471-4ae5-9b82-9314b197f245} - {5cc48f4a-5bbd-4aba-b4cf-8e823e79ae42} + {fa5cf6dc-dea3-428e-b831-0b91b50a3895} - {1db46582-5180-4e80-b664-609568ad7b45} + {b81931be-39ea-4fe2-b037-0353fdb6dfda} - {a1b3e6b6-1770-4420-b463-e49ff38bf13a} + {525dcc61-a74e-40ed-8928-b1e8cbba7570} - {9e495593-c7f9-40ff-b132-0d6367bd6d5a} + {da2ae006-c9bb-49d4-914f-f89ef15fb28d} - {cef9b39c-70c3-4f47-b265-460d1113e114} + {07fce5a6-21dd-4fa6-849f-a184bc4bed4d} - {6cd1ad56-2226-4697-aa10-e2c7380f7e46} + {3ec6203f-8899-4dbe-be93-6277abcf3a08} - {00164d78-880b-46a7-9f52-aa2fe8a40d17} + {8899881b-17b0-4c65-9da3-07fe83f66264} - {4a284841-1b89-4727-ab89-f2a12514b9a1} + {a21e5a8d-8de7-41f6-907e-4fdd427d5cb5} - {59a33a03-e234-40a4-9b16-5e2bd4f623ae} + {4ebf3f2b-992d-4db6-970c-f52e1c39b969} - {9abe3a90-5a21-482d-b8ef-b33b2078e4d4} + {226dd1b0-36e6-44ea-b908-d3618df573e8} - {7f8fd0f6-9ebf-49d6-aabe-bb0d59248f20} + {0fc0382b-9a72-4b92-980c-d96f8fc345d9} - {7b1f19af-f4f7-47a1-8e12-d5c28e2a57b4} + {7de3f4da-b59c-4e7a-b6cf-9d1615603019} - {2b5c7441-6e47-4a4c-9a79-2ff9d9aaf0d1} + {e1f229c3-27fa-48f0-96c5-4d0bd605f41d} - {80ce683c-065c-49d4-bc38-d632041d5ec5} + {c321f482-e3d8-4a85-b3dc-1cc9eb844a0b} diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj index 4c032a2f4..50420ce62 100644 --- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters index b4278932f..47692f49a 100644 --- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {8d2272a7-af70-40dc-8302-84e67b8f380a} + {c325d242-318a-44d8-ac40-97cc39e01d09} - {cc08d4df-7083-4530-bea4-3ee2c4765531} + {4721e96b-ce18-471e-879d-bb66988f504b} - {8cb3fd61-0f0b-46cc-a9a4-301e019ec5c8} + {eaff0b09-5a16-4bac-bc79-18e980540f60} - {3466ac45-80ad-4e1c-97c9-877ff9d423ce} + {3e7099eb-736b-4ee6-917a-3858cf47c4cd} - {da08bb9e-0d11-4ff9-9b77-fc291b83746b} + {e214ceb3-176f-43d9-967d-d86bb0355d8f} - {a13ae28e-ab6d-4dab-adb4-c75f8c613aca} + {be372098-4bd4-4a45-8324-23f1ac416e01} - {b50ea772-1107-440f-899b-fb56f6e1cc59} + {f90b562d-f8e5-4662-84f6-8013dab4ff00} - {467d7921-d81d-4d2b-be30-b7037bd188e6} + {c17bd3ce-516a-458e-8572-03d411592d55} - {ba9d1931-55cd-4137-bdb3-50bc13bfafae} + {7ccab392-d4e8-4a79-8f9e-3a9f15c538dc} - {9721eade-f692-474f-866d-9e00ce88dee4} + {65659813-cda0-44ae-8e4c-15c210f16bee} - {2488cf16-54cc-4901-952d-505143780e72} + {d533835b-da34-4b59-9dbc-51443447122c} - {4467b041-346a-4aa4-bc23-236de72810b8} + {d24e53f6-4fbe-42b3-88f0-c7550ea70380} - {26fcf003-0bb8-4f6d-a3c6-882e6c03d24d} + {1200e29f-582f-42f6-94af-f34ca79c4689} - {ad1d5899-b2b8-4142-b060-df5d3cecff4c} + {798c8272-6bb2-43d8-862e-e2da94f00c72} - {437104cb-393f-4e78-a59a-5c6e8ea8a922} + {6989cf3b-7d41-42a2-aab5-3aa1dac77108} - {2d7900f0-c46c-4cd4-ae93-9246a7294c5b} + {6f231349-65e1-4cce-83a6-5eb21f15ec9c} - {4a09f5a1-7199-4476-8bd2-ea0d99a08d87} + {571131da-50a4-4dbd-bed3-bad7d2f884a2} - {1e2ce2ca-8624-48fc-931f-4247b67bf5c7} + {01b21ce1-9de0-48d7-addf-fd5410f5d580} - {424ca5a0-43b4-41a1-92a8-ac074dc02654} + {38bbe993-9242-4194-a8d6-8cdec7484a39} - {22ca79d5-d8c6-4a32-a3a4-7a7049c9f59e} + {ffa1d2bf-937b-42b0-bdea-da344a437bb8} - {687b0ce3-b66b-4723-96e3-100ed2053ada} + {6a61b636-6e7d-481a-a76c-a7e3b5758397} - {efee566f-b58f-454c-94db-5ca08819604c} + {2dc5e21b-dafe-4c87-b024-0bde33ccd35a} - {c8d00f51-c36c-48b8-bbe4-8167de08dc39} + {c01b34b4-e3b3-45c5-ac90-d4e555b39a12} - {0f8df80c-fd8c-42dc-a82e-c3f1a944f04a} + {049a120f-6b4d-42f9-a659-f1a8086a5ea9} - {dc7c9712-3d5a-4d9c-8df9-b5e8ba38649d} + {9ac4bc76-482f-458b-8daf-13f8791d3407} - {1481a1b1-3253-4482-bbb1-a304366ee227} + {4902ac77-e101-4d7f-a6dc-02922f39fe4e} - {b5090e77-7282-461b-b223-88224a06ffea} + {05c26e73-52eb-463a-8c06-6254ea449140} - {c829bb9f-0c83-4da4-a701-30cbc80fbb32} + {ab959485-0bd4-45f4-9b13-b045e9957a8d} - {d9146ba8-3caa-4ab3-bc3a-e966ce02367c} + {7e5d7606-6a41-4f84-ba07-070ec3e57b4c} - {e806cba6-ed00-4a4f-b6f1-f7925c326445} + {0cd4fc85-4135-4fbc-a3fb-163fb6793cf1} - {e65abb25-8a75-45ec-a1e2-a7aac2d7ec1a} + {f10eab33-b63e-4691-80e9-612b79a47eb9} - {758113e2-7c23-4847-a4fa-ac4e8bcc020c} + {47ff00db-5bd6-4b76-8bc4-6d93b659cb6d} - {42a7b550-9ce4-484f-934e-49cbdca4b28c} + {3ac9cf4b-47cd-4ba6-bb9b-1dc1c60581e6} - {55704e18-bdd8-4267-9c74-50f9986e8a76} + {9d619edc-75c7-498a-9842-61869f329457} - {331fe541-43bd-4971-a29d-bc672fa2bf76} + {55cb4b8a-e1fb-468b-887e-02f19e3a8118} - {daadf837-b59d-49e1-8c62-1eabf1115329} + {ac4cf6f2-49f6-4cb0-b593-3631a3ae377b} - {08135eb1-34b5-44bc-b42d-a49477ebe857} + {81b0679f-7187-4a3f-aeb3-38d87c6cd14b} - {19a7876f-4965-4b1b-9be7-bd7c1c35a5a7} + {33e6a881-b872-442e-af4b-ed68afde8634} - {4073be63-ee54-4951-8b0f-5e4fa01766b1} + {c560e8ee-fac5-4a7a-959a-b083eb767afe} - {312f0c9b-17a0-45e4-b68c-9553e48280f7} + {b8d6ccfc-3082-4585-855f-0c6189ba4132} - {185d026d-1fd7-4352-9f5d-6ecde9c7a014} + {69161187-6c6a-41d0-afd2-1235cd0c9130} - {940b63bd-5e8f-47b4-af33-92adb845bf6f} + {753f308c-3e40-440f-85c1-2d756287645f} - {01af9b1f-a44e-4e80-af61-e210665a039c} + {52feaf87-e1c7-4ef2-b777-49e755c75239} - {6127353f-e1a2-490a-a748-e12b544697af} + {fe8cbe82-ef84-4d45-b7b3-6911e82f476c} - {117b55fb-b627-47c5-9cc1-5347a682549a} + {c60fab56-cb36-4a65-867e-6f7a7645d693} - {31c11246-f3d3-429a-8a87-848c1c91ee63} + {43a89df7-edfd-4859-b09d-c8da22ee5661} - {6d5df10a-97ec-49f0-8876-4a3f6376722a} + {a189b7c9-711d-438e-b291-3fceea496796} - {df4d4d2c-a919-4ad6-95c4-deed2616368c} + {073570d0-45af-47e9-ae4f-c11778a156eb} - {fcdc8c78-daa8-435a-8471-c2dff2f0ec78} + {399dbd97-37c3-4185-bbd0-3a4a00eb12cd} - {db5c6c36-7689-40a7-b74f-2a6dcb3490d7} + {deb8cfac-eaaf-47b8-bd10-15d8057ecb9d} - {9673e323-d249-42a4-b108-39d09cd4d102} + {43f766fa-d367-4989-b900-38f9ae93b111} - {d4c1acd7-cdfc-4142-adf1-30345a1425ab} + {9668a9c4-30a5-488f-83ea-1f6c1c829f0b} - {feafac8b-bca7-458a-9dd0-46176f35f47f} + {93d2775e-36da-417e-af2b-62270a2783f4} - {0a55e758-f65f-4dc9-9fa4-e0a4e5d2607f} + {7c101a4d-339b-4546-9bcf-5509aa4aa970} - {5fa786c7-014f-4d44-ae8f-7b24bfc1d6e3} + {cf2d21b4-5378-47de-be89-9fa99b30f5cf} - {4e5961f9-9a4f-4e88-86e2-d8b8dfa7a144} + {a13642fb-c897-4c75-b0ad-db778b243e96} - {52b79737-07f6-4109-a0fa-f777b1c8638e} + {512dc510-8d7a-43b1-8dc3-abcfa290bc18} - {0788e223-c963-4f6c-81bf-e7ba785a7568} + {67fd5316-4838-4e2e-ac4a-95b8146899cf} - {4c012314-6905-479d-a344-2c2c7e66fee3} + {532d7cb5-0c6e-4565-88b1-82063de53b63} diff --git a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj index a9dc48e43..a1146fea6 100644 --- a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters index 1cc78b455..64e06bfda 100644 --- a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,181 +2,181 @@ - {2698a14b-5902-4037-aad1-418a8460278e} + {3bbf5c74-13a7-46c5-9a38-459f9e012543} - {dbd96c23-e48f-4c63-90e9-bacfe679b3b7} + {ba595d5d-6fc1-445f-a8f7-3e2338c458d1} - {47322534-e9e0-4b63-8914-1f7539edbf1a} + {7aa4e16d-a738-46f9-8da9-a9a2b92481be} - {208b6186-dbf5-435e-a6c9-76a648ebea71} + {ba6ca721-a462-4b6a-a201-3373754e222f} - {a3aa3483-6613-4ded-8cc6-ceef6568fac3} + {64366ba6-6d02-4e3d-865a-0e52ca08da07} - {23b8a675-4aa0-44c1-9dea-69a7f90ab3b7} + {ac097c87-061b-43da-84b3-784d51c777e1} - {632a53a3-97dc-43ae-9eea-9ff26293f41a} + {efaab5a9-7cab-4262-90ae-83812c396c68} - {ce8efb7e-81f1-4397-9fbd-1c3de4270704} + {34f45b45-853d-4c04-a0a4-512d65a6b45e} - {fab0c3f5-9652-4b3b-a715-ca4c322c024d} + {a2a33225-26ac-44f9-a9ad-006f165b6917} - {709b7f1f-4f4d-4578-8953-6b79ed8cae04} + {5c830c8c-8603-457b-b49d-176f89609468} - {319650c0-741c-4c5f-ac8d-f3b3807ad8dd} + {51c7aaf4-2867-4e78-9b86-a986f084fd79} - {f943fccb-3ee2-44f7-bda8-95b470b9d52a} + {234f79c4-9ee9-4755-86f5-6ba5b57e0ae5} - {9d7b9108-6067-4090-863c-034e11b72ce7} + {18298cf6-8f1d-4365-998e-255638cd1b03} - {6d7a6261-9563-42ef-89a0-434d56fc6ab0} + {a38044cc-e4d5-4edb-9f94-9cc4735b6ee9} - {9e422b9b-85ff-4893-8882-aed747fc37ac} + {e86e5e59-c191-490e-a522-82b77b54ee77} - {53d868f4-c9b0-41b0-8e27-41b34be5aeb0} + {82e71e4e-4941-4289-92da-1395ca9ca59c} - {8ca3699a-010d-4330-9255-503d38139fa6} + {95d57752-67d1-4e70-af64-fdc30a19ff3a} - {01775c85-b0b1-450f-abd9-6564c35e899b} + {30f3035f-bad7-4da3-b247-92bdfdd9a2a5} - {c85b829a-7f10-483e-8cc5-77e0e7b90a55} + {8c09c736-1c3b-4a49-8c39-23bed7c10c29} - {d3a435fa-97f5-4ccc-a196-eb351cd2986e} + {9c4a3ac2-e444-426d-b9f3-41bc6e0d8340} - {19b491eb-2655-49ea-a282-755cd395be39} + {d650f9eb-83df-41f3-bf20-0be2aa2d9d9a} - {f2add88d-3826-41bf-aa27-910cc8125bab} + {1d34784c-9a18-4b1f-bf7f-e10006534eb2} - {b822f855-76cc-44b3-abf9-34bdb73f09c5} + {0510e8c0-4699-49e1-8e5b-7c992461c5aa} - {b8ec2d24-e8e4-407f-b8b5-6f57b1f76630} + {f533fa34-a935-4107-9447-d553d84b1492} - {0da6b707-1d7a-4e3a-a564-dc7ec9b199df} + {75c6b15e-aa27-4e1c-a53b-d0fa7ee10e4a} - {8bcfe1b5-6d71-45d2-a26f-d810cb995ac2} + {a8e20cf9-f025-480c-9919-af1db528ac14} - {6a3d3ac4-7884-4f77-b0a7-6b8f76a9ff08} + {c7d19d42-aad7-4a36-ba14-9e1e03a8cc61} - {e2b8f7d5-d04d-4578-884b-1528aea133a8} + {6992f69e-1732-4d06-bf9e-db2fbf868696} - {7d9df0b6-2d7b-45e0-9287-589415d5993a} + {1cbb2b41-cf1f-4855-a4f6-f6667a40af3a} - {c97dde34-aa9b-444e-9f11-a8fc45be3b82} + {86a52d13-54c9-4bbc-9fe1-0ec3c2a8942a} - {2adf35c9-7a6b-4950-b4ff-e2dd240debba} + {463b78bd-c0ab-4c64-a6a9-d996a70271bf} - {c8d0f2cd-306a-49a7-9d38-8158bc6df988} + {7c13d958-2303-4af4-8d56-a8ad8fa3ea7e} - {88ea008d-1860-4801-9b75-33903c9f2c61} + {5dfc6c24-aa00-4874-b6af-f742b3d2438e} - {c72d795b-37e9-4b73-9f74-dc99cd55adb6} + {af34c163-cc7b-44b3-9944-48f92a9d75a2} - {53a26434-ff8d-4109-9f24-02e2883f5f5e} + {92182003-3c34-4bfc-82ea-bbe13359d0c9} - {5af7beff-26b2-43e6-bba1-74b15c87ce3e} + {771f3eaa-fb48-41e8-a703-f668837eecc9} - {b9f6391f-fc69-43f7-a3ce-b2a6df646644} + {1685a3ef-39d7-4536-ac72-35174771e519} - {0b053f4f-e3a9-4928-89f7-190ed7e7cd71} + {1eeee519-17fa-4009-911f-16a5f14e04fd} - {e8203313-40b8-427f-b146-89260bdc14db} + {432c49d1-99c7-4711-97fe-9f261da9881a} - {36b1aaf5-ed81-4e63-ac84-a15da74f3220} + {41c8ca77-4860-4dec-b4c2-7198e2b5113e} - {093e491a-8bb0-44df-b342-4b7033ddb80c} + {0bd7da47-ecff-41af-a87e-abd3c461841d} - {0aa75e26-97a7-4fad-84d7-c4de679dfb92} + {f68efd5e-3230-4b52-876c-4d508ed9ee2f} - {3d2553b6-58b1-4d0e-bfef-ea1f59cfa554} + {675e3c5e-2de5-44b1-843c-0f066a7670ad} - {dc2470d8-5c8a-4bde-8310-d9e43d377f0b} + {44b74e35-b3af-41ae-b659-6831fa50f74c} - {6140daa6-9719-4f48-a340-70032a566b58} + {183fc9e9-02b6-4df2-87dd-84f20ce4aa3c} - {700bfa14-619a-4c93-b6a0-6e48b6994c7a} + {65a78347-d64a-4390-abed-8f59cdff0f66} - {eb9080fb-ea0f-473e-a827-057b19afad1a} + {2c29a48f-fad6-4c4d-8a57-de04371136cf} - {1ce5099b-8e6e-4e40-8f1c-18d1d3659641} + {bd26a0b1-f853-4b78-88c7-88b0dab88424} - {61e892a1-b610-4a3d-b8b5-359d29815666} + {1d664692-64b0-41ca-a376-9bea99b0bf0a} - {84159000-4d17-4089-883e-5446c72b650a} + {dd9effd6-6032-4c07-aedc-b968ad1b3f87} - {35f8c4ca-5d63-4785-b7fe-0726cef4a45a} + {31f575e7-3a6c-4454-acfd-61014fe70e7e} - {fc27c276-a59f-4da8-87e9-64043612e968} + {c88822f9-952b-4ec6-84ba-2c4255e0da01} - {b1635aa2-8c2e-410a-a39b-f65cdc1336da} + {572bd5cf-67a3-48ba-85f5-d095c37fd26d} - {8e3192bf-4e55-4f94-bf9f-f0ac5d122244} + {ada7e21e-f8be-4efa-baa0-ab289d92bb32} - {54aafd73-2b07-4b6d-b7ef-1827164d56a7} + {256049c4-8b48-454f-af9c-274771957c5d} - {dc4f9e38-873f-4163-b109-563cc16aa009} + {06506a70-85a7-4a6a-9464-f073abeb547b} - {338aeb3d-7e56-449d-b73c-9079fc238c1f} + {6e206e47-8698-4dda-9229-46eaf1367cd2} - {3412e2d4-da40-4c03-9998-dbb6a8950392} + {c476f7ba-bc57-4a5e-b156-d034d0a3d7d5} - {514838c3-d14f-4d01-95a6-2b39c948f4e0} + {58e7c2c2-7180-4a20-b627-a1b72fdd6383} diff --git a/Foundation/testsuite/TestSuite_x64_vs90.vcproj b/Foundation/testsuite/TestSuite_x64_vs90.vcproj index 0e54de21a..66e02e2ff 100644 --- a/Foundation/testsuite/TestSuite_x64_vs90.vcproj +++ b/Foundation/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoJSONd PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_WEC2013_vs110.vcxproj.filters b/JSON/JSON_WEC2013_vs110.vcxproj.filters index 6eb21bb46..3142686de 100644 --- a/JSON/JSON_WEC2013_vs110.vcxproj.filters +++ b/JSON/JSON_WEC2013_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {a6b30421-3b00-496e-a264-e61d654cd63f} + {25e19857-6cba-4a83-93f6-b6210c55ca81} - {e55482db-c7ed-450b-a1a5-06b03c7abe90} + {b2953bf1-c2d5-4d8a-a940-7ce031604db4} diff --git a/JSON/JSON_WEC2013_vs120.vcxproj b/JSON/JSON_WEC2013_vs120.vcxproj index f770802f5..26b2610a1 100644 --- a/JSON/JSON_WEC2013_vs120.vcxproj +++ b/JSON/JSON_WEC2013_vs120.vcxproj @@ -1,30 +1,19 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - + + + + + + + + + + + + + JSON @@ -36,56 +25,8 @@ CE800 - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 @@ -96,194 +37,7 @@ PocoJSONmd PocoJSONmt - - ..\bin\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\JSON\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;JSON_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoJSONd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoJSONd.pdb - - - ..\lib\$(Platform)\PocoJSONd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;JSON_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoJSON.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoJSON.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoJSONmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoJSONmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoJSONmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoJSONmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoJSONmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoJSONmd.lib - - - - - - - - - - - - true - CompileAsCpp - true - CompileAsCpp - true - CompileAsCpp - true - CompileAsCpp - true - CompileAsCpp - true - CompileAsCpp - - - - - - - + diff --git a/JSON/JSON_WEC2013_vs120.vcxproj.filters b/JSON/JSON_WEC2013_vs120.vcxproj.filters index 91d767bf8..858400ff5 100644 --- a/JSON/JSON_WEC2013_vs120.vcxproj.filters +++ b/JSON/JSON_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {68fd13a1-40e2-40fa-a869-7a922844522a} + {687295e2-b930-4752-8fe0-0605c42d6e85} - {93e9e099-4d73-4d13-8764-25f8392f803f} + {e19cbff6-9a16-4d15-9040-2a65787b8614} diff --git a/JSON/JSON_vs100.vcxproj.filters b/JSON/JSON_vs100.vcxproj.filters index 63055d0de..bd6dfd5c1 100644 --- a/JSON/JSON_vs100.vcxproj.filters +++ b/JSON/JSON_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {b68acee8-936e-46b7-8bae-b6afb9614f0d} + {51c6052c-632b-47f4-b5b9-f2f22139aca3} - {aaf1301e-6eff-4b31-a03b-2da5d2b3b111} + {49794242-6539-40e4-bfa1-5951ebf8ba4f} diff --git a/JSON/JSON_vs110.vcxproj b/JSON/JSON_vs110.vcxproj index 9ada055aa..13ec8abb4 100644 --- a/JSON/JSON_vs110.vcxproj +++ b/JSON/JSON_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoJSONd PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_vs110.vcxproj.filters b/JSON/JSON_vs110.vcxproj.filters index 3a689b7a5..88bd12d44 100644 --- a/JSON/JSON_vs110.vcxproj.filters +++ b/JSON/JSON_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {34186f03-ff5e-4400-a515-5c526c36534b} + {310b9fa9-c363-4238-b9ec-2a5ab304dfac} - {aa510946-2dbf-4328-bccf-9a406a4facb2} + {a4c2100f-8815-45c0-9782-d26aa3c78db2} diff --git a/JSON/JSON_vs120.vcxproj.filters b/JSON/JSON_vs120.vcxproj.filters index fac6e3a34..7aec32d99 100644 --- a/JSON/JSON_vs120.vcxproj.filters +++ b/JSON/JSON_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {e3febff0-df87-4d11-9776-068746e0af7e} + {cd3f1abf-c08b-41d0-aec4-58d50298f4c0} - {b9b72c3b-0641-4713-bdc0-2a76ae3c0161} + {56c465c5-e4e4-4672-a706-da77488c5f65} diff --git a/JSON/JSON_vs140.vcxproj b/JSON/JSON_vs140.vcxproj index 0a22c3b48..fa91ee0a2 100644 --- a/JSON/JSON_vs140.vcxproj +++ b/JSON/JSON_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoJSONd PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_vs140.vcxproj.filters b/JSON/JSON_vs140.vcxproj.filters index 7a5cc3927..47ae495a4 100644 --- a/JSON/JSON_vs140.vcxproj.filters +++ b/JSON/JSON_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {fe21032a-ae41-4d20-9ebf-c7c66079836a} + {f084eff2-c271-47fe-a762-d702c30013c4} - {bf483b80-fa3d-400f-b144-ae8153e9fb44} + {402a43fa-bc70-4ac9-9b09-49567be0dad2} diff --git a/JSON/JSON_vs150.vcxproj b/JSON/JSON_vs150.vcxproj index 843d82cf5..888a7241a 100644 --- a/JSON/JSON_vs150.vcxproj +++ b/JSON/JSON_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27130.2010 + <_ProjectFileVersion>15.0.27625.0 PocoJSONd PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_vs150.vcxproj.filters b/JSON/JSON_vs150.vcxproj.filters index 85737a52d..9a559662b 100644 --- a/JSON/JSON_vs150.vcxproj.filters +++ b/JSON/JSON_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {3c99ad39-2624-4afe-b642-e248cd0b30e8} + {0919a579-478f-4580-956e-ea5fc6a149bc} - {8aad4306-a2e2-45f5-82c3-5eadd55a529d} + {ea7aed1c-1eff-4ab6-a9f6-24128810a779} diff --git a/JSON/JSON_x64_vs100.vcxproj.filters b/JSON/JSON_x64_vs100.vcxproj.filters index 3a46e53cb..7d0cd3d59 100644 --- a/JSON/JSON_x64_vs100.vcxproj.filters +++ b/JSON/JSON_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {32b60585-c34e-47e4-91f2-20333c879ee7} + {4cd62b42-ddd3-40ae-af8b-45ae80825d61} - {97f992ea-e521-42bd-ad7e-7d4a0f4034a4} + {6cfd68c5-60cb-46e9-a14f-d29d637b5406} diff --git a/JSON/JSON_x64_vs110.vcxproj b/JSON/JSON_x64_vs110.vcxproj index 4b5464266..41299fde0 100644 --- a/JSON/JSON_x64_vs110.vcxproj +++ b/JSON/JSON_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoJSON64d PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_x64_vs110.vcxproj.filters b/JSON/JSON_x64_vs110.vcxproj.filters index 738a69b4c..5a0969f9b 100644 --- a/JSON/JSON_x64_vs110.vcxproj.filters +++ b/JSON/JSON_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {d7f5bbe3-903d-4a37-9ef6-fb935e61bbf2} + {7a533b59-4603-49d1-9de8-bc95d3d68518} - {c3726cdf-13e5-4fbe-93b1-aadf0350318c} + {6046ced4-194e-4619-a0b3-b64d7fe6c47f} diff --git a/JSON/JSON_x64_vs120.vcxproj.filters b/JSON/JSON_x64_vs120.vcxproj.filters index 33c248f1e..a87259c97 100644 --- a/JSON/JSON_x64_vs120.vcxproj.filters +++ b/JSON/JSON_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {da6caa53-cde3-4c57-a7a1-05109c5dd4a9} + {1d2b7bff-33f9-4d8a-ad40-74359d301aac} - {260b00b1-e402-4268-a14e-5cf6183cfcff} + {9f9defae-7b28-4766-8d7a-65d4a11a2fed} diff --git a/JSON/JSON_x64_vs140.vcxproj b/JSON/JSON_x64_vs140.vcxproj index 614360c9e..b60a555fb 100644 --- a/JSON/JSON_x64_vs140.vcxproj +++ b/JSON/JSON_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoJSON64d PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_x64_vs140.vcxproj.filters b/JSON/JSON_x64_vs140.vcxproj.filters index 4e4d887a2..86b57e791 100644 --- a/JSON/JSON_x64_vs140.vcxproj.filters +++ b/JSON/JSON_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {f46e0bfc-6447-42ad-9234-fc29092ed746} + {4aa4aad0-9c42-4ee8-bd22-061e3f91a270} - {abf357e9-9248-43e1-a4a5-61e338e1835a} + {a965ff07-2d7f-49f1-9ced-20ea18b194d9} diff --git a/JSON/JSON_x64_vs150.vcxproj b/JSON/JSON_x64_vs150.vcxproj index 1db0260f6..3293bf811 100644 --- a/JSON/JSON_x64_vs150.vcxproj +++ b/JSON/JSON_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27130.2010 + <_ProjectFileVersion>15.0.27625.0 PocoJSON64d PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_x64_vs150.vcxproj.filters b/JSON/JSON_x64_vs150.vcxproj.filters index f640b73f9..14b8658b9 100644 --- a/JSON/JSON_x64_vs150.vcxproj.filters +++ b/JSON/JSON_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {e37d2e47-2e79-407b-a66a-577c794cb4be} + {47269c7f-3b64-4ef5-a1cf-e704bd4acbfd} - {1cc6b09f-facc-4787-baac-6a96656a36d4} + {459db34f-319b-45bb-95df-6aff6b37ae85} diff --git a/JSON/testsuite/TestSuite_CE_vs90.vcproj b/JSON/testsuite/TestSuite_CE_vs90.vcproj index 7cd5dc9a3..cf118b54b 100644 --- a/JSON/testsuite/TestSuite_CE_vs90.vcproj +++ b/JSON/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj index 986be93ee..b68094903 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -3,7 +3,7 @@ - + TestSuite diff --git a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 1f7191894..dfa477773 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {a13c4a12-2a8c-4078-8bf1-6d8a9804ff3e} + {e99eddc9-4b34-4815-b3ee-935a3a26d011} - {d12d64a1-2d7f-45ad-bb92-01d6ff3206c8} + {1e353c54-63c8-46b6-9b14-eb16ce9e0609} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj index 58c347ae4..4aa0d2856 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -1,9 +1,9 @@ + - TestSuite diff --git a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 0a890bd18..740c08860 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {e029f8cd-a21c-4c88-a72d-17e133f65177} + {249e0d0c-de6a-4259-a146-a698eab8686b} - {c3e99f78-d89b-4425-93c4-e75cc31cb8f2} + {9771c4a7-82dc-4312-a794-9b910100546a} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj b/JSON/testsuite/TestSuite_vs100.vcxproj index c59cc79ce..2bcc3677d 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_vs100.vcxproj.filters index afd0097d6..2959627f1 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {7a266cde-b6f0-43ad-afb8-66cd4801abb7} + {ca509948-5f36-4729-9de6-10ca2847628f} - {83825356-b243-4242-b8a1-67a4cb9f617e} + {c52d2c49-857c-4bf7-9151-a4d4eae93e78} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj b/JSON/testsuite/TestSuite_vs110.vcxproj index a038a924a..a7c7efcc9 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +308,7 @@ - + diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_vs110.vcxproj.filters index 6afa6ef55..e81999088 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {2f169e75-b3df-4b6c-aaf1-0c287fee8b9c} + {2f751e2e-7841-4b54-8f38-fda033c7049b} - {dfcd9bf6-fc8c-4608-a0ee-b158b7aab4b9} + {6b6333d8-a14b-4265-bc96-5e93764642ed} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj b/JSON/testsuite/TestSuite_vs120.vcxproj index 008341e62..4f993ab27 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_vs120.vcxproj.filters index e5d2cfc0f..6b83d4fe7 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {3b790174-bc05-40a0-bb52-49074e232cea} + {53545c6d-081b-4ed9-b43c-31e6e10c018f} - {475fe5fa-ce2f-4650-a929-e14f8f63e51c} + {aaeb008b-f86e-44b9-a6ff-41fbd7fe4c36} diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj b/JSON/testsuite/TestSuite_vs140.vcxproj index 1569be16f..13f5c4135 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_vs140.vcxproj.filters index 71ba765a1..498697690 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {e3bb530f-4f3c-4db5-ad63-3b03b190d26d} + {fdf48f0f-09c2-4e5e-b08a-475bf6284f59} - {98a0ae21-fc3d-454f-a626-ad31e85a1c68} + {24162559-858a-464f-8f08-e028f08fa241} diff --git a/JSON/testsuite/TestSuite_vs150.vcxproj b/JSON/testsuite/TestSuite_vs150.vcxproj index 29ce1d8d3..59caf7064 100644 --- a/JSON/testsuite/TestSuite_vs150.vcxproj +++ b/JSON/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs150.vcxproj.filters b/JSON/testsuite/TestSuite_vs150.vcxproj.filters index 1802175fe..b387c9dcb 100644 --- a/JSON/testsuite/TestSuite_vs150.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {3df9540d-880a-4a73-85ec-a5f850ecfe52} + {af64426f-1d72-4f5c-b40b-1b1c7792da89} - {2c5d9c4e-5c6f-4f40-b37f-de3861d297ad} + {98db6ba1-2760-4167-8caf-b6989b1c1663} diff --git a/JSON/testsuite/TestSuite_vs90.vcproj b/JSON/testsuite/TestSuite_vs90.vcproj index 22e52b2f6..f717c9a33 100644 --- a/JSON/testsuite/TestSuite_vs90.vcproj +++ b/JSON/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj b/JSON/testsuite/TestSuite_x64_vs100.vcxproj index 12319c66a..bc05d8373 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters index 8d2b599bb..0f9e62275 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {740f4087-eeef-4bbc-b0e1-f1a128b55032} + {a0a8575b-4ca8-4629-a597-87000e87c62b} - {478f7e87-678c-409d-97e0-639188270a7e} + {a3131aca-701c-486e-82c8-5279ce8f93a1} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj b/JSON/testsuite/TestSuite_x64_vs110.vcxproj index fb2d0eb03..97dcb54ea 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +308,7 @@ - + diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters index 11ccdf720..1a6676e7d 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {e119a482-6cc9-426f-87bf-fc6f32784ac2} + {b7632afc-78b0-42bb-8b8f-6f412ec92417} - {3acd4466-79af-45f6-9cdc-fdae9d41cc71} + {a9984321-0b78-408e-96b5-c558c4f4f8c6} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj b/JSON/testsuite/TestSuite_x64_vs120.vcxproj index 916216761..9f6d1e6cc 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters index 8251b1343..a31915e5a 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {fc6751d0-a801-4587-aa34-0a55078ecc75} + {9c8c8e2b-d7e4-4c16-8f24-1a6f2ce66142} - {ef0d471a-ed4b-4d9e-872a-d894efed6f50} + {9e2bc1a2-e36d-4dc1-9158-f4b84a4bcc76} diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj b/JSON/testsuite/TestSuite_x64_vs140.vcxproj index babb4b307..943005729 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters index 9c0f42076..f7f25724a 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {4038503c-6e0d-4f31-85e9-32c391a90a0c} + {82232708-c15f-475e-bce9-2a9ccceba7d4} - {afce90eb-d8e1-4692-90c4-2e75f3676449} + {e82e9856-a9d7-4f94-9338-98d4e94fd8ab} diff --git a/JSON/testsuite/TestSuite_x64_vs150.vcxproj b/JSON/testsuite/TestSuite_x64_vs150.vcxproj index 5175525b8..ad4a42961 100644 --- a/JSON/testsuite/TestSuite_x64_vs150.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters index 0e346a1ed..63dafc858 100644 --- a/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {5cf60c72-bb37-41ec-9296-a99a9a716e2b} + {4bbc9a42-5ec4-43b4-a7b0-9d15737e36a4} - {53ee6486-fad9-4383-bda7-d46e18fe4fa4} + {1c3b7d45-d95a-4285-a7b9-e7afca18789e} diff --git a/JSON/testsuite/TestSuite_x64_vs90.vcproj b/JSON/testsuite/TestSuite_x64_vs90.vcproj index 948ce8046..3670590ae 100644 --- a/JSON/testsuite/TestSuite_x64_vs90.vcproj +++ b/JSON/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/MongoDB/MongoDB_CE_vs90.vcproj b/MongoDB/MongoDB_CE_vs90.vcproj index 51257bf02..3d315464c 100644 --- a/MongoDB/MongoDB_CE_vs90.vcproj +++ b/MongoDB/MongoDB_CE_vs90.vcproj @@ -55,7 +55,7 @@ - {ac43ab31-68df-4034-9232-81f22d306e9d} + {b0a1070b-b656-499b-8100-f5133652d842} - {59ed250a-40ed-44a4-a4ca-595201fc7787} + {fc5d8d5b-4f4e-4ac3-a5d7-6c72a7e6e4bb} diff --git a/MongoDB/MongoDB_vs110.vcxproj b/MongoDB/MongoDB_vs110.vcxproj index 66b07092a..d72840b9a 100644 --- a/MongoDB/MongoDB_vs110.vcxproj +++ b/MongoDB/MongoDB_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoMongoDBd PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_vs110.vcxproj.filters b/MongoDB/MongoDB_vs110.vcxproj.filters index 3199b0f25..1943aaeb7 100644 --- a/MongoDB/MongoDB_vs110.vcxproj.filters +++ b/MongoDB/MongoDB_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {46e8f605-7ab1-4b13-b6e1-de496d8b6431} + {1757d7e4-b0f3-4cad-bc16-ae03be55066d} - {5cd02ae4-3641-4b51-a04c-0de9f7c89b3b} + {da0c6423-2e75-4c7d-8bb2-dd43ce5a0d50} diff --git a/MongoDB/MongoDB_vs120.vcxproj.filters b/MongoDB/MongoDB_vs120.vcxproj.filters index 46f1a0c48..08c203d2d 100644 --- a/MongoDB/MongoDB_vs120.vcxproj.filters +++ b/MongoDB/MongoDB_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {b4cea432-124e-4fa5-b77f-508eb14addd7} + {5c0ba33a-01fa-460f-be7f-62ef903507ba} - {3559b8b4-b1d5-4089-9d4a-f162a44efe83} + {67b7f612-417b-494e-aaa8-744e7ce53e18} diff --git a/MongoDB/MongoDB_vs140.vcxproj b/MongoDB/MongoDB_vs140.vcxproj index fa50cfa8d..cd3355ed2 100644 --- a/MongoDB/MongoDB_vs140.vcxproj +++ b/MongoDB/MongoDB_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoMongoDBd PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_vs140.vcxproj.filters b/MongoDB/MongoDB_vs140.vcxproj.filters index d411e7cbe..69e11588e 100644 --- a/MongoDB/MongoDB_vs140.vcxproj.filters +++ b/MongoDB/MongoDB_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {b55f9df9-723e-43a2-8874-929b2e1820cc} + {de2302fc-989a-4b49-981d-79c183a9b129} - {eb87fd96-480e-456c-8b01-f0dfb3eda1d5} + {29d38110-948a-4056-9912-963c93eb78e5} diff --git a/MongoDB/MongoDB_vs150.vcxproj b/MongoDB/MongoDB_vs150.vcxproj index 54966c607..121e83e2b 100644 --- a/MongoDB/MongoDB_vs150.vcxproj +++ b/MongoDB/MongoDB_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoMongoDBd PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_vs150.vcxproj.filters b/MongoDB/MongoDB_vs150.vcxproj.filters index d411e7cbe..80408d977 100644 --- a/MongoDB/MongoDB_vs150.vcxproj.filters +++ b/MongoDB/MongoDB_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {b55f9df9-723e-43a2-8874-929b2e1820cc} + {d5a73d23-a142-4e68-a5b8-6ad7d0021316} - {eb87fd96-480e-456c-8b01-f0dfb3eda1d5} + {ded747b3-ffbd-4dfe-b083-a85af1115909} diff --git a/MongoDB/MongoDB_x64_vs100.vcxproj.filters b/MongoDB/MongoDB_x64_vs100.vcxproj.filters index 82b20e8b9..0ff796214 100644 --- a/MongoDB/MongoDB_x64_vs100.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {b12b274e-4628-40a8-886d-dd4999d51c11} + {41ce63bc-d737-405d-a06e-e6b1d5f30166} - {bec7e846-13ba-4a21-9afc-de2dd9574b74} + {7159c388-41e4-4bfd-a05d-3df8fa92a8b8} diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj b/MongoDB/MongoDB_x64_vs110.vcxproj index e34ecc700..1ab9aa341 100644 --- a/MongoDB/MongoDB_x64_vs110.vcxproj +++ b/MongoDB/MongoDB_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoMongoDB64d PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj.filters b/MongoDB/MongoDB_x64_vs110.vcxproj.filters index 4d15c556e..92e0084cb 100644 --- a/MongoDB/MongoDB_x64_vs110.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {96bf86ab-b03b-44ab-8485-24dd982aab5b} + {bf9d7372-f740-482d-9cf8-c0b65a644664} - {57773056-4290-46dc-a381-5fff36a0d3c9} + {378dd2d7-0c8b-4021-a960-d465a6bc1530} diff --git a/MongoDB/MongoDB_x64_vs120.vcxproj.filters b/MongoDB/MongoDB_x64_vs120.vcxproj.filters index 7d9c5cd2f..f630f5016 100644 --- a/MongoDB/MongoDB_x64_vs120.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {6aac226b-b430-446f-b81d-b0be1180106c} + {e47a4fb2-c47e-469d-8b84-2c8ae11010a7} - {3f97936f-e26c-4206-afde-f389029e5fe5} + {89bf8d17-7432-4bc6-9e8d-02ee8a136457} diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj b/MongoDB/MongoDB_x64_vs140.vcxproj index e30d6c530..ee8f081a8 100644 --- a/MongoDB/MongoDB_x64_vs140.vcxproj +++ b/MongoDB/MongoDB_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoMongoDB64d PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj.filters b/MongoDB/MongoDB_x64_vs140.vcxproj.filters index 7662b9f54..4993b8a30 100644 --- a/MongoDB/MongoDB_x64_vs140.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {da8a131a-bfe8-40f6-ad86-6e6a00d900af} + {ba19ff64-6c4c-4b52-adf1-5d76b9cd7daa} - {bb9b91c2-46c2-4995-8032-1a5f22abd243} + {1fecc809-b1d5-46a4-8e0b-67ec70c6c768} diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj b/MongoDB/MongoDB_x64_vs150.vcxproj index 1a09d3f2e..9a65ab504 100644 --- a/MongoDB/MongoDB_x64_vs150.vcxproj +++ b/MongoDB/MongoDB_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoMongoDB64d PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj.filters b/MongoDB/MongoDB_x64_vs150.vcxproj.filters index 7662b9f54..ae873639e 100644 --- a/MongoDB/MongoDB_x64_vs150.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {da8a131a-bfe8-40f6-ad86-6e6a00d900af} + {f7ee38d8-c069-4374-aa8a-2636ca2cdffa} - {bb9b91c2-46c2-4995-8032-1a5f22abd243} + {1bdab896-6462-450c-9f37-877859c31fb5} diff --git a/MongoDB/samples/samples_vs90.sln b/MongoDB/samples/samples_vs90.sln index e140ca048..916fcdd25 100644 --- a/MongoDB/samples/samples_vs90.sln +++ b/MongoDB/samples/samples_vs90.sln @@ -1,35 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLToMongo", "SQLToMongo\SQLToMongo_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLToMongo", "SQLToMongo\SQLToMongo_vs90.vcproj", "{638D0833-8E84-3A67-BD00-4611F99E65AF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|Win32 = debug_shared|Win32 - release_shared|Win32 = release_shared|Win32 - debug_static_mt|Win32 = debug_static_mt|Win32 - release_static_mt|Win32 = release_static_mt|Win32 debug_static_md|Win32 = debug_static_md|Win32 + debug_static_mt|Win32 = debug_static_mt|Win32 + release_shared|Win32 = release_shared|Win32 release_static_md|Win32 = release_static_md|Win32 + release_static_mt|Win32 = release_static_mt|Win32 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Build.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|Win32.Build.0 = release_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/MongoDB/testsuite/TestSuite_CE_vs90.vcproj b/MongoDB/testsuite/TestSuite_CE_vs90.vcproj index 24f2ef1e4..36b59da58 100644 --- a/MongoDB/testsuite/TestSuite_CE_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_CE_vs90.vcproj @@ -33,7 +33,7 @@ Name="VCCLCompilerTool" ExecutionBucket="7" Optimization="0" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\Poco\CppUnit\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="_DEBUG;_WIN32_WCE=$(CEVER);UNDER_CE;WINCE;$(ARCHFAM);$(_ARCHFAM_);_CONSOLE;_CRT_SECURE_NO_WARNINGS;" StringPooling="true" MinimalRebuild="false" @@ -56,7 +56,7 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters index 84d185a68..8cbcb3c49 100644 --- a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {55edf4da-8500-42c7-9c7a-59015e543e2e} + {14302597-4ba1-4ce7-9661-3fd4ee9b313b} - {c727b404-4e8c-41ee-9120-698d46d22173} + {718b9fcf-8ac1-4f6c-9cbc-185e19fa9b41} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj b/MongoDB/testsuite/TestSuite_vs110.vcxproj index e46aae0f4..58773f5ec 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters index 30e3693b6..a97cc0dba 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {a4fb4d72-8d23-43e2-b78d-0c96e7345f23} + {b1c08101-45bf-4667-b24f-3b444d8f41b9} - {5958ad52-a793-4339-8285-419763a28657} + {020da933-0979-4cf2-adc7-dd5fcf6e1968} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj b/MongoDB/testsuite/TestSuite_vs120.vcxproj index d385ed90a..f3454cfa0 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters index f76395d0a..021069d00 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {2a24c9c6-d542-48ea-bb49-e5908a617795} + {711697e4-3da2-475d-b7ac-25a3dfc59419} - {cde13deb-b19f-4651-ad97-8183ace70801} + {fedfd236-d679-4008-aa6d-eafac6455823} diff --git a/MongoDB/testsuite/TestSuite_vs140.vcxproj b/MongoDB/testsuite/TestSuite_vs140.vcxproj index a21650c9d..7e289b584 100644 --- a/MongoDB/testsuite/TestSuite_vs140.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters index a681dc702..67ade7e69 100644 --- a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {7a3f8cc1-e60d-476f-ab27-0f6cd5cd5d60} + {d22635ed-a90e-413b-a34d-63061691e86e} - {1ffec692-8427-4a92-9965-37b1aa6e5e77} + {7f57a2dd-7bc1-45b9-a708-d5516c9056df} diff --git a/MongoDB/testsuite/TestSuite_vs150.vcxproj b/MongoDB/testsuite/TestSuite_vs150.vcxproj index 200274b87..56bfba566 100644 --- a/MongoDB/testsuite/TestSuite_vs150.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters index dd08db07c..d5e26437a 100644 --- a/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {67786620-b1f3-4ca3-8045-372406a2cd7d} + {7e026445-511d-476f-ba37-a3a1322c342c} - {cdb07b61-3c06-4c00-9988-b0e4c1b76ed6} + {3c0c3316-3246-4fb1-a81f-75f8ae68ddb3} diff --git a/MongoDB/testsuite/TestSuite_vs90.vcproj b/MongoDB/testsuite/TestSuite_vs90.vcproj index dd4e6067c..46de2fa2b 100644 --- a/MongoDB/testsuite/TestSuite_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj index e21e36d62..78ba121ae 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters index 27c00b895..54bf5e72b 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {0dcc3214-0144-4b3d-9124-60229d44fe86} + {5582f372-b69a-4456-b9bf-0b3f3af4caf0} - {086f221f-3800-4140-b9f0-aa2b90159ae2} + {9873c273-e383-435b-9b26-16dcd556158b} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj index 1259312bd..bf0336ce2 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters index 648c2c4b2..889b9f11a 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {5de4374f-f060-4edc-bd5c-15960486366f} + {4f03c950-0f86-46f7-849b-38080bc83a7b} - {dca21a67-a36b-4b21-9dfd-32c7117bc319} + {170591af-ec2f-480e-b363-1806980e4077} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj index 8d555baf1..94762b7ad 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters index a017f6af2..612143731 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {787fecd8-cd65-4ff9-b228-ff7a387df499} + {2b9a6af0-2baa-46c3-86df-c269c0da8d6a} - {c7bf28df-5187-4ffc-bf1b-894f68dfaa89} + {ba01ef5a-dd2d-4980-bee4-9368d316d33f} diff --git a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj index 1c9ed3743..4590a4705 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters index 7318f4c2d..00cb6e3cc 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {80724066-45b0-4ce9-b6ed-222b3b579f6e} + {a61a7cda-cd24-4796-9db0-7fb83222d938} - {a2453e2c-d73b-424e-8885-2f4fbb288656} + {43ed5ded-bfa2-40cd-8bef-d1f3c43b90d7} diff --git a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj index 4d553891e..2be990dbc 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters index 60a1d4b0e..9f3c282ff 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {f9fa611f-028d-49fc-998c-8ab9ed288a87} + {eafb3075-4857-457b-9100-8938fb83ff81} - {58e1812d-8282-4be9-b54b-106dc08dd05a} + {08fe69c1-b148-4401-abaa-b2ceb3cd56b5} diff --git a/MongoDB/testsuite/TestSuite_x64_vs90.vcproj b/MongoDB/testsuite/TestSuite_x64_vs90.vcproj index dc60d633d..b1bef6e60 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Net/Net_WEC2013_vs110.vcxproj.filters b/Net/Net_WEC2013_vs110.vcxproj.filters index 6a63fe2db..c59cecb73 100644 --- a/Net/Net_WEC2013_vs110.vcxproj.filters +++ b/Net/Net_WEC2013_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {6e35768e-9e83-4e1b-aae2-7cf8146c5df5} + {bc71e177-7822-4279-8f15-71590a87be73} - {fdd20b5f-b38e-4d8b-96d5-2319d6dc2f02} + {4acd2490-6d9a-4e81-b72f-9d107613fa9e} - {54e933ff-0d21-4da8-bfcd-631ddff6146e} + {53b6a984-9b32-46ab-a047-e1c029681c00} - {50a8db04-7788-4e4a-b30a-a46985108b3c} + {1d490fb5-5dd7-4cec-a6eb-d555c565d23d} - {4409d30f-f2f7-439e-b7f1-0dbbd9ea389f} + {cefadba0-346a-412d-8d98-e882c0af00fd} - {8ffd8aca-d89e-42b9-9f1f-bf858d0729bf} + {2d49e570-90f3-4128-9930-2779dea1d268} - {0dbbc7a8-91e0-485a-a589-c86a10a587e9} + {80398c21-c07f-4946-8f8d-c7e9ee337097} - {6662bd96-0b1c-4595-a348-1aadc3b09ec2} + {11149c6d-d2a1-49c1-9369-29da497ab5f6} - {4dcb6e80-b062-4792-bb6c-cd6f5b0fb0a4} + {4ecb6304-dfbd-4f81-a042-0d86d94cad81} - {bc61e3f7-206a-44eb-b521-02f60d4c12b9} + {9b78cebf-199f-4bef-ad63-38a63cb196fe} - {30fcd6f8-9e38-401b-ae4d-6828ec7773d5} + {e8ed9441-bb0a-4a6e-8159-321ea7e0a464} - {e6ca6c60-fc9a-4615-a5a0-d69f4e8f2fc2} + {78f30761-3737-4422-8f6f-dfea9bb5e9a9} - {7c9ade5f-a564-4742-86c5-d93e68e5ede7} + {560ab759-9571-439a-97c3-464caa37116d} - {1dc83bcd-6ca8-455a-9ab7-4eca756c2228} + {8b24fa34-86c4-4e8b-a21b-43a0940d0490} - {2115b4b9-dfb4-445d-850f-2906256362f5} + {55ff8c91-d214-4dc9-be43-95815a883e5d} - {5dd8e914-726f-4598-846d-4fcc95f497ae} + {34f4ce98-8f7c-44b3-b78c-de2d95e3e07e} - {f461b76f-d793-425c-9e0a-cf11d51f1bd3} + {d4166d0d-644d-4989-9a00-6a32110fa402} - {17dc770e-792a-4491-a987-261326f3cc57} + {d4aacdc1-add3-480c-8988-d97f2c181d4e} - {737a15d9-d24d-4768-9959-91ddf97336d0} + {1b0309ce-f4cf-4974-aadf-fd7d57b7ec79} - {d9d8c54d-1122-4d9e-ad42-aa50f3342a08} + {df5e2710-b430-431e-8c8d-efb97dfd2c8d} - {d71109d0-cf28-4738-ae78-73f50cf6f183} + {a505c550-3691-4c01-86b4-e93202247764} - {2b331b5f-7ee0-4671-96a7-d8dc65096c22} + {dd42d40e-49ca-4cde-8180-20a3f207b4d4} - {4c9abf90-f611-40f9-a79f-c465bb95a5de} + {c053a2fe-1c89-4a84-82cc-6d8674ca6357} - {64168a9a-9db7-4c80-a382-74a1b747efb7} + {288478c6-a3c5-4eeb-972b-6311c5be28e8} - {2e6aa01d-73ba-44e2-9a51-294cf16c7ad8} + {6e24eefa-d64b-41e4-aba1-1b672968974a} - {6a6f1729-eb2a-4d63-8ad2-9d67a92abb74} + {ee863cde-cac1-4c6c-a713-664a3e5744b7} - {dd78462f-9f2b-45b2-b45d-4bec31a7437a} + {1968f43d-466a-42f8-acd0-62299a3fcda4} - {49379859-7fc3-4dee-8984-1e8b3bbdba57} + {904e1418-0dfa-42e0-a1bc-80d687e86e37} - {7c0f1f9b-5129-4679-b484-196bd5b5c4dc} + {57e1f554-e038-4120-ade5-6162edcc698f} - {884d5cb0-f7e6-4fdf-9f7a-8ffdc2337a24} + {9b6514e9-d3bb-41e1-98d3-214d2f3f2195} - {24357345-c638-4dde-af7f-7d4d2689c886} + {12b0b59b-f7b5-4d3e-9993-3f16dda03104} - {003d0484-e256-4c32-bffa-23971ef9a6a2} + {0ea32e94-5e98-4f67-90b0-549c533ec351} - {2d712539-6ad7-4c02-8328-0a74e5d696a4} + {d6326ebd-dc8b-4d81-94c3-a34dfaa1df52} - {73a455a9-084c-49ea-a550-f40c73fb8ba4} + {398b73d6-8856-4a3d-9660-578efdeb0f35} - {2ca14da0-809c-4786-b4fd-7ccc0f624a3a} + {2f602c7b-3615-4a23-a999-ef0fa98ba657} - {c84f10cb-d40f-4caa-89f5-d0d6ef5302d1} + {91083473-8fd5-444c-ba11-8d3711b068a7} - {ca0a5034-e6d1-48ce-ac49-05c4f6f442c6} + {3650e86e-d25d-4dff-838d-84e1f9b77a96} - {f11f8d96-8104-467d-9739-21b64ca6e5fd} + {51c6d4c9-2739-4d77-9536-c323f1789c5b} - {ede4fe25-2bbc-4677-ab96-3372c06fede0} + {1b8cdee6-b49e-46dc-8d2c-308655669311} - {e0239281-836e-46d6-9bfe-fcec8230f54c} + {bdd4aea8-4484-4926-b280-4f5534666c15} - {d0f3b2a4-e15e-4d0c-a5ef-b5898edfa616} + {2fd022ac-1eff-49eb-9a98-c5c8ad467ef7} - {73b7bd90-d068-4359-b73d-ca8fa679a678} + {a24fa80b-da35-447f-91f7-adb3f924c5d8} - {2861b677-cb4d-4426-8386-4691125bd7f4} + {4cdf6d29-8d61-477f-9725-dbfc07c3c698} - {3d64261c-34e6-41be-acad-8d7ad3943b77} + {626eb80a-82d9-4fcb-8bbf-1cf65f77303e} - {2676a94b-2bd8-4c43-8b0b-cb7c1f47e196} + {28344f70-fe0b-40ab-8463-736a94c62787} - {b0ddf043-be30-49c9-ab59-c82382028662} + {feb037d0-4890-4269-b44a-b0488b7a2aaf} - {7beec4dd-819e-40e6-bea4-704042f46e9b} + {bf2805cb-c80f-4364-b6b7-6de732622485} - {c537ca3e-c040-44a8-8345-4fd620b3cb70} + {acca8587-3a3e-418a-b658-92b35554d400} - {c4c9c248-7a1a-463e-9b8f-32e2da8bd150} + {597a9d97-133a-438a-a1d9-9ebf746e07af} - {e2774308-5461-489d-ad9d-b43fbacfdefe} + {3802cb30-68dc-45dd-a842-393dc17ec9c9} - {1945e2e6-bf73-45ec-a283-11126f1fd9f5} + {d588ee82-751d-41f9-b18c-a51cfa6d567b} diff --git a/Net/Net_WEC2013_vs120.vcxproj.filters b/Net/Net_WEC2013_vs120.vcxproj.filters index 78990e752..ce772f283 100644 --- a/Net/Net_WEC2013_vs120.vcxproj.filters +++ b/Net/Net_WEC2013_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {3d4963b6-d7df-4710-97f8-9d5a675f6095} + {3676a342-4dd8-4bc2-a1e0-3238d89bee4f} - {bb1fddd8-7855-41ec-b480-5617f359a0b6} + {dbcddc6b-df8d-4ca3-9256-730fb252c3a8} - {299bdd44-1974-4b2c-88b6-98ef3f196745} + {7f680f25-914f-4c05-b66d-69cc3f43ccb1} - {2fc8da2a-27a8-4e58-8e7a-9107d5ffa233} + {9bd8d4ed-d602-4b10-a647-5bb45ef45db1} - {356b63fd-d879-4b8c-a426-b957d1a6a5e7} + {01960f71-de2c-4b9d-8f4a-b62d1532097a} - {e4d5f199-73aa-497d-9dae-422407cf45b5} + {9dde2206-2b9b-40aa-bb2e-6204f2353854} - {19da3407-2185-473b-9fae-d7b46f3b63b4} + {e8932198-598c-4696-a240-0c96579248e7} - {7969b7e3-61fc-4aa9-8fb5-e1f49ec688ec} + {00c63640-548b-430d-bb1b-5d3989fb7ba4} - {95104171-3b83-431d-8b71-b7e09ed97848} + {f9af5f6c-8351-4659-8272-2fa98e502dc9} - {057ecfa6-2332-4d88-922a-c8c6a8de9dbf} + {20328a4f-b110-4926-b8b3-add960174082} - {1dfbf284-65e3-47eb-8b68-c7ef30832805} + {af2a8a2f-a86a-4f20-b42c-675bd660c0b0} - {45cad813-7cf8-4701-9d1e-7e96e9c90b72} + {2b3992f1-51cb-4abd-b2aa-d25ef83fb7b8} - {0bc87ac1-6d60-48b3-967a-895f8aa1bd64} + {825a3124-c229-4d78-9ddd-36e88c51061c} - {9cb0c042-8fd4-4531-aa3b-fc5d5a630dc8} + {4a5ff4a2-c226-4c64-8dc6-9a573f4a8101} - {4e432213-4c58-40ca-96a9-b7b5a112829a} + {8bcf301c-f2ba-48ff-8b16-de10c3478d05} - {e7061686-e7a2-4e17-b348-5af429e8ab58} + {ef875ca6-7cde-4e5b-bddd-52661d3a7238} - {a3b60b73-dd45-4b8c-9ef8-5699a8a0087f} + {712c8163-55b6-43a5-9b42-95dd99108d3e} - {2566c190-9ae6-4038-a86c-7aa8a84d6e5b} + {824b24cf-4dbb-4ff5-9f30-7f1a015bee3b} - {2d57462d-926c-4b16-bdaf-98267f466e50} + {af8228ec-88eb-4f1b-8f68-6c1c7179671e} - {758e1049-9f5a-49e7-83d2-4b16ced0430c} + {33a705d4-0585-4bfe-bd1f-94d89e4fe3ac} - {49dd4cf7-0100-4d8b-9ea6-da95cef91419} + {5d03da1e-5735-410e-8f4f-a4cb2d450d62} - {4adb5d60-c6a1-4330-8817-b6ff10ea34e7} + {c8292b0c-6fb9-422c-906a-82ba3dacab1c} - {ede5b946-56fb-47bf-9933-23c2e35bb348} + {f77c6343-c702-4f17-88ff-4221e8d9d130} - {0fab7e33-838c-41d8-bbf6-093f5b008e96} + {db841b36-fd49-49a3-a77b-89e1ac69492e} - {6dd6869a-a861-41a0-b089-018ab463d521} + {d61fae43-579e-4bc9-8104-53e7ec59cabc} - {103a71a3-0dd9-43f7-8ded-a97a67c8f802} + {0d0e0fe3-37bb-4dd6-85d4-242fc900b6bf} - {5b916500-0482-49a8-8a27-79d872a47a0e} + {33cd7199-02e9-4f09-96cc-3dfa5f06d3ed} - {5ab0745f-3764-46d0-b0f2-5fa69dee066e} + {53b858be-d9f1-4128-bfae-bdbf5634ddfa} - {8a848701-c617-4d4e-9afb-51aa3a753862} + {367af116-b22b-4057-b5f9-eb588d1dfbad} - {0eeca428-6973-4c5f-ac8a-8ce8d11c6625} + {d5466b2c-ae71-404e-b033-cc0413838034} - {f9d008b5-fa17-417b-b645-31cf23b81f38} + {bd0ae4c4-6c6e-416f-8d67-0349b4fcb861} - {5e30e60b-37a3-4996-8903-663bae145bd8} + {e9a572c8-85fd-4e9f-b9f2-fa82dab73565} - {e585dbae-6751-48dc-8e7d-c1fb36a524b6} + {d82a4dad-0041-4a8e-a8be-3a6b9a0f774a} - {9306c380-189a-43c8-94bb-fbaee760a79b} + {14836deb-4fd8-4cb9-b3c9-acd35a9e1b76} - {f81396b5-46c7-420e-8a91-7cff884b4d20} + {e68d6eac-8bb3-4e4f-ad07-6d055d8176a3} - {2decf213-c0e0-42a1-9a38-30e3946f32ec} + {f49faf7c-cf32-4059-933e-0acc81447e96} - {d8057121-76d4-4166-b6b3-29f6239d4831} + {1380633d-b55f-4ccf-9bd6-5b5ce7c0e823} - {4e048ae6-bc42-43c4-a63c-e4fea5db6f26} + {fcdaaaea-96ce-4c3f-82dc-33fb825c5e4d} - {d92701ac-4a0f-4be3-9a0d-5795956a1a32} + {34b644b1-08ef-48c8-8d91-cac78daaf4d7} - {a76b54e4-aa61-4075-a449-d10ad20f8af9} + {aba630a5-b0ba-4bb2-ba88-8b690d8a7a7d} - {b77083a8-fbc9-435a-b667-76ace19e138c} + {d7e238ba-2181-478f-a186-e82af46530c0} - {abc047d9-7b16-408c-92ec-c5067e906030} + {50ba35cf-0988-4940-bf62-80f8a6b889a4} - {86b46567-46f7-43ce-a902-61d7f8fae112} + {dc83baa1-6a5f-4a0d-917d-77ec8de93af1} - {620a5026-8228-48f0-ad3c-5aed338c1f49} + {28854397-b25a-42b6-b523-e9ae2b2c2700} - {4bc8dae5-f38c-4ec2-a662-7ceee49fdad1} + {eed10270-52d0-45b6-9990-8c45dbaa1e89} - {1dbe074f-20d7-43fa-880b-1decd61f640c} + {2693de6f-ea20-48f4-9fe3-65e98325356a} - {19c7eddf-a41a-4f7e-b951-9c3498d38d5e} + {da4c13e1-08b3-420c-a7c9-98a3ed8c5d43} - {e15b5545-ae7b-457f-814a-12cf601fe392} + {7d971a52-1bc8-4b09-baf6-1fffae303042} - {44141c42-8b47-49bc-8b87-24ba1cd9de1b} + {a0a35f74-4701-4840-b5ee-ed3a32d4d6cd} - {ef7cea07-8a0f-48d3-84ef-ff8e85564e3f} + {a68ae566-fd54-4411-bfb4-08593672125c} - {54859cdf-28f7-4a93-b134-0c8e75d20848} + {d7ae2162-63cc-4c88-86e8-4306dba9d33c} diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters index 193f7e0bb..bffbcf0e1 100644 --- a/Net/Net_vs100.vcxproj.filters +++ b/Net/Net_vs100.vcxproj.filters @@ -2,157 +2,157 @@ - {3112c7c9-dbd2-428c-b9bc-bee436d86fcb} + {5ff8fe1f-3f09-498d-94da-0d7213828d83} - {2be5f8ef-9fed-47d1-a1be-6c7f5ca89cb4} + {ec4de8b7-e968-453e-852b-aa728b31db85} - {fe26165a-7085-4291-9bc0-a61b9adb1c71} + {5ce6070d-019b-405a-840d-ba95e0bd51bd} - {dbf8e162-f7c3-4c76-b48f-a4bf96984cb2} + {013a4193-8b39-41dc-ae73-569e4167f37c} - {fe1feba9-bceb-4bd5-8499-f85462920dbf} + {9292700f-4f7d-4140-9396-4b4f1e4d106c} - {10a99a4b-6ec4-454d-a237-fbb8fbaff21e} + {a69ab93b-2b89-4cd7-8a14-44a9feb1d67e} - {70dc979d-9ce2-443e-9ad3-89ce5f01fe52} + {c577c8f2-844e-46bf-b36e-815a36e0d1d4} - {e52ff7d4-82e6-488a-b11c-6d6c798306d2} + {7e5830bd-65a0-4849-83b1-060a90b51e6e} - {39b46f91-35df-4254-b119-2ae4386e9ed0} + {7e46754e-c766-4a89-82ee-4da6d1b4d7dc} - {7dfdde05-f0f6-4a54-986f-35927089c51f} + {82d0a8cf-5f52-4fdc-92ff-e2930da269e2} - {52261253-8a5b-4630-bc6b-52bf632c362a} + {f9fa3d9e-226f-4f50-830f-fe7fc44af1bf} - {b0aa5df0-871d-4e5f-8b50-71f0de694728} + {f960a76d-6793-4a2f-9c96-4576c1cd1d97} - {c92b290c-c7d1-4a58-9039-c6cd84642e09} + {317770ba-6496-4190-b5c2-9ac2a3db57d6} - {d110956c-7eb1-46d3-b37b-54b281f6224d} + {a59d48d1-aa9f-4626-8fdb-a0b392e58ccb} - {a7602bbc-f961-4ecd-ab07-6c57b49db444} + {48b3d011-0fb3-4a1c-bd61-088cb50350d8} - {df6522c7-1921-470e-85f2-aa3228b7bcbf} + {ec71b626-cec8-46a2-af29-5eb455955190} - {a73b4d3e-cf7d-4a6e-a362-8d1e42e1ecfc} + {9d228688-4862-437a-bbb3-b7af5298855d} - {f5a1c829-ad43-47b4-a02a-68a75b02126b} + {116373bc-3370-40c9-8964-26802057856e} - {2342021b-fa7e-4121-8cb7-5df634b6c45d} + {bb19b823-2c94-41db-9c7c-77006b299bcb} - {12724675-834e-496d-a000-ceb57944985f} + {3a790362-0c54-475d-a50f-13f4cbea89a1} - {13bf28dc-c06b-4cbf-97e5-68d6129f3f6c} + {f91e4ba4-b4d3-4212-95fc-9b6353e88a8e} - {a59f60e1-76a7-4c95-af3e-ac94b502bd2c} + {b769b517-f7e1-4ad7-a1a7-0bd85b41de38} - {402c23a6-be16-41ca-a132-54f5b80d59c9} + {87780dcd-a850-44df-953b-16a882a826b4} - {c309c15d-9f94-48eb-9855-7998f6defa9b} + {546189d2-ffb7-4af5-ad2d-661e130f4195} - {a5f9e6ae-90b2-4417-a561-a55061e5fec9} + {200b545a-3a72-43c6-9201-d597d82aeb6f} - {8466e297-20b4-47ae-a887-c5ff0d45ce78} + {90466f37-39aa-4e16-add1-f20d9445ab2d} - {0445ae82-0782-4886-a214-999676554772} + {63dea846-8c09-407f-87da-05d42ace9b86} - {98190227-ff15-4a0e-9138-cf62a710ec6e} + {5f59fceb-4c6d-4343-b55b-119b7fc48ed8} - {d839ac9c-c0c8-4a0d-b71d-983036fdaa2f} + {df826d6a-821d-4646-8c46-a42e4bb3c741} - {d42fb054-f522-426b-bbc6-1b260c275713} + {ac20b883-9948-4c85-a947-b74d10119137} - {54d35578-6cb6-4643-99f8-57a0cb16d8e0} + {ad68fec5-4e1a-4cce-bdbe-967ce0ce12ca} - {5d1fce8e-4527-4809-acba-a2f8fe806890} + {9b2fc36e-4b87-46f3-8014-8a9e46925e92} - {88b736df-0022-4fe5-bccc-436e7e15efad} + {ca5f206e-cbae-4124-83bf-8fca55851f3e} - {545bbed8-2453-4110-a44d-c736bfc2eb08} + {de011416-c701-492f-8e15-e4bf86ef39a5} - {e73b6e65-a0b3-4577-b062-e5df3d91e81f} + {731a3e55-7233-44a0-8c22-61e518c9ebf0} - {8d63beaa-5a39-4b95-a6af-c6101c0fac1a} + {564c4655-7ee8-4031-9e99-67bb167e3675} - {dd4de661-d6e9-4dfd-b9de-884ef2d948d0} + {9869a02b-d22b-4e7d-be4f-4a981016c476} - {c9eed670-0eac-4978-b619-9f6630082f00} + {c52518ed-9645-4a33-aa44-6a24915432ce} - {ac9feb06-1987-43f8-8ee8-a279e6085821} + {48534181-183f-4695-a33f-3736178e9c16} - {1f8b5a2a-3fe9-430a-a2b0-67b3825abb6f} + {c7c2a948-98d6-423b-9848-27247e31bb2f} - {f9123dc5-28cd-40f8-8e02-a2194555a3c7} + {d44e554e-e364-4f8d-a698-3321948163ae} - {4d7908a1-4bd4-4423-80f4-19d91876e879} + {e5023ca5-01fe-4417-833d-4d74515a8c32} - {acfe2593-67b6-467d-a660-45dd35057efd} + {a654eb85-e616-4dba-8788-5103675f6647} - {b27eca77-9da9-4fc0-b358-a69d6a74eb2b} + {d3bd7103-46b0-4857-ac2e-afd5e7d96868} - {aaaeac30-cb69-4101-a77c-1d854c3a3d59} + {6f0b495a-2df0-41d9-b6d4-160836a8c4f8} - {68f9783d-6cab-46bd-8779-88e5bfff5799} + {1d4f5f97-be7a-4b99-b5fd-7ecfbf3efebe} - {510d818c-813c-4e95-88f8-ccbd8f49db60} + {d95385aa-0501-4990-9139-30b77d1b0010} - {b507d869-ca40-45fd-89f4-ff1d0b44e4cb} + {9adb438a-55fd-4483-afbe-c80a39b784f1} - {84078495-9523-467a-8a89-facf71482dc4} + {e4838636-9763-4512-b330-6851dac3a306} - {34bc2f46-b881-477e-9df1-7d1913333c1c} + {65898326-f73d-4838-b7c7-cdda2c001e21} - {826a903c-3dde-4514-88cd-f2be3e23820e} + {2842e08d-faf4-4106-a46d-05bc01ad0ca5} diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters index 07cd9dae8..434070cba 100644 --- a/Net/Net_vs110.vcxproj.filters +++ b/Net/Net_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {36be9e0a-bda2-4ac3-abbb-de70658044f4} + {1741a8b6-5585-4cc0-a32d-be7a78cfa15a} - {4744f7e3-36d0-4c2d-bc19-936f8d68bcfd} + {874f7b10-5d5a-44d6-acac-c1ebee338b50} - {f43abe9c-28b3-4894-80a4-3d6fe203b0d5} + {750ec2c4-b600-4d00-b5e4-2b0887c5857c} - {c4a86506-4fd7-4d5f-9a19-d622a5561e1a} + {7285706c-c684-46a2-b506-468be8de9d1e} - {763f20ff-5a77-4be5-98a1-b8c70704dcec} + {b5eda20d-5a0d-4ad6-8549-c054b49aeed0} - {1967af29-06fb-49bf-a13d-ca88975ab8f8} + {364e3f1b-382b-4364-b9aa-a9030bf7966b} - {4703f187-2778-43e8-a26e-48ab3a5f137d} + {bbe0fcae-e54f-41c4-9762-7dd6c71a8123} - {c6514151-4f44-4ee5-a027-687bc1ac0629} + {37a8aac0-ebbc-482b-81c8-3fd656a8175a} - {a31284d6-0073-49d7-9aa5-178bb03fab6b} + {a5333a6b-caa8-4fb2-be3a-ec0410bacf58} - {4c4f5f1c-ba6f-4dfc-9ec9-1bdfe67282aa} + {a315be1f-7534-464b-949f-037664a99ed4} - {bd90490d-667a-4917-a957-f3abbf423623} + {2283189b-6189-44f2-9b00-2eff9e24a45d} - {53093151-3d78-433a-9688-a7fe731e36c1} + {940b85aa-8f80-41cb-a633-9c8f82f48b74} - {6a04e21f-2419-4235-943e-c4b7d851acee} + {f89d8229-5886-4d93-ac1f-dbb13ca97562} - {59f9a778-9d87-405e-a5a5-717185dd34bb} + {59af1e84-81fd-4faf-989f-5527773f7bd3} - {157f2ba5-e510-401a-a34c-f4bc38c20732} + {04b21335-e033-4abb-825b-e4b499aca726} - {226832c0-782b-4dcc-8331-f7bb659ca591} + {7bfc2818-28c7-4b03-aeed-d137bc7160e9} - {ddfec897-0c48-49e2-8e3c-c84d7b415077} + {73d2c1de-3a90-4344-852c-9e7630a63d84} - {31f6824c-feab-4b24-a977-09eafc82909e} + {ff53aad6-a46d-4ec0-8ce8-f8261945bdd2} - {53c599fc-22d4-4c65-82b8-47e46d63aa7a} + {ed0fdc91-7329-468f-9f86-474c9e1718ce} - {31392b91-f7ec-4beb-b7f4-cb809bce9622} + {0b122975-c39b-42bf-a27a-648d94a853f4} - {f400ff81-e36a-4f47-9a23-ee7b83e39c88} + {7237a480-7250-4c06-896b-7ce80ff60bdb} - {11f4e892-3a16-4c81-90dc-7d53e19a72a5} + {3faa20ab-f86e-45e7-ab00-97ea032b9519} - {33474cb9-3147-4ad4-a658-d56984a74700} + {fcf4f437-a059-4a1d-b15b-bf838a013c39} - {e619e991-8dbe-43f8-bbc9-a6ec620e333f} + {c3c030d0-0872-405e-8e84-c8015721de12} - {7b7d8df5-3739-43a5-8c49-bb77fde6f4b8} + {129ff19c-336a-4346-9d19-a53160a15df2} - {f08bfcb3-b4bd-449a-8e1a-f132d7d94190} + {5c569d9e-dbde-44f5-bdc0-a4b64302367c} - {de8ade78-b779-4156-931d-b9b337c2ff01} + {03997f36-9d28-4d73-abfa-8b7e136e0c13} - {39387355-52b3-4274-9d50-51d57d461467} + {aaccdb21-b949-4835-9446-af733a094dd8} - {ead46adc-922b-4534-a92a-a44485bf92c7} + {df3b0240-ac49-4a60-b562-c05c99f224bc} - {0436ddb6-5bc9-447f-b085-affba2ecf245} + {88ba3f71-1b04-460e-be7f-03d93f313c59} - {30ce5f96-c5ee-4571-8feb-e73efcdda213} + {789457be-64f5-4f3c-aa28-9b2d6f98f164} - {f431f07c-1dd0-4d53-bc28-bee0ac37bdce} + {b4d6f911-7862-4f6d-b374-8be479e8e9e3} - {a39a9b2b-ed5d-498a-b83c-dfd1f21d976c} + {a19c812a-b24a-47fe-bf06-5b7accced2bb} - {4c1ee7d0-846e-4a2b-8e2d-3b32b00c727b} + {08d53403-bb74-4645-b538-27190d05e4be} - {3102b233-638a-431f-9d44-f059eab414ad} + {afb4fd36-4042-4f7d-9bf5-b73d38dd4917} - {ad25b068-a579-4edb-8d91-d5a1b421b3d7} + {9176e292-bded-49ab-9888-1d3d237d952f} - {ff6af4fd-831c-4abf-940d-64f390fee5f2} + {805dbefc-75b1-45e9-af20-69f3c8acab87} - {2d52a6f7-6c6e-4882-92d1-2bfee2950838} + {04750761-d89a-4a17-87cb-dc6bc0792de9} - {6c9ba10d-a26e-4e6a-8f33-bdd4a2ec3218} + {ea69567e-1b8d-4168-8cdc-70c48947c8b5} - {423b4f67-fdd5-436b-97a4-4b1311568099} + {b55e27c1-b4e2-4177-a64f-9e23c8f7587d} - {25f6b863-02dd-44d0-9430-97c6eee7d1b0} + {d730ed84-3aeb-4086-83e4-75300427b893} - {4b96b87e-1e52-4b07-834c-85bbca678d6c} + {e9bb4d8a-f663-44df-b229-78430e21d14d} - {81618bc1-5d90-49c3-b378-199d10b190f3} + {edbee8e6-0252-4785-8598-c5ed49f14adc} - {3504d229-8a6a-4ba9-b22c-e4a33b45d38c} + {4bf38079-e7f1-493c-8ad7-a392336b223d} - {c2c3abc9-4777-4bf5-b456-bd45b10adfd1} + {7a2cb894-4b84-45d6-9bc1-a344f8310f10} - {cac35a19-3ece-4f9b-96c5-fea7e6d8fbfa} + {c6d6b9b0-1781-42df-a404-fc34726eee56} - {e8376318-2015-47b5-b50b-7f168329668d} + {4151427a-177f-4b1f-8b47-aef9a58dadd5} - {70a9c9ee-9356-40fa-8a1a-4ec9465c725b} + {70fa3d7c-2d17-4d43-8474-e9d219fb3f16} - {18ceb09f-b777-4ff5-a4a2-23b1d36427e7} + {a2586a9e-8018-4177-afd3-fecaa0600969} - {f49505a3-6f0a-409f-ba53-e50e00c6eea3} + {2ebaeebe-cbae-4247-b644-f02b3062fd92} - {a383b2e5-530f-4fc0-b434-170087b350fb} + {0b0684f6-9da6-49b0-a70e-7cd5cae34a0e} diff --git a/Net/Net_vs120.vcxproj.filters b/Net/Net_vs120.vcxproj.filters index 6382c5dcc..a3f0eac6a 100644 --- a/Net/Net_vs120.vcxproj.filters +++ b/Net/Net_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {20226d40-f12e-4d93-a047-91b335d171d8} + {c1fb6f03-0cc5-4487-81d4-d3ffa5263aa2} - {3f28f279-7cd2-4b18-9c22-9255108b440a} + {6eccec80-e79c-40d2-b5bd-6c1b2b150835} - {d592797d-4447-4653-b006-c05f42aa3d1a} + {c95524d4-6bb9-4ab9-b105-8f6652a91758} - {89d30108-61cd-409e-978e-bfee24b2c544} + {ea086ec5-a8a6-4564-9098-4fc88aae9e85} - {3685a932-3a17-4d73-a760-d594ce59bdf4} + {84bf1dea-3acc-4d31-bee8-e15b4f6ca334} - {b7fe022c-4ab8-4baa-b094-4890ba4e1890} + {1f1ca25f-ed59-4fda-8722-d27a7d5ae6cb} - {4173068f-0ac9-4bc3-8cc2-90ed730815ad} + {ef9ff71d-7498-4cfe-8dfa-0e2cd7eae454} - {ca5341c5-ede1-4a99-a750-c553df90567c} + {31b7f5cf-35c4-47b8-a28e-a4f613fc23cb} - {eae22c1f-a613-4b70-b2b8-3210530d8347} + {8fda26ef-0457-4406-9928-4d0ca5bd36f2} - {612ceec5-0f2b-4e0f-a344-cdf9c0f4497d} + {29b719f9-7e8f-464b-b0e6-a12832edde51} - {ed856472-c113-46c9-989b-f92f17fc56e0} + {d59b36d0-3bf9-4c70-a2a2-83ebca6190fe} - {a75f2870-f628-46d8-a4d3-ba452923cca3} + {82ac1485-5625-4596-bf01-32d4dd4551ed} - {69440fc1-9228-4345-a1c2-0c04e4d37ff0} + {7bd59e57-6ba9-4241-948a-2d5225ada9f0} - {cc896121-0606-4507-87b2-e4b76245f6c2} + {6db2f8a4-58ab-4d4b-b4ee-6b8c44bcc77a} - {3d47ca95-1ec9-4d1a-ae65-d2568636aed3} + {36b7d68d-f4c0-40f4-b2cd-c05415494fdb} - {844dc5d5-943c-4374-a0dd-9ca3e683cbf7} + {f5fd80dc-785a-4116-95de-9ad5e5e30e48} - {4e39a4e7-3d0a-4bd6-8a43-83db7db862b9} + {7b40f305-799b-4817-a0a4-f8dc26ef8280} - {33663199-5274-4c91-a08c-b46c9335716b} + {26cf0d51-d3a4-40c6-89cb-823ea29a3b32} - {0a1b2f6a-cee3-4c12-904f-455f583fcd10} + {a9ab6bbe-035f-4b15-8308-23c2d5c5c5b0} - {142f6855-779f-4fe1-98a7-40cdad53235c} + {97449afa-7e3f-4a94-bf6a-bcf8b3c559de} - {7cd42e62-555a-48e3-9257-bb1f7fd96705} + {cbee46b4-10cd-4e85-b213-775b18a48b27} - {093b4183-cfe6-4d64-96d2-e836c861fa0f} + {978ec966-0baa-4eaf-9bec-46137094e40e} - {c3b2b040-cc63-45db-9e61-53f255a7b8e5} + {fb5e87e7-9fa3-4a1d-8b12-81b8975a1bb7} - {1d5803f9-f1df-4946-bb34-a2e1859c9f01} + {ab7f35f6-6531-46ba-9112-dbe1adc17a86} - {bcb39c8a-d124-428d-92b0-01275b149deb} + {39480011-37d1-4e02-a1a8-46ecaecc1b70} - {6f2e0d13-43a5-4e03-bdf0-b9c483f554cd} + {4da52bd4-4425-464d-a2a4-bcf0c7d583ec} - {d06344fc-67f6-4a18-8910-7137db5b4eb5} + {4e056c46-8c43-410e-8992-a2557bb5085d} - {dd53c09f-ec3b-4fd8-9ede-2df2f2f71f5b} + {384c70fb-efe6-47f9-a767-b77a8c90913a} - {46422925-b98f-4b7d-9d31-65f1f92a405e} + {1c676956-7790-4573-8f64-261637e0e995} - {42dcbce7-d1a0-4645-a540-2906af73a4ae} + {98a353ee-344f-4d52-b659-0c34206236fe} - {5277930c-afaa-46da-9d2e-16d36333be9f} + {094f6cd4-ae17-4bb8-96a2-ba28b28bafd2} - {10ed9005-a740-4621-bdbd-22e814c99cdc} + {cb531016-361f-4552-9f11-89acd0e84789} - {aaea55cb-0b7e-4bc7-aa6f-6f3fe058517c} + {42e3ea54-43b4-4947-b769-5b10904e266d} - {ce4a6a5c-9fb3-4b89-b869-7f3015e0f576} + {d216f153-f522-4996-9487-9900ff406971} - {fa8c8263-1ba5-431a-ba5e-fab5ba4519f9} + {e3c44bbc-9fa5-46f0-8e2d-46f96215dd5c} - {a37dd266-d220-41fe-b0f5-e4a324c65e15} + {8c331d5e-4bf4-4a5c-b3bb-63cd7e697245} - {8ecd65fc-aa96-484f-a2c3-fe64c199f3b5} + {3f978a84-d201-4935-98d0-81a6270eaaf3} - {dce62d3c-ba92-4163-884a-8d74bb37f2ac} + {0ce8bf97-eaa7-403c-ae0e-acd1e280ffe3} - {4d4c3689-9575-49f0-a46d-8207821bd008} + {6a9d9d39-df6e-45c5-9699-a80a75455ddb} - {56cd246f-769c-4f04-861e-52c73ff2cdfc} + {d40068bc-3c03-4c4d-a98a-7a74986e78e8} - {05e1cee3-82c3-413d-a50e-e6ec977d05be} + {4ed68535-ba22-4131-859d-93c0df8b0bcf} - {ccc8ece7-11d6-43d1-83b1-b29018543e26} + {c3abe62b-e76e-4b0c-9507-fdd522832504} - {99272443-ebf1-4c46-98cf-7a078a2b27b5} + {bb5d3aa9-b003-4597-880e-52dc6df89a52} - {4fac6bdf-e248-4814-ad50-5c18a41de7f7} + {b76a70ef-3488-40a6-aea9-cc7830c9e216} - {dfa8ffe1-6a7a-48ee-b80c-c48c66a77cda} + {8842de24-0127-4ab0-8293-d3afd6cbb608} - {f1d8f472-6b43-4835-9c9f-1e06d9b89226} + {5d6c5273-3993-4c57-9706-4e6055cefb70} - {15a0b857-9eef-4640-9ec5-455cb78398cc} + {775a1383-309f-40ef-8b7c-f45928f25c48} - {953a7cb0-61fd-491b-b8c1-279cd814c8d6} + {76640450-b88c-4a37-9119-c0e3b8cfa197} - {b7ed54d8-a138-486e-a349-114664dd7876} + {a95b5044-8a05-4a32-bdfc-8a6304f92567} - {0d50ea4d-4875-4268-92b0-d5ca0859fa29} + {676e841f-3317-4021-86ee-084556dd8e55} - {6f5c8ac8-585e-410a-9f7f-d3c50b5cba4a} + {2a6c7bef-5aaf-41de-842d-716baf31ab9d} diff --git a/Net/Net_vs140.vcxproj.filters b/Net/Net_vs140.vcxproj.filters index 6186e434c..65d9c1903 100644 --- a/Net/Net_vs140.vcxproj.filters +++ b/Net/Net_vs140.vcxproj.filters @@ -2,157 +2,157 @@ - {327293f1-d0c0-43e2-88d9-6338c64d3663} + {e5001463-3b0d-4f10-9c9c-df1d78ffaa24} - {802ea8e2-0727-499f-a42b-36c4fb985992} + {46c24d22-2a21-42d4-b160-e85833f3ef2d} - {1f1df6fc-0ea4-43d6-bdf6-67b6601e9191} + {64f1fc25-299c-45c7-ac0f-14b0ed956ac8} - {20978521-ab21-43d5-9fe2-31ecade5cae3} + {011aca4c-88b0-4900-84e1-734b9e6e9bd6} - {f8ec4aa1-d0e9-40b8-8583-0a9f13e61ef5} + {34ab49b7-2b6d-483e-a991-e6004c0ffb30} - {357e66ab-a760-4fe5-9ed2-c04027abf116} + {efc330c9-7edd-407f-8460-389a7ece3969} - {15c43f53-4c06-453b-bfaf-ea23efc5f75f} + {a6aade95-9855-4ada-8502-cebb70eb3a96} - {86661b65-52df-4c89-b1b2-18d1ce425dba} + {c9187958-ec60-4553-9dcb-c9b2cbf72ae7} - {0adb0116-c65b-4853-929e-ada17c6eb45e} + {acb13a91-a772-457a-9204-449696aaf257} - {c17dd89f-9d2b-4274-b124-0aeb0a3788f6} + {75fdb65d-0c51-4a0b-9ff7-2964a72f5f7b} - {4a6ce9d6-7db9-4a98-9a1f-6fc06e7f047f} + {ed212b76-48de-4603-ab7d-b0d1de81906c} - {bef0ac6a-9f35-4b7c-97f5-d538f387ada1} + {60ca30aa-4a3a-4648-9904-c59f3b687d9a} - {327b7d17-6574-4024-96da-4d0679df4d90} + {bc3dc356-640b-41b2-a5c0-6e5c65b9c6b5} - {4479ec0a-9ba1-447a-bcd3-d4f2f199e4bb} + {9f0737dd-fca3-4a4a-9799-e08ee671fa67} - {44ba159b-5e9a-4c56-81b5-5cb493327551} + {ade2a8c5-0b64-4c14-91f9-9c0aea6a2a40} - {1581dc0f-aafb-4746-b6b6-34b4a5007ff8} + {337393aa-c92d-4ae3-8d98-0886a57340fb} - {aeb30e63-24cd-45f8-b1af-75508d12dd6f} + {e5289d86-9c75-48c6-b029-6ca4818c0e2b} - {4b37463b-0a68-4a10-9f91-9b6ad71a2390} + {d2c55a51-1b09-4e07-829d-abbbb257e34e} - {290e0abc-2fde-4545-8f89-c42684b4a0e5} + {ed6eeea2-dd3d-40ab-8c2b-7ff2aa12d743} - {a57692cf-b95c-47f4-9e6b-2e37c5a3607d} + {0a44e2b9-3d40-42f4-97ef-4563af26f50d} - {433a9ed3-4cfd-40f0-91d3-d4ab058dc9c3} + {d77929c3-26d0-42c1-b4e2-187c13889496} - {9c6c1e11-3052-4be7-9027-00a81dcf7967} + {6192da87-b3ea-4e85-92c3-a72941be14e8} - {cf08a45e-639e-4edf-a548-4a23f88e5bc3} + {5b33ba00-6863-44d2-a0f1-25cf737faf19} - {8e9e0e9d-0904-404a-ad84-94428cc8f08b} + {758ba13a-c164-47d6-b1e8-9de9feef5a1f} - {42dde18e-1b9c-407e-8765-6d6510a7ec8a} + {b99012d2-0268-400a-9d5f-ec43d90ad527} - {12a06421-9e81-4c96-884f-b4ce5271a4bb} + {4a5328e5-6e4b-4555-acda-7f268f7140c6} - {a722934d-e726-48d5-ad97-b0111b91adf1} + {4adc2cc4-312b-446f-a034-8f957c10a4be} - {537bc1f0-021d-47b0-8480-dcb5a751c60b} + {dcbd665b-1d74-4863-a213-cabb25c66b09} - {1d046918-90a0-4782-9cfd-10a444f0f6a9} + {c2a06f9b-57ec-4fda-8d8c-4fe1e8fe030f} - {02032d59-badb-4c20-a36d-397442e3ccea} + {4f459e19-fdd9-4871-8d38-f5a88227307c} - {109e5c7c-82f5-4130-ae13-99f286b33339} + {66d95374-d1c7-45e9-b2ed-afb551ebdb8a} - {a509c79d-8ea4-4a92-b2b4-fbcda8e195b6} + {f509fd81-87f2-44b8-b170-93b731213959} - {575c78ad-d3ce-482e-b1bd-0565c4347ddc} + {28cf0e94-c417-407c-99c0-00ab61666194} - {9abdae83-305a-4029-8ddf-851a35ff84c3} + {72f38377-cfda-4fc4-9ef6-7f39cf65d860} - {0c026b6a-aec0-40d8-bdaf-8b5bdfcf400f} + {66d4a379-0469-4928-b5ad-31e9ed05c1eb} - {6faa64c5-ad49-46af-9440-7ff992a42edc} + {e94a73b2-cdf0-4034-8308-dc1bd77fb1a3} - {3f71f93c-171b-4ce5-bd80-b358d93f1f14} + {1da846c2-6051-42d6-816e-f0666bcc34a8} - {12a46f2f-a165-410d-9c0c-1aeffa7f59f0} + {4c11dda0-bbc6-4fa3-949a-e45a9d1df7cb} - {e9d2a8fa-42d3-43ac-aef0-b440a6aab1d9} + {cc48681a-9335-4d30-a99e-941879e46c59} - {4550d9ea-842b-4973-829d-45aecb1dd879} + {b63f31fe-d595-465e-8ae4-1a1d3df8478b} - {3b2ccb96-8122-4ff9-ad9e-6482c3dba58e} + {6e03383a-98ae-47d9-818a-1c37ed1ef06c} - {55492259-88e8-42b8-8073-306c3e70be66} + {ead6f4cf-3410-4e74-801d-c1e4f13e7a6b} - {bbec80bd-f48f-46ca-babf-2239a22bbf46} + {b942da80-895d-464f-a4d0-818055a161b1} - {21493a26-7e65-428c-8435-bf0c68dca5d9} + {1e403f09-6b6c-4643-92e9-8cfed63d7992} - {2eda151e-32b0-48b3-a744-dbcba43de5a7} + {844d74ee-f49a-4550-a411-da725ff9b6f7} - {8a2c0cb5-5663-4cf2-bfb4-68ecdc2143b1} + {b949132e-1be8-433c-9bfa-3cafad8b7717} - {fe9de743-562e-4919-baed-582ab7d4a412} + {9f84fb7c-a817-46f2-bcee-3c2c82857af6} - {4bae7e10-9878-4225-a851-38919129cf51} + {82a18aa3-0beb-41ea-92a8-0571b3fbe068} - {0c2decbf-0f48-495f-9fdd-5ed2a6a3b7f2} + {f58e20fa-c844-451e-9843-8800c86ef44c} - {4844915f-4d8a-4d0c-a90c-5505abcc8464} + {741448b2-2acb-4c6d-8792-ba354be151e5} - {3543e216-de43-4d98-88cd-f0a2da4d6925} + {c2ab1ef1-37b3-4965-9ccf-811ce694a3b9} diff --git a/Net/Net_vs150.vcxproj b/Net/Net_vs150.vcxproj index 9377ded9c..758c70111 100644 --- a/Net/Net_vs150.vcxproj +++ b/Net/Net_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoNetd PocoNetmdd PocoNetmtd diff --git a/Net/Net_vs150.vcxproj.filters b/Net/Net_vs150.vcxproj.filters index 085219fc0..a90f19da7 100644 --- a/Net/Net_vs150.vcxproj.filters +++ b/Net/Net_vs150.vcxproj.filters @@ -2,157 +2,157 @@ - {eb0d3175-49a6-4381-9ba7-497a1930d5ff} + {d447c6ed-bb53-450a-82a4-103cb961d73a} - {0bb81fc2-2c02-4cad-a898-0540dfa9494e} + {5ef00c2e-d6bd-48b0-a718-e8de6653696a} - {95ba845a-f0c5-49ce-82e3-2556943fece3} + {7f944b02-bd07-42f1-b045-47163459c11d} - {11efb6cf-6685-4fd1-8992-e43266c4b444} + {b2bb74f6-310b-4411-a597-44265d485af1} - {7ab9bb92-8829-42b3-b5bf-867e33de961b} + {93bb7d67-4760-48f1-9a7e-72609c258921} - {a65d7c8f-8318-4087-ad00-4957d99bb20c} + {d81bc09f-5010-4888-a7a2-0c842b0acbe2} - {390b3ae5-8189-49f7-a8e1-296164539f22} + {4b0fbc00-31c2-4ced-93e9-83c45f6042a8} - {7e1f57ae-a74d-40e2-a651-d227ff6a2361} + {0e47417f-a387-4723-9738-3af33447ff3f} - {c2db779d-db53-4d24-b532-949f587bf4ce} + {50c493a8-ff0e-4bd6-92e1-90d5408dcabe} - {812176c7-7584-4c74-bf4f-e2f5b71f2d21} + {b28d98ad-8966-4edf-b12d-57bb8bde9e15} - {b88de86c-e0cc-478c-b935-fc673005c628} + {a6c334ca-8972-4c95-8bbd-5906e380e7ad} - {b58bd750-ea42-473f-b998-612d814cb7e9} + {6462bb39-3270-40e4-86ea-9210e4df84d2} - {2ac21899-fa95-4964-a440-4c526492e32f} + {fab9883d-f4a3-429c-8914-d9ab6495a808} - {8311a2ab-aa08-45b0-b875-5b7822ceaa0d} + {64f7eb15-8dbb-4462-947b-d7d3461c1e30} - {329667a3-6240-4fa1-8716-65121592ef8e} + {4c78c89f-27b9-4323-81ab-195165502945} - {162dc987-14df-4d67-8d70-ee1c34d747e3} + {5d9c858d-264e-4aa1-aeea-fce81c619da5} - {3f1ac9eb-90f3-4720-b8e3-132791477e0a} + {5f478ac7-9855-44c2-ab00-84aca5d565ab} - {6bc43e99-8761-4f02-8f26-a4f5adc57aec} + {12e9ed9d-667a-4dea-9ce7-0dbf27b88c47} - {64be7987-554b-4692-b081-8c65c2dbbff5} + {e7ebda27-6a12-4cf8-aada-288d2f4559cd} - {6dcf8c06-856f-4143-90cc-5d8732e5f426} + {c9c050f9-e525-469e-af99-f616f61b1786} - {eaa8f79e-c294-4009-b832-0ddd639d8ba7} + {224652cc-f840-45f5-ab56-bed3c5396da5} - {83c19ec4-0444-4ae6-8742-77076804a962} + {03726a9a-00e6-4ef0-b8b2-dcd710fd7b18} - {d7fad3e1-58bc-4c71-9a64-3fed964f5b35} + {e95ead79-7e65-4745-9723-de1d6300c56c} - {a387db79-dcb4-4afa-98f8-9fdb0891188c} + {0cc50cbc-d580-4567-805b-bd8dacaf89fd} - {c7504644-bc5a-4990-943c-46dce27988cc} + {a9433115-0e15-4474-9a2c-2531d8e77b33} - {dcc830b4-88ec-4a64-96c3-6c031d02876d} + {63fef70a-ecc1-4851-b219-d0eee042e58c} - {f42c974a-7fd3-49d3-84cc-e5724a1c7eb5} + {1acb0cd6-a2d5-4f52-bc44-49e34a5427b0} - {160a62b7-b037-4919-9774-e184d78665d3} + {93259054-8797-4240-bab3-4724049c4a71} - {f69dc832-321f-4c0c-b74e-8e511aff3f0c} + {a7d3bb88-447e-4a98-93b0-835e16bb72b6} - {af5a3f1a-80b7-4ea9-88b7-89ddfa70f2d5} + {b6f7d714-ed49-42aa-8ecc-8068e8586da8} - {55446d87-e1e7-415c-aeca-75e0f77c5878} + {6c9fb479-dcf1-496f-ab35-4423ce39cfb7} - {a7181a07-86f7-45a3-a8a1-b691d45db670} + {a983e94d-5127-4cac-bfef-b564c79cd97a} - {aac3e923-7695-4ea8-800e-f25fafa2c352} + {e2291ef8-fe25-42e6-b86f-e43c2719a061} - {d0905a38-cfbe-4fd5-9964-7e65624a0954} + {3cf2a719-0024-45f4-b690-434a054b101b} - {14d6f18f-9d20-414e-acc2-1a80572411dc} + {b7c7f027-4b3d-4257-94bf-db341896a7fc} - {0f64bbd1-ed96-438d-abe8-622713685ac4} + {86088d97-d11b-4415-a163-dcc7751d8481} - {bd78d35a-2303-42c7-bdf2-8fb7e55d90de} + {33f69209-4f45-4540-85ce-03f83da9fffe} - {a24bae6b-3b5b-481a-b3ac-66a941350410} + {e0d52373-e0a8-4b64-afcf-d6960fd7b3f2} - {b2845e81-fd8d-42b7-8a05-cd10206f9157} + {86f01191-a784-45ae-91b5-0e3d98429744} - {12f7bf7a-e22f-400b-91cb-fdcf4e1e33c3} + {4a50d2f2-fbe0-4cdf-9a50-c2975a72e54f} - {e1c0c1c3-637b-4ebd-9988-d7ebfc47d4bb} + {b6673854-da26-49a6-b905-36c613e30b40} - {95dc64de-0ac0-498a-af51-d760848c6af6} + {ad91ef40-01e7-4e29-817d-13346f2da302} - {f1236e38-4379-477d-bee5-c2f6407abb6c} + {eafc1521-f209-4ef8-a7ec-22327e4e8e04} - {9bf079ae-cd56-4a5e-9a20-5dbc973e11eb} + {7108ff5a-1224-46f1-afec-ff0701c29a7e} - {31c03ace-26e4-4075-8c94-ece8a93942e5} + {a297dba4-c73e-4e2d-8d67-939f9c9c0df4} - {374a50f2-0955-4fa7-a661-5f49fef1241b} + {22482dd0-c049-4aef-94f1-65817cc303bd} - {a628ebc3-6be0-4c0d-a67f-43c02d621393} + {ff0995d3-8ba1-49f5-86e7-55d54f04f9ee} - {dadc280c-18d4-45a3-aca6-aa0ad4d73f8e} + {f676bc78-e4e0-4e2d-9e71-ba0ec778c53f} - {3cb9856e-0bda-45d2-a61d-bf3e50356423} + {a3ba74c0-d70a-441a-b939-37943440fa98} - {18903566-9d02-4c7e-bb5a-27f1c94a0352} + {617359c4-f89c-478e-b13b-ab7f8e60d872} - {2f7bbb60-4d9d-4671-b5cc-f1b6164f745b} + {49e13bfb-3da3-4587-beb5-c12f436bdaff} diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters index 015ad7316..f020b0f8e 100644 --- a/Net/Net_x64_vs100.vcxproj.filters +++ b/Net/Net_x64_vs100.vcxproj.filters @@ -2,157 +2,157 @@ - {3ecf1d29-df14-4352-a8fc-35ed5029fdbf} + {d4f4c773-37c0-4caa-9160-b57cb562a965} - {6e76bb65-4285-4eda-ac8d-79a05b3bc3b6} + {d338f8b1-c47c-4a3a-bda1-e7414c793de4} - {e2b0bb30-ac70-4d46-8c17-0a1ec9bac235} + {5f22f34b-ec64-4608-9c24-be4e00257591} - {92800a98-bbb9-4053-9ef0-25c4dbfc8289} + {635d1b1c-69b7-4206-bc25-d58e1da606b1} - {814cdcfb-1bda-40fa-aa03-198cfb086014} + {8cfa81c3-2e38-4a12-bbf0-74e32b26aceb} - {c947159a-8794-412e-ab75-b2ccca14f651} + {32c3c966-5014-4714-a018-cedd2bf30401} - {ceefa62a-ed53-4ece-963b-3ca1ebecd6ef} + {fd9ff4d3-b0e0-4a8f-9a1a-8f6eb8dbb656} - {6a90ae2f-e7b1-4389-97a5-96afbeb6d6d6} + {9971bd5c-6e9d-4265-b3df-691f5520b49d} - {b6f1b95f-7e7d-4171-b6af-ca324038462b} + {7d7d9503-32fe-4718-aa34-bcbf933eb3e0} - {b8580415-78d3-491f-8bea-0d0465ca431b} + {766b7215-6d18-4b28-a368-9b6dd3531437} - {58cb6b5e-6b66-4c85-87a7-ffdec46a259f} + {72909623-6ff5-4d93-bd16-96ebb3e2cda2} - {b9bb483c-ded1-4c5b-90bf-9cf443e2ff45} + {ff317c7b-7df3-4ef7-9253-f4cf49928d75} - {1926c64e-2c87-4013-92b7-3357548f7986} + {ff64fcdb-e54c-4d1d-bb5f-eeed8e35e8d0} - {41b48c57-248b-4d6d-aaf7-6acf7825c6ac} + {3ab5d195-d565-4f88-98ec-fabd7ccc88fa} - {defc6aa3-7892-403a-9aa5-1db5ad423a39} + {8580672d-eaf0-47a8-8ede-581ecb322bf1} - {2901253d-0e54-480c-8d1a-c4eb70847409} + {235a7654-7182-462c-99a3-a2d3f65c7359} - {67cf2e74-21c1-446b-835c-41a947272b7c} + {57ccf6a9-47ec-4f3d-9394-75472ccebf39} - {7adb2ea5-dcca-4fa0-906d-f411fcec99de} + {5e10f9ba-702c-42d2-b752-e648c6954912} - {81dee9d4-5b7e-4c8e-bff8-95d3a207f204} + {1aca5d84-2365-4129-aba4-17d8668dde1d} - {ac483e49-b7d1-4761-a2f7-f38dc3fa5605} + {51ab2078-556c-4151-99f6-7efc38330d5d} - {2cb341a1-641a-4cd2-8484-83c8a283fe12} + {47bb360b-a6b9-45e0-b109-f8e261204600} - {08cd7ef9-b68c-4d41-8883-3331b478b5dd} + {2375b4a0-5316-4578-a5c9-e8aeb7d708f1} - {e2f3947f-b4a0-4239-8a1a-4572564c6e4a} + {677d5571-0b42-4ae2-8bac-760d2be9316a} - {193551eb-3f9c-4ca9-83c3-ef9beb4edd55} + {0b369bb1-94ad-4de6-8027-29019bf79e07} - {6dfc9ed7-6dcb-4b8b-a304-15a10aa92c99} + {59aee667-385a-4cba-b0d5-5ebe755499e9} - {3650b621-e03e-476b-ae5f-9c27af32da23} + {79152399-ea9f-414b-b376-aa857409e276} - {1badbde3-67f4-4198-9ea6-02f7c2a66199} + {89d9465c-9ae0-4497-9526-5043ab2a1782} - {ec469819-b26b-4dc7-b1a1-ace1e1e9d14a} + {d0d05b95-501d-423e-a70e-21832fd80b85} - {02fe2995-2549-443d-8f3e-e36787355f41} + {1ac8300a-3a80-4ed9-a058-420f33654470} - {b400e6dd-76a6-4579-be33-b78b36cec0d2} + {3532197a-e0bb-44e4-8f6e-d78ed34063b6} - {829b62e5-047b-4173-b1aa-01aa9d659783} + {b7a499ac-3e02-4b66-b25b-d536bf82649e} - {125ee94d-72f8-4d2a-9e3a-0b1ab6e64520} + {493a7228-9e15-415f-b423-625865afa46f} - {87a3b48a-fe24-4370-a8b3-debccfdbb7e7} + {ba515ebd-3a34-460e-b54d-f175d5133db3} - {356eedd4-478b-44f9-9bb9-c058b2ca3f7c} + {a2574dd7-665b-48e6-96d5-92076d1dd7d7} - {ab0b4a30-f563-4628-b46a-6233f5788812} + {44bb9673-8ad5-4f8f-86cd-fec16b177a34} - {61a2bdc6-5ba0-4118-b39b-b7abfb60d81f} + {1344e4d6-9f62-4b04-b4bc-7fa32fad6c79} - {3104c162-2705-4086-b3e4-f05d2e27abda} + {8abc40d9-a500-4c70-8daa-fe73b6a6e01d} - {3f871fe4-633a-4080-8a9d-2d23356c637b} + {d6323b3f-552f-4e44-b146-20c800502824} - {301b098d-3705-465b-a451-c989d8c4eef6} + {89348760-ca73-4271-adf6-a95d707338b5} - {89e37240-e89e-4b8e-bc26-edcfc677fb11} + {13e53618-eff4-4154-a3cd-345d525915b9} - {fd942a3c-35a8-4542-bf2e-865ced2720ae} + {bc820ff9-186c-476a-8aeb-e3ba791968e7} - {73e6202f-5739-4d3f-8dd0-bbe6ef88901e} + {940d5340-44ee-427f-a0ab-377580558444} - {5f5fc393-74d0-4e28-b4c9-f11ae53ad8f1} + {9fb9c37a-a561-4264-a044-bf7d591809ac} - {4342bfae-fbb1-4d63-8b4e-d469fcd1d711} + {36748040-fbe1-4db4-8c65-5f3f60582702} - {3e2c31a9-22fc-4a6b-9719-2158535f366d} + {29111831-d668-4bf4-be0a-3b6744498c58} - {75085c62-b3e4-4cb2-b77e-cd7f4e142878} + {327ff602-b6dd-4b7b-833d-7427edd10698} - {7e841082-bddf-4cec-a49d-17b8b67f6825} + {d5c1e9c3-de74-4787-8d07-17bd18d6d2f2} - {97329ab3-96b7-415a-82f0-b6b56a5683a8} + {a9be2987-76c3-4097-a576-130fa84ae185} - {a29f7b88-8b7d-4e42-8834-2bc04d1a460e} + {9ad179c7-616d-4ef3-9272-1810e7911498} - {0d72045d-b073-4fd4-b630-3384a62b8ebd} + {291e6148-0b8a-4382-a205-e42daf0e25f6} - {21ab11aa-72f6-463a-b42f-48408073df57} + {d8a9a0b7-9bef-4719-97e3-903c83342971} diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters index 130580335..162fc6eb8 100644 --- a/Net/Net_x64_vs110.vcxproj.filters +++ b/Net/Net_x64_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {d99e37a4-e329-4697-9594-27384d023930} + {68dccb40-9b87-4336-9b5b-2ba80544c4b8} - {02691222-f982-4c83-8abd-753ac8a5e421} + {cdbb502b-1c8a-440b-ba86-bb97e3810485} - {b2485ee7-50cf-49bc-aec1-327f7769eece} + {0fcf04a5-2f3c-4b7e-abf3-aa31b7e47e68} - {a7809dc3-1483-4e95-9223-3a09a9219145} + {eef50bda-2f35-4c1f-8657-9f9e3bf36aa8} - {603307f4-b176-4e06-a06d-8a73aa1c1aff} + {956b26e1-2b67-466b-a43c-9684b87ca6c4} - {60093744-df1e-497f-9b60-6e73b8c6c1c8} + {1f1792a5-c86c-44c8-be26-4997eac41a91} - {8bd17f97-3ed3-4829-9cad-2aa7d32d2203} + {4011d25b-a3f4-4146-908a-e20ebd4426f2} - {e2f52dcd-0109-4241-8908-84f5e10d03c0} + {02b53606-5846-4f45-9f83-11a7ef1a28ff} - {489d42e8-0b5e-42ec-8779-ab34a622d873} + {fde7dc8e-3cfd-4cb1-b842-e48303134ac0} - {fe93be7e-07b9-46a6-89e9-4c9e26fc1fac} + {3c868c72-90a3-46ee-aeef-35569248e0c5} - {03122b20-9e92-49b9-9840-b5d099fe185e} + {278015c3-e341-466c-b435-3019eef0e1bb} - {843e3cb7-5ba4-4516-84ac-b82651c65a0e} + {8601ad68-2959-4f11-b7dc-c76fbb307a0c} - {b57ff255-d76a-4bbb-93a1-fb61e5b81fd8} + {9d010029-403a-410a-9269-51894b57d952} - {2e538433-80a9-467b-bb30-a5bb2f871573} + {6b7cbb0f-f0c9-484d-9fbb-c4fe8e221015} - {65871ea5-bd04-4739-9bff-e8598a933cb2} + {7c78ddc8-d363-48ce-b0bf-2963fb678944} - {1f860b22-d8ac-4b82-88d9-a5c68a2e70b0} + {86d7e708-a1e5-4989-b118-2c128542fd89} - {0cf849e6-d54a-48d4-8382-bbe9c52ecda4} + {c9261842-3292-4fc5-a9fa-2a7743554b11} - {5ad28dd3-eb3c-423e-b702-38453495e682} + {52c01c89-ae71-4b06-8ff1-549e1427f2ac} - {2d8539f8-e510-43f9-a127-d9e0e5b4e935} + {24cded60-61f8-4870-96be-8ab933e40146} - {d7a8df64-eb73-4845-8bbd-ea51b73efafd} + {3ede0ae7-fe96-462c-9e8b-e0b3138c48bf} - {ce12c2fc-7ff7-4b1f-89cb-60e2a4998b4a} + {7172d393-f94b-42b7-be6a-610d4455acbc} - {73d45f0a-1444-4a6d-ae6c-37d0a1a23340} + {41c5eb60-d788-413c-bde1-5db935de095b} - {e92e42bd-6a09-4cd7-b236-ec057bd73c65} + {7900ec71-21b1-4be3-8729-70777447d447} - {bab1db03-d989-415e-b87e-9f61610f53c8} + {3b077133-276a-4f61-b701-bd7547083584} - {104374fc-fa85-4d17-b8f9-47c9be4f14b8} + {76711834-4ec9-4ebf-9e59-f7b92ee6b4bc} - {bd72b134-9e98-4672-981f-572dd0ab98f2} + {9e9af05e-04b0-44bb-b395-b4ac23450375} - {cb067b20-5d34-4381-8a80-52f7e19139ce} + {4fff7a76-d641-4137-b37e-24d35cd79047} - {faf79489-1cbb-41a5-b362-d2620a3ce848} + {5e7953b7-1db0-4304-9188-a6b82a01915f} - {9c4ab55b-4a54-42a4-aa00-536354eeccf1} + {dcd6ba5c-eaca-4197-946c-70a585d65032} - {f7df8892-95f1-4eac-b4cd-3baab95bfb09} + {196a9c44-3a8a-4f79-a938-9f871ea063ce} - {5a6eea3a-b645-43e7-9fba-240d4fb20634} + {82192105-35df-457d-854d-2a4747babc07} - {f54b79c6-1bcd-40bd-bcb9-151cc9b5a63d} + {8cb72ccc-ab8d-4222-80b5-72a035cb1d4c} - {d381c84c-3634-4f82-8051-9f0b0b89ffb6} + {48d0ed93-e44a-43e8-b094-a2b3390d4912} - {95def0b7-2a7a-43a9-a1cb-8009a4440e76} + {e31b6163-f111-4bc7-a500-9966ea76f49f} - {3f658b6e-b7c5-43d7-983e-4f8ee108f0f1} + {055fc518-2983-454f-9e60-c8070867420c} - {b7cacee5-d40f-4e38-ac49-e7800d09e7fd} + {2d7fde1e-667c-4042-a3ee-07c2a5b4f54d} - {557006b3-3121-43f9-b28d-d387d97ecf4b} + {45858e83-88d6-4693-9758-a52379a4f552} - {aebcf1e5-2c35-48be-869f-17b0d9e59ebb} + {b0f07b33-c602-4f33-9d36-6824c94b5fe8} - {ed180977-b89a-4c70-8f71-1a2101d5a934} + {29bec552-eb1f-47a2-a2a9-d308df723bfc} - {455f76b3-0ea8-4c5a-bb08-67ae9ca7062b} + {f084d053-688b-4193-b74e-70f603509717} - {3014291c-c2fa-4903-b83e-f90cdaba09de} + {fca036ae-9f66-440f-8d3c-c1ccf3d585e4} - {7782bdbf-94d8-4dde-9a7e-d6453c3fbcc4} + {a752d8c1-1eb2-4b8a-9bec-20d93ed23d10} - {449ed83d-4727-4401-8bd2-3b80a00e4095} + {04e65d4e-1516-4c3a-ad35-d00d4628a1f8} - {a859141c-9435-47b5-bb76-45eb7cf8a6a4} + {d15fedc9-7c36-4473-8c40-cf959806f188} - {f03bd706-ea93-4c8d-8e65-6f9dcc025da4} + {de6b8578-4c03-4523-a3a6-a3cf9543a252} - {0276ac4a-2ef6-43d9-b256-4446420d1211} + {36628b33-dc88-48fe-bab6-39d6abf4f6bb} - {778d6ca8-ee88-469b-a6c7-c91debe0d6cf} + {a79c4a35-a52a-46b6-8e8c-47cbca23c694} - {fe76a7ef-1826-4121-88fe-f4d09b0fbf9a} + {7d3d3562-cc5f-4a29-b932-09f185b0412b} - {b49822bc-4aa6-4cc9-8cc8-027e3787458a} + {0713872e-8b69-4667-99cf-475d1f4cccf7} - {df54e47c-4819-47c0-80c1-3f3223040acf} + {adfb1e7c-7f1c-444c-997f-419136dbba28} - {b5bfdb6f-d850-4ba1-a6db-b8ab35000cb3} + {156e0189-d735-406a-9efd-5180c3198b71} diff --git a/Net/Net_x64_vs120.vcxproj.filters b/Net/Net_x64_vs120.vcxproj.filters index fcb144f05..14baee2ad 100644 --- a/Net/Net_x64_vs120.vcxproj.filters +++ b/Net/Net_x64_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {931ad266-3c66-4ebd-b27e-4eda7ace980f} + {29d2cb45-e793-4e35-9eb4-d6f82f1e3dd1} - {66f7ca5d-1ba2-4818-a22e-264c33ab9778} + {f31aaf61-5f7f-4366-a522-109a899a1b1c} - {c3edc8ae-c3b9-4088-9d3b-fedf548f3537} + {2db11946-aa03-48d9-95b6-7ffced49c0f8} - {f72ef01c-4561-444f-9d70-6eb62308c750} + {9f6aa71c-a224-4bc1-b542-990add96cf84} - {a0726cbd-d4e5-4065-acd4-3434bf80d302} + {07d2cf17-44a4-4e2f-807a-b9b01013ad5e} - {bd08bf41-27f4-46ca-859b-5bfe501ea6be} + {03f20f05-e255-49cd-b7f5-645f2614afc5} - {01e3591b-4889-4ca0-8c1b-bc18fc8640c6} + {7a3fa183-263e-4ac5-8ea3-8f796b81ca69} - {6a5da09d-abb3-462a-b70e-d0131749a65d} + {bbf8cbc7-17ab-4691-a324-84fb4f308047} - {0815bb2c-dcfa-4e96-b0d6-3b4839a9724c} + {22770840-cc6e-4670-a352-c620b5a4a826} - {839cb5c4-f9aa-41f8-9d28-82b4c70aee25} + {b2a69fc2-57cf-4871-8be5-22881b8210d8} - {1da34696-9f51-468c-b15b-c0e8664f08c5} + {9af5b220-9de4-4265-a15b-350de92cfb17} - {c0cc2069-49d5-4234-9cf5-2d6d78f3b55f} + {3a8ad7d0-3240-4680-8dfc-9f5377a27ecc} - {81053fc5-e24d-4dc1-96b0-c92097dc597b} + {f320b590-0c2c-404e-b1f3-3e3952d2ecd6} - {ca8110a1-89e4-4b27-974e-67cc7cdb5826} + {1ec33a3f-81bb-48ac-83a9-c2db54a03bd6} - {22a42e32-e87c-4057-9150-0fc91ca74c6d} + {a367a742-6baa-4048-a985-dda1a1acf3fb} - {8730d65e-bf26-4e94-a23f-a9a257d5daf2} + {28430460-9ab5-48ca-ba9f-cc0f384a636e} - {3339ed1c-e960-4c14-8d93-132b0f0d2ef4} + {0f1246cf-c2dd-4ea7-a0b4-022646825239} - {2354143b-8018-4f1c-9ffe-28b7b02845cb} + {e99c2218-286d-410c-a86c-a66f2021efc1} - {942212c0-6c1a-4c85-a82f-bf43b15565a1} + {1865b804-0725-4182-99bd-787be4aab965} - {8d3fbdf6-3f5a-46db-b6d7-e59fab646ec1} + {0917bd01-faaa-4797-8750-1cd05fdfac96} - {1be472bf-562f-4536-b715-2f02546ee1a3} + {b70a1f83-0f65-44a2-821d-cb188d272f9d} - {7aa3ba1d-d514-47db-be8f-8dffb8b7e4ff} + {77134d42-e369-4665-a8b3-721e8e26055d} - {4f733e64-4eeb-4b74-a6b6-107ff369860d} + {a6df6ff7-4385-4079-a956-8fa5b74f826c} - {1174ecb3-a68b-4682-9ca3-4e0c953c0a1b} + {66a3e2e7-98da-4e3f-bee8-ddfeeb022be1} - {0825c268-4532-4206-aca6-9960f90aafb7} + {897e94ac-abda-4cd4-a769-59bbb5736223} - {e5a112e8-b2c0-4c2c-befd-c1276eb2eee7} + {449f4d4e-571c-4397-a06e-0a31d63f55d1} - {a8faab2a-d2d4-4a4f-8787-470bf6f781a3} + {2ed8ea49-4b59-42c8-900e-80e01368764b} - {003e0fac-f29f-47b2-a390-8197b6a5b92a} + {9ebf9b15-0e4f-4c22-b0b3-6efdbd0ecf07} - {dcd62c48-7aea-4c06-bf76-b4e9d6fe689b} + {131630a8-dc0a-4110-b100-21bece42035a} - {2855ff32-fb29-404f-906a-9af115e7d854} + {848f51b1-0e02-469e-95a1-c112bfa0f2ad} - {b96a84e5-c45c-4515-8da2-1ddfa2a1469f} + {4113c974-0169-420e-8d91-6de0930e6e30} - {74cd9510-478c-43e1-b745-4cb17e81799a} + {07b9f698-313b-4af5-bff7-a6a2ecd5fbd9} - {021581e0-8de3-4b1d-b0cd-ff46963936c9} + {021f1e7c-3f41-4c27-acf0-402cb61a2930} - {edb0f9d9-9018-4afe-9fdb-5bbb282d22d0} + {0b977660-7549-402b-b25c-ae78a0a46ac6} - {10fa16b0-df42-499e-bfb8-730146debc60} + {8a881559-7838-4649-8242-8678d1b4ce06} - {4b0bdfb3-161c-4665-aa11-74e4b69e9e6d} + {671a5e2b-07ae-4356-a6af-bc143dc084e3} - {05e5176c-b25f-48f2-a990-14dceba99608} + {cb4f283c-9306-4102-ba3c-896ea6324572} - {dd09c611-b4a1-4605-b11c-4c1f2806b98e} + {2b86224d-4b4a-445d-a482-1420fe9a0319} - {5bdb6e63-975a-4d35-8860-7d0b9b8b433f} + {6f540b22-52af-4038-b2e5-619bcd3651ad} - {e7730f2b-b7eb-46bb-a2a0-46c4d62f2360} + {66230b7d-9d22-4085-960e-30d6379766bb} - {363985f4-df96-4aec-a764-b3bdd280218e} + {3f8b266b-e888-4060-8179-70c511133ae9} - {39b84c59-e79b-4cfb-87a7-0e4cc15ec022} + {08f07fb3-9d97-4ec1-8a85-e3a966ad70d6} - {d2a734ea-b5df-45bf-8f5f-260b94de4eb9} + {26a978ae-5d13-466d-993c-f9b692e8dcdd} - {28f3ed68-456a-49d0-a2d4-5409afaabcb9} + {4a696b49-3ee7-40d1-8283-763412c080be} - {e8f017ed-0dbd-415c-9b14-d41dde04baae} + {fbe200fb-bb0a-4a6a-919b-fd6cc71840dc} - {c6ec91b6-061a-47a1-8462-0ffda32f219d} + {e04968a6-58af-4029-ada5-8b7a835d5a36} - {78a8c8cf-ef98-4925-9275-d80ccda2cf4c} + {0fc99559-9044-4d95-8f48-4de375e25919} - {b6a1fdbb-7983-4e80-96ad-3d0878e2890f} + {916ee04e-ecaa-4b5f-b365-7d4d0af3245e} - {fc306e36-4d66-4737-8db0-0b8e2c21989c} + {2ab8d86f-218b-43e5-8a2f-7142db914514} - {46e35b39-ca2a-4fb6-92d0-120839dc63b1} + {b50f1b1f-df00-48e6-903a-44f293d550c6} - {b5c32f96-05c9-4b20-8f53-cc6baa427c08} + {f3e79e1a-fd37-4df6-8245-96c2d62c3e7d} diff --git a/Net/Net_x64_vs140.vcxproj.filters b/Net/Net_x64_vs140.vcxproj.filters index cf92addaa..2528ac00f 100644 --- a/Net/Net_x64_vs140.vcxproj.filters +++ b/Net/Net_x64_vs140.vcxproj.filters @@ -2,157 +2,157 @@ - {c94a716b-53e1-4386-9dd9-c34b92252f38} + {34a0fdfe-01a6-4219-a498-6fc99d80947b} - {c19f980f-ac2d-438a-bd97-e0b5e5fa3fab} + {27971bb0-af0c-4c99-bb16-99fbc8fe409c} - {16872e64-b64e-4a72-8620-9afc7c75797f} + {9180168c-5425-4d87-85a1-2ee31809d670} - {5d667a8c-d9b7-4ae6-a5f8-62136279d936} + {70ffc2d7-bb1f-42c8-8326-3d96eda12c6d} - {28933fe5-51c6-4d78-b5d0-684ec2d1f912} + {25530c59-8499-4f24-8e78-097671e7b2a7} - {6c4d7854-3581-414d-8bad-50a448dab5ea} + {e43fe2ac-b126-4321-9ef3-e6c2a8491c99} - {5ffa2a4b-f0fe-4276-b54a-247336b7c9b6} + {bc626b4a-b59b-41a5-bf79-7e0a227a2c0e} - {c536b97b-2898-4ffa-bff3-c994faaaa13e} + {f436662d-e67a-4d62-a79e-d72ec9355b74} - {bdbfba26-462e-4894-837b-adcef804398a} + {ba264e7c-11f8-4ef2-8846-ccfca959a571} - {948e8e1e-0de5-4cfe-9ad2-f41c6bf38307} + {376d93d4-6702-4d5e-8014-52305bf48f24} - {b763091c-4383-45c2-98f8-e0e9e78e00ea} + {703a1201-e77d-4b97-91e4-646c4d120317} - {5ece25a2-9b25-4d2b-b2e4-bfdb84de3429} + {d74a6050-729d-4c5a-ae05-d48a8b5ddad8} - {aa325e18-d972-4788-a35b-c5e05e394c70} + {23119fbb-0cb9-4122-a21e-7ae8e30760a2} - {6b9bc75b-b771-450c-9603-df9f3039ba61} + {2a7b43b2-b9a4-4b16-b1f9-ec9f7ec67f5b} - {e0604263-fa12-4325-a0c9-8f16d6e4e8f8} + {ebd28d4e-b4cc-43b4-b36c-45f356ebe8d5} - {9f455320-229d-43ac-9563-8c81e24b5948} + {ed8cdbb5-b75d-4cb3-87e7-9d84eb28e3f9} - {bf7573a3-4801-4c8d-b633-ce85114390b0} + {d3c34d33-c730-4123-828e-55d17c4c52ab} - {9f56a585-c7ba-4f23-b887-ceb2674fbd3c} + {0bf679fc-be74-44e2-98ee-211eec3ce537} - {b58373ef-eac1-4561-8e39-928b53ccd21c} + {0b981548-e0aa-454d-976e-7b5f7f554235} - {939beac3-2438-4458-a10c-4d341d0117b5} + {2c2eea50-b303-47b6-81dc-e666e6414d4f} - {55afc085-6e69-4d34-957a-1746662233b7} + {8542a085-c504-4e6d-8387-c8283f09c658} - {c82e6404-9e54-4134-8990-be4d457a0def} + {4a73aac5-d16d-41f6-939e-c83d3d38c4af} - {942711b4-9e0e-4bcb-b38d-3766b8b12730} + {17f802b0-4f70-43b9-bd19-13a985f29cc9} - {a32b91e8-e9d3-4e62-8beb-60bee2d318f7} + {2a46637d-690e-4079-97f1-4c636a67fc9a} - {ccd8114c-f8e0-46d7-871b-f4aa40c2199b} + {8633686c-5211-4272-b3f9-c7bac4cca1d5} - {1b972912-7b3e-443f-99fc-34c009860e55} + {eab455ba-1f2f-4291-9a19-9e4b72791fb8} - {2278dca2-c9fc-4411-9c2c-3281182b47da} + {667e57be-2191-410b-be71-ade9e6c9fec2} - {08727dc6-16f9-4269-98e2-9f2fe2559705} + {b5433962-f0eb-4bd3-be4c-3a67a4543b80} - {855f886e-a191-4caf-b439-111bfd4b0212} + {508f4856-f1ce-462d-9633-8eda11a9f686} - {5d0e7adf-887a-4e66-a16a-6a7ebd1f092d} + {4b203b88-17e4-45db-8079-16fbf9a93a74} - {57f71f31-57d3-4b50-8454-6eaef8c39fc7} + {38dc3af8-2f3a-46dd-81cc-3c48c217ee5a} - {2f699d4e-404d-4943-8d3c-c7b402737060} + {08b44791-3164-4667-9c71-cc003e3aa793} - {794900a2-01fb-4815-8f4c-2eef95b0b5ab} + {25443274-a4b6-4113-a588-61ff1b0aa386} - {c86e3328-f294-4455-8f6f-8415f30e970b} + {f1647fd4-636a-4365-954d-512e76312dec} - {ac76352d-9d0a-4d51-8951-c21ccccc4ae3} + {ec03f7f9-552b-4797-bfd6-bc403e612dbd} - {ad749fee-ac21-46c4-a23e-b87b9cd4f56c} + {a3c6b67a-25e7-4b97-ad1c-12b8a3a909b2} - {88070294-2185-4d6e-b84b-eb8153fb3498} + {ea1b1071-d7ab-4e73-a0e7-1b526c746019} - {daf8e611-43b8-4a52-833f-843d571431c0} + {3c06e004-0ec5-4adf-9d50-0f441bb7a21a} - {db848d2d-4cc5-4223-bf4f-25e1af700caa} + {0e993255-fd14-4e3c-91a2-5bd34de27e2e} - {6f625173-d3f5-411a-825b-f910fb06631c} + {0a4cb08c-936e-49df-a30e-f1eaa61bc45a} - {2c658be7-7e1c-4b7a-9611-ffc18c0cef15} + {75ef7a0b-ad57-4695-b7f7-5a231ad04b5b} - {3e42085e-6da7-48af-bdfa-473a7899bfb4} + {5f9fded9-f6d5-461e-9d96-4fe06b3faa0b} - {b1aa8065-20f8-467d-9061-e08578c828c6} + {867cba98-44c9-4908-83b4-e0232328477b} - {f7664e6a-fe43-4daf-991f-859df7cde10c} + {295025e0-8db0-4c82-8aba-15b591148a4a} - {f1326ffa-e64d-40d3-a47e-915195e0351a} + {87a7ebd4-7f8f-4604-82be-fc5ff545f51d} - {9d9212b8-0273-4b98-b591-33f7c86ee91b} + {03fa0196-1621-4996-913c-baee50434ace} - {3f164c69-63fc-4f82-93ae-2e34fdb3f458} + {d332546d-b31b-45ac-8091-3dc338fb27e1} - {9fb68d4d-2dbe-4999-88cd-d6ce4f0f160d} + {27399c8c-e8f5-491b-be02-8c8366658093} - {f4114ffe-9994-4331-897d-a52029366aff} + {5525fd09-1f36-4d87-a5d4-230f1359c7cf} - {4b53770a-8215-4d4b-b70e-f575d1820382} + {bc0fcee5-c5fe-4ce1-b314-5ecab370ac27} - {828714c4-311d-4f1d-a8b7-055e63091653} + {50aa7c4c-e146-4e17-98d7-6df59e77a017} diff --git a/Net/Net_x64_vs150.vcxproj b/Net/Net_x64_vs150.vcxproj index 16821f1d3..fd608a645 100644 --- a/Net/Net_x64_vs150.vcxproj +++ b/Net/Net_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoNet64d PocoNetmdd PocoNetmtd diff --git a/Net/Net_x64_vs150.vcxproj.filters b/Net/Net_x64_vs150.vcxproj.filters index bf6d7d29b..9b8925c42 100644 --- a/Net/Net_x64_vs150.vcxproj.filters +++ b/Net/Net_x64_vs150.vcxproj.filters @@ -2,157 +2,157 @@ - {8c360576-b88d-41b5-ac00-b02e07d09cad} + {53b74e91-808b-4d0a-b912-9bd591861801} - {18bfce41-a69b-4228-9a42-0ac30b16698c} + {cd0c9030-32d9-4ff0-ba12-88d8fda6d3d8} - {5c176d7a-f182-4488-98ff-d17a15d04bfa} + {2d2f661d-2400-4ddc-82fc-394b39629707} - {7e039cc8-1a2c-4eb9-83ad-71475167de66} + {e9529987-90a2-4286-bb61-270b75a2f94d} - {7871194f-a873-49ee-9a0d-ffd580f27cc4} + {11b23a69-1609-4502-abe5-7365bdd9a6b8} - {7ea32787-6bdc-42a4-98df-345ca5d07307} + {269559ac-adec-483e-9835-fc9722a736ea} - {8edc6273-bb7f-426a-9f3a-a87eac52713a} + {706b703c-e3eb-4a5d-a8a6-05073b8a8aed} - {1d06f153-2714-423d-b139-91211b5c00a1} + {aedb2fb2-4a8e-4afe-9fd2-f123ef5a54c0} - {aa5617c4-5f30-49ef-aec0-2107956a8bfb} + {53931253-8b80-4179-87ba-a96f1133d4d6} - {c5d1e6bf-7e4c-4176-a694-8d2db8aafd6d} + {667fdec6-d57e-4353-a978-f71c4c0189fe} - {ea97dbd1-c9ff-4be4-964a-1630c1755f88} + {9d8cbb4a-6acc-47b2-9d7f-8a770434fa9b} - {110189b9-c5fc-48e3-976a-1ba94a8a84b5} + {a4322f3c-7fc7-4af9-a01d-04c7b6739291} - {1e350ffe-0b71-4113-b817-f63a3c8f1df1} + {1ef67eaa-6cdc-4c8d-9b42-36c77ee0aee7} - {01f7dacf-0b9c-4b63-8208-ec65923b77e4} + {2b3b7744-eda3-493f-962d-d9759cc81e03} - {3f780e9a-9ad8-47a1-9b60-4a540d051efb} + {801ed62c-b085-4a93-9231-566ed8749529} - {a5040df9-a415-4606-907f-907ce1720530} + {3a01805a-dafc-465d-9b9b-90e442ec9f9d} - {4da71e83-6da3-40af-9037-3bfa842a7c30} + {13233dbe-0ddd-4fd8-8c8c-609205ba4778} - {077b37ca-21d9-4b66-a707-16e4747a48d0} + {c7643068-7aeb-4891-ac3c-fabf55e28dbf} - {fe4d7bde-9c0d-4463-a73a-5973e0c118fd} + {1499baca-eef8-443d-868f-2f63af8f7bdc} - {b052f2b1-83a1-45f6-9fe3-dad6db836a93} + {8aceaea8-8ee0-4fbd-b4b8-a2bb581a3f5f} - {f78e369c-7705-4df9-b495-acd9c19bee3b} + {0c52cf71-35fc-436b-bb0b-eb170c8612c1} - {0d762274-ff95-4c84-8400-ec5a13284808} + {4162a440-a9d9-4cdc-9aca-88954589dee5} - {85a97687-15d4-40bd-bbac-2c603a3fb933} + {5249ba25-978c-42f8-b667-9ae47ce1fdbe} - {f0bbd38d-9831-4765-8295-32e26f05289b} + {53d91c94-eeaf-442f-bfb6-37f56b9bdddc} - {03801d34-2c13-4d76-a279-b68f93fabd0a} + {b096351a-337a-497b-be72-3369663b3890} - {70cf80a2-ceae-4121-86ef-07e43803e4e4} + {5311a5af-2ada-47a0-aebe-5e59bc008b5f} - {ef7dd9a8-7388-4cef-bf14-0b226d8d513e} + {2be9e1cb-1da3-4344-b5c0-decb739bc893} - {4a1e679d-9e0b-44b3-82f2-924f87ad062d} + {98807984-0450-439c-b194-6f919913db49} - {f15ae96a-41bb-488c-9868-a366a8191230} + {dceff69f-8c4d-4571-9ce1-c93a8532901d} - {16e13148-39ec-4506-9ea7-9bd3bf8465ea} + {45c20683-c19d-4a84-809e-07ba2f21cb8d} - {a36ecb86-ff31-4009-8113-bcbbbdee0f3f} + {972d0e01-03a2-4258-9d7f-7fa9b936d443} - {0e56671e-da7d-4d74-a00d-7e883ba1dc4c} + {2ea596fd-9ea7-4e3f-bf23-c693cf406b20} - {4b511863-51ce-4ce9-a04d-b72df588c249} + {bfc685b2-ed24-49d3-bf1b-3b473765122e} - {0d3b8b06-8044-4147-807b-f1544a7831cd} + {59afcd5f-991d-4221-906d-8c79dc06a235} - {f41cba0e-ae39-4e9e-af20-df35feb1287c} + {4b446f06-7e7a-4eec-b53f-cf236679b1bb} - {921c45df-3c3f-4e19-ad13-4f53a997775d} + {45590c55-03dc-4828-aab6-1721798c9c04} - {f977ddc9-519f-43ce-bf98-0bd8e531fdb7} + {7e7076a9-a29f-4922-9d17-41814fa1e856} - {6c1894a9-37bf-4712-8113-fb079bbf526e} + {4820f993-f1d8-499c-8e31-37cb31a71249} - {bf761fc0-7076-46bc-9197-b151ccecc044} + {037c40ef-0dbb-4db6-aa69-65485cbf15c9} - {eb52d784-50e9-4588-91e1-b817e6d5363d} + {85b8d187-3bc7-4155-a6d4-6aa16d32aa02} - {e8182ebd-0a74-418c-a292-213ae8920c43} + {2e7e3874-12fc-4cfe-9dfe-955d429dca5a} - {9134903b-32d9-4687-9f45-312123788be6} + {ceaf27f3-9595-49b2-9c19-0a81f01a1eea} - {ab7abfc7-3f8e-415c-af6d-225bd748bad8} + {2a8a4928-9a7a-40a4-816a-6dbc5af2f7e5} - {447b8371-ebf6-4dad-82dc-b974217ae77a} + {810dfb55-bd8e-45ae-9e79-bb70dc40b32a} - {cd7f3933-6bac-44b0-ab50-7e7687495afe} + {81d52279-995f-49bb-a6f9-6fb76481a829} - {12ff6202-dfae-46ab-bd22-33edaf6f39ab} + {72f136e4-194a-452f-95ef-97e407669954} - {cda4dc65-06df-4076-823e-e376c4cec54f} + {a6ba70de-9a6f-4092-8f2d-fdce126d60fb} - {65a35422-66bf-4eef-8cca-4e3bc7838500} + {bffaf1eb-8fb0-48fb-9f6d-8a6ddc6111f5} - {208c459f-5f9d-46f8-ad10-ed5477471e29} + {446be548-8347-4975-87f8-a343b97d3ece} - {8fe08a04-9cf9-46f4-ada4-bf7026a3c718} + {6659ef3d-d392-4c2d-afe3-f3a25a3a5941} - {e8126c7b-f7eb-4fd0-8405-a25686a2eb43} + {2f902b6a-ede1-4df7-bad0-fd0f655c8630} diff --git a/Net/testsuite/TestSuite_CE_vs90.vcproj b/Net/testsuite/TestSuite_CE_vs90.vcproj index afca83d4f..583b7c4f1 100644 --- a/Net/testsuite/TestSuite_CE_vs90.vcproj +++ b/Net/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ + RelativePath=".\src\Driver.cpp"/> - + diff --git a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index a60ad82c1..c8ecad6cd 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {f1f13e9a-8617-4ddd-bdde-2993c1282091} + {328717f3-7421-4161-91c0-787550a5a446} - {a3cb658d-1699-44b0-be8c-4d1a9a3267ff} + {8f4c4123-00b7-4193-bad1-8a1d02f66546} - {ed8bd57d-c645-47f7-9bf4-c5a14ba36a31} + {8f82d2cf-04a6-42ff-93b3-c240c7d3aeeb} - {a944698e-0eb9-46a6-a9e6-e73c77cea463} + {86b6ce51-31ce-4d4a-bc6d-c8dc11da1680} - {90e02b48-d6fb-4b0a-8a89-51fb72671624} + {d4b25c27-bb7a-414a-aea4-157675ba5bd9} - {458a06a7-0edc-4840-8263-d1f9ed1fa7fc} + {194a8631-cd49-44c5-afb2-6cf497987a7d} - {6cc4f57a-a727-494d-9b96-25a41d814854} + {cc49e951-b58f-4a01-adf5-3a9dda18c9e2} - {9f320f18-85b7-48e1-a077-a9926cd7b3f4} + {ff53c944-2206-4b0d-bf1d-df583b181d75} - {b5f6fce7-e09c-425e-9b41-e69cf4da1243} + {5fce9612-48ed-4474-a54d-7570f7445940} - {dc2860ac-c3fe-4373-a46a-068532ef337d} + {58f48d86-13b1-4016-8a3f-86c83742b7f7} - {d6cf9d37-2a45-43c8-8088-73cc4abba17c} + {c28c026d-562d-4132-8a83-316b957b698b} - {f53df532-10d2-4925-a4a9-42899ed144a1} + {b3cf8838-26bd-4b84-884a-5426c40d6a55} - {b68dee81-8fc6-4a95-a5d3-241161698126} + {3ded9546-5465-467b-bce6-0c0f3ffdb11e} - {7232350f-12c1-4ced-94c1-5770ecec2c2b} + {ce9e3522-8b8f-47ba-b2bb-3fb5127e4255} - {8ba8cc30-af15-443a-ad12-ff22cecb6f2d} + {da0f0e97-2544-4654-ad98-ea4e7ee491f1} - {c2bb1f40-0d67-43fa-be37-df304f38247c} + {f4bd83bd-cdf6-421b-9f73-44b64b1745f5} - {128ac46f-080c-450e-83e5-70ee3cfeaeb5} + {27cd8f70-a685-4a49-aac9-3e7d3f170efa} - {8d74e647-7ffe-465f-912e-d4f31453e9d5} + {ff963500-c7b5-47e4-9b26-9447845aa8d1} - {2413e793-86cf-4b8b-9a18-b49b0de1d78b} + {7e8b2572-c533-4bf9-aada-23f252450166} - {4d81c7c6-15ef-4a77-b988-5d75dca7ffd8} + {b292b546-33bb-4751-8803-72296a19193c} - {a4635d16-6e31-4a8e-b63f-258482287d88} + {4eeb650a-45db-48bb-9ae2-a93394f043aa} - {921009f9-6711-4f59-a175-1f58dd428e8a} + {4ea54047-96e9-4fcc-80bb-a28776e5761e} - {2b9b5b6e-f8d4-4da2-9e99-e5a95a23c7dd} + {5e3d76aa-1151-4220-ab7a-e70314619cee} - {04b6523f-36d3-4078-aec9-783a00091f2f} + {202983fe-8f08-45a3-aa7c-2311e1809c0b} - {95941aa0-bc89-4010-9f45-019a7ee19a08} + {cb5879e3-af5b-4552-82d3-958409f00904} - {9cc31a9f-40c5-4087-8323-2bde57b532da} + {7d3c3f56-dd5d-46ef-b71f-130c7c477357} - {f906a162-38cf-4947-a5e3-b2b27d4ca468} + {d064969f-3d4d-4603-ba20-ab2e0fa0bac8} - {0fa09cac-2507-4c37-87a5-46b4b9090d12} + {51bbf22d-0d16-473d-9209-d7589fd834b6} - {9ca4876a-a7ed-4c08-873e-3b835a9bfc03} + {1d74a8eb-3b91-4cfb-8a6e-7b48c6c7def8} - {22a2a5c8-0660-41c1-8b33-a970279d0f63} + {142783f1-d6c3-45eb-926b-c7b1383ef084} - {db4a46d1-a7fd-4d2a-a1c6-67d1388cd1e5} + {f7954deb-43a3-4860-a999-aae309c8ec27} - {51c2b188-e709-4ad3-bd57-f77a013e8c87} + {9b49f235-1d21-4764-957f-6d73bb0b306e} - {69880a01-4220-4561-9281-51b21bdbd046} + {6c0372a6-975e-4ffc-9684-def603bfaebe} - {a1e2237a-3afd-4a3e-bd0d-b5e52754e800} + {e21157dd-8fd1-4aa5-add0-403bc5e26ca0} - {e62bbaa1-007d-4ff5-bf27-ad53d63ea2a9} + {d3fb4338-8f6a-43b1-b79a-8cf14d8a5d65} - {72855bda-f313-4c66-a448-c93035bef163} + {7d25befd-6a69-4aa2-88de-f7fdf6a02bb4} - {8ae76616-f3c3-4919-8150-e18fca381034} + {5bdfed14-3d80-493e-8098-b2f82effc819} - {6af44cb5-13e2-4c51-b5f7-656dd5314b92} + {9c25fb04-beb0-4f33-9ff6-3311227374e2} - {103032c6-470d-4b12-b53d-03d1cb2475dd} + {d6e10cbb-ea86-469c-a653-71323e2289e0} - {f89ba29d-83fe-4afc-aa94-99e92f985c7a} + {cbab976f-7d24-4882-a566-d9f35af1dcbd} - {ef95ff62-2a78-4fb5-8125-2331c6bdfaf0} + {f7facbd0-ad23-48a7-9909-12c79faaeb08} - {c9ce4f2b-0ffb-4f29-aeb4-2320635f37d5} + {4d3e4704-e092-4879-8296-fd0f3b032585} - {ff272f03-9b97-4d59-8288-8838b6d9d89a} + {88f6a876-feec-4170-96f7-85429522b834} - {bd6fa62f-9ab5-481d-bac8-8c32c9a7c987} + {75d75e63-af7f-462d-98ba-267d05972841} - {f942aa2d-f006-46aa-86bd-19b7b50640b2} + {ef57cb6c-3a9f-40f4-91a6-68d8b195ad57} - {3ac41c68-cb4c-48f3-abcc-a34a73079239} + {f9ffb2ca-d1c6-4e18-aa7d-8332c2ae3b73} - {a65a894e-463b-45ba-9654-f74b6384c592} + {2d212e45-7fcb-47f2-9c02-88deed3a1d82} - {5143f28d-de76-49a7-ae82-8567cd2728fd} + {fb75ee5f-b173-4c62-afa7-c730b4e46517} - {a47d0640-f33e-41db-90e1-241b8037c402} + {5ff64b6b-d852-42e4-8434-731ec415911c} - {f82671d3-579c-42c3-8ddb-39b196481db5} + {9e40f654-88b0-494f-95ce-8914261672f6} - {c7867e32-ad59-48e8-a5da-33f623dac3e6} + {967a3a4d-16b4-4ecb-a150-b96fa3768f5e} - {ea0e65de-e7fc-4087-8a18-9a059da00cbe} + {3e9b5627-13ee-489b-98e7-476371316dc5} - {c9fefb37-52ca-433c-9e10-092afc9402ab} + {72bd7a37-88df-46bd-b31a-2df8bdf2e2a9} - {e7c721a7-23a9-4a13-89ca-0a059013a15e} + {3b9bc48d-9405-4815-99b7-fd2c6869871c} - {1d809831-1f06-4fd2-940f-bb625547373f} + {3546accb-8850-4387-a75a-3075e0403e3c} - {ac1e4949-8ee2-4260-b42f-9cbb961401cf} + {0dba024d-671d-4419-949e-7f2684b96a83} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj index 59f492baf..28947ff83 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -93,6 +93,7 @@ + @@ -152,7 +153,6 @@ - diff --git a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index f13142712..95e98c42f 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {da0414a1-7d9d-4bf9-b6ec-63cd97f4bf02} + {e5bfaf4e-14bb-41f3-a62b-7d9c1a4ee2f8} - {3834d84a-c327-4129-9a2f-33a072271286} + {4c51a327-dcc8-4248-905d-f095c08b7729} - {a7db545f-d359-4e6c-9d8e-ce028500ad2c} + {acdea933-6853-49f2-9c6e-c9b69c0e6328} - {036c9b74-deb6-47b1-ad8c-30ed57a6f270} + {ec77427a-e52d-4d9e-b878-33d548696ffd} - {249beb06-ec04-4457-97cf-ca0020dbce9c} + {aa0379f4-84e3-4c40-ac6c-4f41a9266fb6} - {edbf7a8c-ea60-47a1-b6c4-13b2523f7fbe} + {7a9bb733-f9fe-4cd2-a46d-7d2343fc117e} - {c6823558-0ec4-43f3-91e6-eff6955f167c} + {426fdcd5-165f-4914-84bb-396b196fa9b5} - {770e61f8-d680-4e89-a2b0-705c049a0671} + {3a1fb357-1e8e-4d44-948c-715932d43c60} - {37ba1f5d-6fee-4e88-92e7-a4f8e86acd58} + {814fed4b-e5d9-4165-bf5b-dd9b087a8f97} - {3a2ede29-64e5-49d6-ab56-f66745840f1d} + {dcf751a8-4876-4977-9829-15c8e51c7aa1} - {a2c7b82e-8d25-4f9a-89c7-a1297d21eea7} + {5f7b5269-24b9-422f-b944-0055193d97eb} - {f22be12b-a241-4e20-8806-02ce5d906dc6} + {afdf00d2-2bec-46b6-86ce-fac6de3d4970} - {f50229c3-2643-4ea2-9902-75554401221a} + {31662164-6546-4245-ae21-76d284b9ddb5} - {d1416c38-6d19-4f47-8dee-7e6cbbd15e0b} + {a3d6b02a-0ce9-4f94-bf52-1b6b3705b812} - {00358326-4839-4a8e-bf2e-2d461ebaa05a} + {5d5939b8-26b7-4ac6-8fb6-579d3390a851} - {2ef10ab1-9590-401c-8511-3f60bbf43983} + {53d58d0a-73da-4884-b412-c05a46c3550a} - {47a0bf2f-6888-4a1c-8590-9d1d9db0d4d8} + {b7c41f6e-a636-408e-a576-fdea28c127a9} - {b360d0e5-1068-4a4a-8f56-1f9f39b3fb41} + {64cd6827-7cbd-4b76-8a04-025a3d517e92} - {2d76df83-a3c8-407f-8532-bc451b512556} + {bc5d437a-15b5-427e-9ef8-20b90a19421a} - {d95bc511-7333-4d13-a0af-f59e979886a2} + {116e4f80-49ed-4c67-b30b-8ce995ac4b19} - {8622234e-f1c2-4bd1-b2e6-ac5d55f60e7e} + {06215d12-8c46-4855-bc3c-0a922c7900e5} - {1cb38dea-5b0a-473a-b596-a0e63fed9d35} + {86ff1339-7c0b-412d-870d-3769ca936cfc} - {1632fa0d-2862-4901-9db4-1d2b860d274e} + {eb1a01e8-dee5-4e8e-a8b9-066c77631fbc} - {bf6a8242-5a29-48da-b3f2-c5611fc7fd68} + {2529358d-67d5-491c-a801-6cf276ebe767} - {cf60d06e-7a5f-476a-9f19-1108a28ed598} + {fbc71952-35ad-482e-9722-beb2022401f0} - {56cb7f33-d035-4634-8216-3904445a87e3} + {b9a471bd-31bd-4a3a-8012-ad0f1476fc37} - {e7fb78c2-054c-4e96-aab3-a48f218da6cc} + {799377de-57fb-4647-90d3-ce86a6f2ec2c} - {b00c79b5-8eb3-416e-b1ec-5c3e42adf5f2} + {67f37983-592c-426a-b86d-c4ea9269afa8} - {57ccd9ec-952e-4a76-8721-006d04ffa7e7} + {4e68ce26-2c10-49f6-a442-469dfe63775f} - {5df7d117-28c5-4145-abc5-5662382a7a5f} + {eb8b3ba7-4fc9-469a-9409-6aa045159194} - {e72edc27-101c-41e8-8f80-c019a0e4f3ad} + {7a749c34-967e-4e3d-8ecc-cc906f76a26c} - {e6049933-41a3-4129-a741-2298d60a3323} + {af2c9fc0-e845-44ae-968f-ab1a8afbcff5} - {5717d65b-a692-46a1-8965-db579e7c9ad2} + {8974fa0c-c228-4265-9607-2bb20ed8e37c} - {21217aff-e6c7-493e-b0ae-7de742c72c54} + {8689d331-94f9-4103-84ff-8e77dd9ce6ec} - {0a0a0c51-2229-49d9-9b8b-2b293a52eae4} + {4094b889-2197-481a-b7d9-144a6fedbaa4} - {4ff703f0-5d9c-473c-9df5-becb04707a5b} + {13f5d962-9b28-4f5a-a79c-fbf72f8cbe4b} - {744e5aea-8fad-48f7-895c-cc8edb6ec201} + {e70e1681-4080-4ff1-b4f6-c7507eac9ad9} - {aaf7f9f7-1382-4fbe-8487-84df965ebed4} + {860817f2-f45d-4f71-8968-e39722d63d06} - {c4586f3c-2a9c-40b0-a173-e47ad39e4680} + {2d1cbcaa-aac7-42f6-8176-2b99ad7a5f4e} - {0fa4f4e9-890e-4774-a147-927980736b29} + {f7171d0e-4d58-4451-b305-a3acee253544} - {3f538035-0274-444f-9324-3401872804a8} + {f1226dff-0e82-460e-9f5c-c10cad76434f} - {3980cf12-10d1-4dd5-bdf8-f50e886aa61d} + {e7c10477-f610-488d-a561-87ba15b443cb} - {f615c2b5-c885-4fb5-824f-aabb2f862161} + {c4818d77-1c04-4cca-b503-2378c554a933} - {50e91fa3-cfec-4e0f-b10b-327475d2d385} + {564f6ef2-1901-4265-80ef-e82799fce1b5} - {d6ef4138-5f7e-47ba-9948-1d143b1741b5} + {5882c27a-240c-4b02-8c80-375a2016c925} - {7e58eb1c-696a-4330-b7df-60b551c8b73b} + {eaef4bd8-1c21-49f0-af18-27676b85a6cd} - {d6e77e3b-9e2b-4abe-9816-ab83246c614b} + {6c572dde-1752-4a13-b6bc-f226249a7aac} - {3853fc9e-ca7e-433a-b717-77862fc9df7d} + {e47d746a-477d-4538-864c-c6008f989881} - {841122ff-bc28-4897-8d56-cc8184373c80} + {1e235329-fd77-4fab-b375-72ec8ace4fd5} - {72be1479-b866-41f5-831e-44890fdc817c} + {5609e0bd-637d-425a-b4c4-7a85a992442b} - {844875ea-e0e2-449f-9c88-3648b2faa548} + {4bcac713-0453-48b5-b5d7-6c7d956b77bf} - {97ee6193-5926-44ea-86ba-f2d4dac8559e} + {324ed658-2b5d-4439-9cc7-3ca93dd95d6b} - {fda5c6f8-4806-424f-a452-ebf055ee1c1d} + {c97b70cc-16e7-4f78-ba3a-49fa8acef476} - {80ea4c99-4e9d-4b37-9c59-83b4ee389018} + {43409a07-146c-456c-adff-92a11f4c14c1} - {c03f4130-a18c-4c00-a0f8-0d1f25914cc4} + {4968c968-e867-45c5-8143-bf5d1078622e} - {1b298da3-b5e5-45b1-8506-c6cfa235c30c} + {737edcf5-f1ff-4912-b1c6-3eab133eeff4} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj index 41e886ee9..05f572a84 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj +++ b/Net/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -383,7 +383,7 @@ - + diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters index 4e8839b73..277021830 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,172 +2,172 @@ - {2d104b0a-077f-4a23-97ba-8c3838c9e241} + {5728c0d3-b2bd-4a90-b678-182aa28d592e} - {c8aa07e9-1d44-43e3-a4be-f30a45bf2521} + {9cf95efa-9f70-4c37-bd86-2797f1dbe58f} - {926a770e-d902-4e08-a1da-f16937840d28} + {8f3572a7-ccc7-4af6-920c-d74b5522939a} - {8f68db62-c845-4860-b532-83adea182a64} + {3eda78ce-bdc5-45f9-a654-a71736230866} - {7e189387-030d-4cae-81cc-703b7c76b0d3} + {9d5a47c5-3ab0-46bd-9389-16c641331a61} - {40346c3c-832b-4508-af61-84b173da6906} + {0a73f43a-8b15-4d8c-968a-ca6fe5a64fee} - {a7361092-6c44-489b-b498-180ed6511b5f} + {2cc8044f-0568-4c42-97d4-790aee3e1d4e} - {25643013-562c-4fbe-a86c-5097569cc265} + {efcb2a3d-7fdf-45f2-8a03-71dacef1a83b} - {8b77989a-fe7d-40f8-8642-bb1f772a836b} + {a649eafc-e8da-45b7-8ec1-f94d1a99b651} - {e1795ab6-4c7b-43ab-91a8-c4bfbf82b580} + {4a7d8d96-3a34-43ca-8840-bb41727eb649} - {709a65d8-8959-47e3-ac66-924a10aa25f4} + {4e705fed-55ea-4f9d-b703-3cb80f769a41} - {acf3d0ee-d93f-4d1a-8eb1-ee2a30f0de81} + {c6c288f8-440c-4968-b4fa-a9e7533fff84} - {7d6ff2a0-37e1-4836-a84a-169295d54b7d} + {ecd0c681-f995-4388-815d-5c3eb104a252} - {9579235c-cffd-4ae6-bd59-311fc3eea90c} + {43e47e96-66f1-4156-99e8-c786d3b7ef0f} - {f6fcd5dd-1d4a-4ed4-b7bd-1b82643fa3a2} + {d5694aba-ac16-469f-9d3f-06ba474450d1} - {72f954eb-9a94-4f5c-ab09-22018440d9b2} + {de557106-a0b3-4f73-9f4a-d9a391517e85} - {9185a81a-0abc-4769-9662-54335ba63fcc} + {70c4d41a-967e-4ba8-9837-9f4b2db2472a} - {9ea1e6e6-ab3b-4973-9179-98502726b9de} + {098203e3-ff12-4747-9a98-970b7c51270f} - {35a9c7fe-93bf-45d4-8721-134d86a52929} + {1f63cca4-9c3a-45d4-8634-cd4065d1293c} - {bf3f4c42-3d5c-4f23-a859-fe518791269f} + {23cf9d1d-028a-469c-891d-d5fb4a218715} - {5ac01695-6ee2-4261-81b0-e8a8c88a5a3b} + {becaa3a6-92ee-4c61-8756-b4b2d4461fb1} - {92b40d3a-2db9-486e-adab-4ccfb0cf05b5} + {614b3613-6b2f-42ed-b1e6-7864c481a770} - {ab8e1375-269e-4f84-aa87-631355c5ca8b} + {a45ca68a-dad7-4ace-b5e9-ed708f20806f} - {ce6680c5-aa03-4510-b53f-75c002a7a1bc} + {fbf303e1-c1de-415c-af39-9c9d2084326e} - {0f93f567-2c2e-4228-bf33-f854ae583053} + {8d4913f0-6809-4f4a-9f17-60d84f74e9bc} - {f21d49b2-7ac1-4124-bb55-6359430e437a} + {eb0327e4-d770-4023-a2cd-b199ae332556} - {71ab2c0f-ab70-418a-a55f-4a4fda090ad9} + {07b5e05a-f3e0-44e9-a4ab-075583477d0a} - {8e1a405e-c519-49bb-8b3a-6905b21a4184} + {d7d9e064-d55a-408b-8c8f-38a3efda8e8a} - {c4e5241e-cb55-45cc-b383-cd384f440b8e} + {977fb35d-1914-4094-a6a4-342442aa021e} - {6692d9bb-b15d-4b75-a469-b79284be5424} + {a5a28979-66eb-4f06-b0c7-7e5f925b5cf4} - {4de7a5da-b7d8-4315-947a-d3f69a156dc4} + {be3f3b3a-1399-4368-b6f1-7e7af29ace4a} - {79573599-96da-4393-af13-19e9c6bebcc0} + {df125fdb-596a-4a23-9503-1d4d8cd87fec} - {c6d57eb2-1fff-46b5-aab0-ef8b922c4373} + {77ddf543-48df-45ce-8e20-c722ec486a1f} - {5ef47a2c-9def-41d4-b5f4-d5f531aacab6} + {4e697cd4-d7ea-4115-a1f9-983fd5404ab3} - {a2daaa17-f44e-479c-a4db-de88f5cb119d} + {b6ab3415-4272-4246-b264-6200690abccf} - {1f924a82-da64-4658-b4e2-76c819ca98a9} + {18d8d848-3f15-4699-b1af-3ea4707d2ecd} - {fe5ef2ee-2b3a-4bdf-8726-f54c2b319aed} + {80cff9a2-cbec-4aa1-afde-9d5c253d92a4} - {12427901-0065-427d-8701-c7791f88a105} + {83354f90-94fa-4e41-a28a-a7d89f9556b1} - {76550a77-8ee7-4c9c-a320-f80aee4b0dbb} + {d7ad8e99-851a-4ce9-bb99-13588f460cb5} - {4c2aaf93-851e-4cd7-9538-870e06236575} + {7264e276-be6c-40a4-bed0-8ff520189034} - {f1c0c7c8-170a-47d8-aca4-95957db8df49} + {d8c40e68-75db-4cea-b83d-1f01ef54be1f} - {64aa4b33-9528-4cf3-83ad-eb7ec0c84577} + {d8ec4a82-0eb7-46e5-8ef4-e1f317febf7f} - {85cb7030-bc22-453a-89c7-7b4f9ce483ea} + {f0b3d06a-0120-4474-a9b9-cd527e33e370} - {f4338c42-8d2e-4e2b-a43f-df06b7c93a2b} + {86995bf1-80fc-4039-84b4-088c4e2da32f} - {968ff403-f143-4397-b60c-4d0df75b5424} + {77966ff8-4865-40ce-b5a1-9e6083434775} - {d6749f2c-aeb9-4f7b-aa73-1d5087df09be} + {25993388-e75c-4654-910a-e24f0debae4c} - {7bd7739a-4ada-477e-b740-ac3b5c637a37} + {664e65f3-bb8c-46a1-9fa0-e7107cbeaec8} - {c9cac505-6b14-41dd-a603-2667fe962eef} + {065b1485-2f16-4e0c-8477-84e796ccdb6d} - {2ef59c2b-72af-4a66-aa7f-12a26be16b9c} + {fc8d9dab-4818-4f33-9d1f-f2205489216c} - {fe6db7ee-2ab1-4a51-994c-94ea7d2d087b} + {15d83818-f9ec-4573-9315-d159fdfc71f6} - {f8ffdc1a-c569-4ff9-80d9-2657b27c1c0a} + {70e0fc14-fccb-4a2c-b034-de26eb21f71c} - {a9decf25-5ddb-4162-b1ec-6d7e6dd1997b} + {40ece1b7-93c0-4b4f-acb9-57158313bf0f} - {1a25363c-449f-462a-9340-3ac88c4246d8} + {2f447768-7a00-4884-82e0-d8a43031b6cf} - {28c0edca-adc8-4fea-9d15-943ff7678082} + {66b4a011-aeb4-4432-aaa9-a26ad44d05ba} - {5004eb59-4489-4e23-b13a-628c36006a9e} + {4264be38-f269-4c32-926a-3d151b3992a1} - {a0c88983-e419-494f-9935-5748600ed5a9} + {afb5958c-66c2-4b27-a91b-36094167a437} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj index 987058005..4894bfaa9 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj +++ b/Net/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -383,7 +383,7 @@ - + diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters index a56307985..8567e0071 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {33dafbec-3967-4933-b9f9-afc93b4dbf30} + {f029f7fb-462c-4d11-8dc3-b839665ede4e} - {56e81245-5d59-484d-8086-b896a1dd4ba0} + {83652568-9cc3-48b1-825c-e1ac30ac7a1d} - {c07a9641-6059-4742-9b5a-51f2d108bf29} + {9fb90527-c92d-4d36-8474-5e7076e1835c} - {5bc53b51-6bf4-4120-b977-7318790cc81b} + {0f071c1c-dbff-45b1-90a2-d78c05b95bab} - {458cc431-ead0-478b-8aed-3ede303fbeac} + {48fa083c-fa84-4591-8b7b-ee2e6f656768} - {cedb1ace-ad4b-489b-8fe5-f8f0186a7a4a} + {9d6fc41d-de3d-4400-808b-701dcdbbe9a4} - {b6d19bdf-67d9-4e60-918e-be94c4c6d3ac} + {986e281f-420b-4f50-a82c-8a1908ab1ff0} - {a1f30a77-2aa5-4b07-9f82-4a518545bc5d} + {cb021637-9050-46d8-8c36-b8fc0cd7eda7} - {cce88ac3-eec3-43a8-8e9f-6782bb9bc00a} + {2c2f716e-c03c-494b-bd8e-61211de89a9f} - {37cea844-898e-47d7-a112-78828ce7ca76} + {d5e749e3-8a0f-4de1-a754-3cc3fdeb01ad} - {558e22bf-9cb8-4d44-a570-8d1f39ab3016} + {e08e4132-1c35-40eb-b43c-38c2b2920e6c} - {57a878b1-b0d4-4ddf-ad1e-ba42ecf1c615} + {882dba78-3c40-44d6-afe5-60a175224bb5} - {60fd707c-ae8a-4cf0-a2e5-911d698eef1f} + {13bd1490-adbb-43b7-8730-9354652a6a31} - {7ae22f40-ce6a-408f-9c1e-a495e9c4c214} + {96ca38f1-79c2-4d22-90f4-34b2baba0ada} - {6ba69cef-3451-46f1-880d-1a900b90588c} + {a7f48c05-729d-43ec-93f3-605867577a04} - {6fb69ed2-a93e-43e3-aded-a0436ba4f111} + {28e65561-7aad-430f-a3b3-b7227e912f3a} - {ebc48a7f-6943-4226-87d2-83687027964d} + {f08a76ed-f9ef-4778-aee4-be64f9652902} - {c652c52b-bf22-45a4-b4f7-2bb5e996dbd6} + {e2c53f40-495f-48b9-8818-73403e8525e1} - {3082667d-4108-422a-9e33-e48aef589a82} + {eee9ee5a-0c04-4b84-8aca-c8f58454afee} - {5e9403cb-72ad-4712-86af-30a469da1970} + {c8e3f438-cb32-437a-8aa9-67f901e500f4} - {56b2086c-146d-4c80-a416-5ed9fe632ba0} + {b6e661a0-b0bb-4330-9d50-a83ab4d85f1a} - {ab2ec4a5-6fe8-4f98-b747-de408a728c2c} + {aa459a55-0691-4a7b-a325-1b38dc097713} - {c9a93725-cd91-4944-a42d-d4ef3635941f} + {f81f5c19-28cf-4567-8620-027491456325} - {5f648bec-0a1d-4d30-b79b-69fe0f77dc74} + {817360b3-7477-49ae-8c4c-09ca657000f9} - {2d0c7ba8-7048-4e81-bc4e-98821cfcccdb} + {29b69b4b-a6e6-4322-8507-8f361afaad3e} - {16d8117b-a66d-41fe-ab85-49da28585b17} + {15520124-5dce-4b27-85a0-7c621b5955cc} - {3ee4b489-6a3b-4665-9d2d-f3f48ae6ff83} + {3555741c-7e87-4e34-8ea9-79585400f678} - {29ba5de1-ac75-4ce1-8efd-34a3bcc9e98d} + {190f5db0-fbb8-4e1f-8aff-f9913115425a} - {e794d399-afd4-4912-9689-287955dad444} + {9c4a6be8-3907-45e7-ab5d-1f930041ee46} - {8e273870-1065-4f4d-828a-6858c7cda5a5} + {a04a994d-70bc-4aac-8852-f2d5b0857a0d} - {b1fefa2b-7a81-49c0-b45c-0f38993394fb} + {e9ba0d74-aec9-49f5-97d7-dbaf7cf41091} - {33b68ccb-7537-4023-9e59-b41c3f20680a} + {72dd9799-ea31-4ce1-bb46-83d778c2f2b8} - {36827b8f-4cf2-4abc-8343-502ec4b883a5} + {046907fe-add2-4222-b6d7-d06e8f8d216a} - {190cf2ea-3ec7-43ee-9c6e-87dfa5c485d4} + {44305d07-7acb-49ee-b812-b870dc2cab47} - {ee1fc3b6-1492-4ca7-a1c8-c10af8ca8176} + {055c955d-654d-4f7c-b6ec-4963bb0b0c47} - {efcc266c-1c0f-421d-86a9-5eb0721efb74} + {8dd6d8d7-7cbc-4d1a-9cef-cc38bf8598ed} - {472b4194-619d-44b4-a2f1-205e9f432f5f} + {0c17fe74-1365-4bcd-8b68-cef4309b50fe} - {d7548660-4653-4a7e-a040-08ebd5e2e7a2} + {d4b7cacc-27bf-4526-91e9-e1fca2eb33fa} - {96082c5d-698f-4085-a809-2bcf7312b621} + {90f97a9d-f8ac-4dc4-989d-af51b59a995c} - {0a237205-1f91-41d8-aa58-1be7f1de07dd} + {4ccc0e4c-5e93-447e-a5de-41923196b390} - {c3e50d19-2667-4fa7-bca3-3cdc1462e9a8} + {de1aae49-16b8-4da9-921a-56f599d05cb6} - {054171ee-5cda-4eb1-99ed-062602aaf379} + {449c24b0-1493-40a7-98c0-4d98e79c6915} - {66995f57-94b1-426c-9af0-ca3e170a51b0} + {41844278-e7b1-407a-9373-db109858ec3a} - {a815b5b1-6cf0-4fb6-92c6-ac6684bf248a} + {dedcc659-c129-4294-a4d9-220608e69b4c} - {87a6ec42-1d28-44a1-b0f0-791df33900c3} + {fcd02209-ecee-44f2-b4f7-2963e2b6c1a4} - {ff8e0385-91ca-4027-859e-f2f693b16403} + {f1878437-a01b-46e5-85c7-df0025a2d3c2} - {61dbc42f-6850-4e4d-b94d-0a57683427fb} + {1452b0a4-1200-44d2-a494-4af46ab066f4} - {d15cc12f-fd31-449d-84f1-5143090d0e98} + {3df89288-f91c-4f7d-bbf3-86f2946b649c} - {119b3f2e-3975-46d1-af43-e55620aee961} + {a83be952-0e06-4237-9a87-1b84ea41de82} - {f2a64616-ed18-411d-ace5-1d6092db0e5f} + {871df8b6-f570-47df-878d-5cd2573ddf7e} - {40baf7c7-096a-49b7-b80c-1d0e3c4ee0c5} + {098fd799-0dc4-44db-ad68-ce1e7d584df8} - {085f0578-00ac-46b7-a7a4-b913c3e43719} + {b18d7429-0846-48c7-ad52-9782ce89e519} - {164da37e-a9ec-4b34-9bd8-25c4ccb15658} + {a4fd4f38-75e1-438a-ae39-1be5623bd6a9} - {e2420363-a2e4-4799-bdd5-a27a516e0030} + {058033e5-b495-4d41-b0b9-c109c3587249} - {bca67bda-58d3-483c-896f-c73d69204658} + {5ae0d52e-9c54-43a4-8512-8592ce343ae3} - {a798f4ca-5936-49bd-9793-2c2c0586490c} + {e5071d6e-c84a-48af-9102-49d42f5940b8} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj index cabfc545c..83123e4ac 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj +++ b/Net/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs120.vcxproj.filters b/Net/testsuite/TestSuite_vs120.vcxproj.filters index 33599e39a..cd497a22a 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {941b3af7-6cb4-42b2-9966-a43401ec0496} + {d7c40481-3f7a-4ff2-bd67-c699e120b383} - {b3179de9-813a-47c5-b6ac-aff1580d0241} + {97d3594e-2627-4d12-8479-d97b6e224218} - {5cea7b5c-b316-4f93-93d6-910dc739fb18} + {df6af0cd-559a-45b2-8d00-7bfebeebaf01} - {720aaa4b-4b5f-4e93-9092-96b472e76ad8} + {e6b4d800-092f-45f3-8809-218eeff705a1} - {b64bfaf1-1387-4844-b93c-71a8e2a12cd3} + {c7de401f-4b19-463d-959c-5e3b492edfb2} - {1e6f8c14-72b8-4170-b370-ae66622a79b3} + {ab40819a-8c03-44f2-83e8-3f6972d08bf1} - {6a5cff14-4841-4635-a553-9354579215f8} + {898912f8-a7d2-4bdb-8ca1-19ce58354870} - {089bbe8f-49a2-46da-a6f2-17565599fdf8} + {d69aaef1-27ee-430e-b3ca-1aaca6ab265c} - {80d5b88a-ca7a-45d5-a1d5-8404456ff9fb} + {1ba91b1f-6223-42e7-ad11-5637bd91f9a5} - {756337b2-7c54-47a5-8044-2019419d6def} + {ca624b03-7267-4b20-94f4-ecaa373b2076} - {4a4bed34-0bf1-4f7b-ade3-8c215f47b349} + {ea8d40d1-d84d-4523-908c-23679d892df9} - {476ab6c9-8b77-4b2a-9b61-bbfbde52f1b5} + {22ee0b04-3ee1-49e1-a515-df67ab75f163} - {a8916af8-7990-4961-9b5d-18862fa5d882} + {ad5244e7-3f69-498b-bde3-8886864c12c4} - {d48874ab-85c4-442c-aadf-d3de49cf0f80} + {17b01732-3e5b-42d3-ae08-a6ad61f1c752} - {f1745d3e-eaf8-4435-90bd-eca7f3829acc} + {4afd8aa9-a635-4864-b267-b2ba233d50bd} - {b7827e8b-56bc-44db-bcd0-6566dc79e98e} + {36e0c825-ca2c-4c87-bd50-97181c9381d2} - {e123e47f-f111-48a5-9e9d-94fbd70d9d93} + {a29a9e64-cc19-4c4b-828d-e0c5b2331552} - {76e37ec1-0447-42b4-a450-a13cdb531717} + {d0126713-387b-495c-828c-7a79cc9bbc3f} - {6565bc96-e309-474c-941b-ede77f5c8726} + {2357dbac-be06-4db6-a802-30d19e7ff3bd} - {7965c175-aff5-45b8-ac52-217c05e51d17} + {b4166f9f-5aa1-4e1d-b851-2ed770918e5d} - {9a826309-b40a-41ab-b880-e57b1595756e} + {df77933a-485a-4c1d-9c76-dd7c5ca641bf} - {550c0b19-db48-4269-9882-b08b713bc1a9} + {da4731d5-9b0f-4e41-a87b-0b03bdcfd83b} - {ff739046-15e7-4f34-8719-a4134bf5842d} + {d7bb3f01-6aef-4af7-a5d3-bfcd22792ab3} - {abd43677-0c8c-4b0a-9736-b60232a9a22f} + {7d3355fe-2710-4d41-9022-feaa5e365d54} - {0d08c9c2-f32a-42ca-b9d7-380ba6959c22} + {a273e5c4-75d8-43ed-901a-b575643bf785} - {cc8da765-3b0c-4962-aa6e-5e7aab481ecc} + {be29f318-35e4-4bad-95a6-c36898fa1900} - {c4d2b2e6-b6c2-4dd8-a207-4379881111dc} + {516da60c-f05a-438d-a48e-598a3dc16b5b} - {81b638b3-952c-47ef-90b5-cea9881f560c} + {afe786cd-1fc4-4316-a839-6614af9da8c4} - {d052ce37-7d49-4b8d-89c1-9c191d5256b7} + {c8808015-29ba-476d-af7a-e00bca433444} - {1364ad3c-8dd4-4279-97d2-c4baff8f6742} + {5f32b2c1-91b2-4313-8063-4617f07746e3} - {906e41c1-12ab-49ed-a12c-a137e69d913f} + {1952254b-642d-461b-a0e4-f4fafa2da2d7} - {788ec0ff-e726-4ca9-81a4-163090f094a5} + {29ef0bbc-0310-4a54-9940-7564be89d1ed} - {4add3c71-8d79-46af-9ef7-aeb707a9aaaa} + {d8ef300a-9b8c-4878-ba98-ff26d168a0d8} - {e99ad44d-958b-4f1a-8048-66cd1e7c20c0} + {59facba4-f907-49d2-8bff-701646cb4c63} - {bf9cb32d-3c6a-42c0-bdd8-29c63c2fe662} + {57d3bd37-ed46-4955-aa9b-9177825dda82} - {71ddc165-9abe-4d85-8302-f51966f4569f} + {157a9a7d-2d4c-4900-aba8-e2ec395c64e6} - {873fe58d-cf3a-464a-af34-0c52e3feb479} + {2cdbe7c5-a889-4ebc-8c6b-7c8be363d98e} - {eeafa07b-8234-4819-b6d4-16e187dbcaf5} + {085998e9-445f-493f-9375-281e162a7a5d} - {dd6fbc54-da1f-44c8-8962-9a2ecfe62f19} + {98ba3bd1-e164-4a5a-aba9-9194be43d7a4} - {da9cffc0-cb55-41aa-9174-8493a59dfd90} + {50592333-b415-438e-a0c0-99539790b9f1} - {53e74087-17f4-439e-8aff-e99fa97f1c22} + {386480ac-4daf-4003-967d-b3a57edcd174} - {a1976625-e305-48e1-9940-cfac6a70e786} + {6b264b3f-4fb2-4b23-ac24-beb12531b73b} - {437ce57d-225a-4741-ba88-418f0b629080} + {c9341a7f-af58-489f-8a53-d81ddd759546} - {26de594d-fb10-4266-b709-2c0c51e7eca5} + {ce31685c-c742-4358-8d53-e0efd2ff498c} - {2e664f2b-da7e-43ee-9f0a-f23a6ca8bad5} + {1cad5d06-8411-435f-a0e4-0cf49e6ecc9e} - {77fc61bf-6dce-4db4-ac25-f76b7ef7ae11} + {a6d3e420-72fd-4716-841b-b16553864ea5} - {1a7c8655-652e-4483-8732-dca93f37b021} + {fd70b4d4-6657-4a2b-93e9-a5374dd585db} - {740ced26-f530-484c-9261-36ed559ec4e7} + {8703b4f9-4f23-4475-aa3b-33bc6a0f0293} - {029de538-bca4-4643-8fbc-2d6233fec41f} + {cfb62b44-6f35-49a9-b886-0582191d7b87} - {1377ccb5-9e57-4643-8ead-79e3c3781363} + {f9c5d7f4-a0ee-4e66-952a-7f99400b2c3f} - {da21da71-ab21-4a66-99b5-635fdb676aa0} + {6aae1325-3721-4296-b31b-4b9e747c099b} - {5e29128a-b5fb-4ff4-a36d-8b9278e6f6de} + {661da0d4-61b5-4c0d-bb55-9ac8ed8f092a} - {37ea046d-04d7-4c84-8622-99d77c0ebcd2} + {121f0390-7f6c-49e7-9d6c-1f24347f0283} - {758e433f-e732-4c78-8fba-d09815cebf54} + {aa5d3700-35f0-40a5-92cd-b21a0fbe51fc} - {562da6c7-5ee8-4cbd-83b9-622c579f6a98} + {00982eca-e608-4e59-9f93-2397a6e78886} - {6922a90d-5744-4613-9dd2-0431c34e667f} + {55e598dd-5506-45ba-b3d5-ffb2e2cfba96} diff --git a/Net/testsuite/TestSuite_vs140.vcxproj b/Net/testsuite/TestSuite_vs140.vcxproj index 6641f2b53..24d57c61f 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj +++ b/Net/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs140.vcxproj.filters b/Net/testsuite/TestSuite_vs140.vcxproj.filters index 62825bc4f..43039c2a5 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,172 +2,172 @@ - {466a7667-30ba-4492-9681-89d6c06c4b22} + {e990bcad-6f38-4d6c-9966-58e8ebbdffdd} - {e0a34e0a-6951-4c3a-8708-57f77ead623b} + {efb9cb68-bef6-4000-b79a-c600d4d3ebb8} - {a5d70bac-4f9d-4216-85ca-ecc45214e4e1} + {115b7013-a603-4369-ac43-9f692341cca7} - {355436e2-7119-41e2-a833-e23aa5fd9093} + {c41fdbaa-4b54-46e0-9b2b-bc4a7f5aeb52} - {4bc460b6-4033-4f0d-a4a3-cd00421aa234} + {64d281df-794f-499e-912a-779a240a7368} - {a9935d79-1d22-4784-b3ba-c0934e907a29} + {03a518e4-979b-42ee-b7f5-ac3069daf2e1} - {7b04d877-09bc-4694-9609-e9712855b979} + {2c69f313-b291-4f8b-b28a-a92ec248cb2e} - {433c3418-895a-4776-b36e-1f8993528256} + {ff63fdf5-ee9b-455e-87ec-7125a6a010da} - {843c5982-8374-4d72-b533-891513d87019} + {378a0433-1f93-486d-af02-14d0f4563549} - {6eaf3dbb-a3b5-4208-82ef-14422565b322} + {7103da23-3f21-4416-ac5b-a918bda6513b} - {15f6a6aa-7ab7-45e3-a762-0fcb86652707} + {b62b84bc-c45c-46a2-8597-89fe8d98d6c8} - {55d4c210-be2a-45ab-8d82-1da9b92b882d} + {40449c45-d7e2-4d6c-92bf-788cdf86bb2a} - {498b89e6-997c-4c41-a782-47b0dbb46d9b} + {bef55e5f-c40f-4d33-9d6c-7aec426278a8} - {279f89eb-5335-4637-b1fb-c499d0042d16} + {34dce0ae-f5fe-4540-9c0a-456c1dbe545c} - {29e618b8-8298-4a2c-b926-a515dadb5d2b} + {5f0a06fc-5d72-4ee4-87d8-e5628f4088a8} - {d66c1eac-da97-4b68-980e-e20740228aee} + {59444805-0742-44b7-b9ea-fc6ef8987720} - {65c78f8a-8e9c-47ff-9e8a-dd6f359a322a} + {68dfbe55-eddd-42a0-854f-1932dfba44b0} - {e449a87b-cd87-4eab-b0bf-b64f2326395a} + {d1901967-cac6-40a3-8855-874e76804dbf} - {68a0e960-c354-44f9-aec1-3c02fcbc8836} + {77ff79f2-7cee-4781-b533-5f71b3f738dc} - {543ed663-2c3f-4b22-8752-03c15bda15f6} + {f15a9e09-c5a9-4327-bd1c-74c97e4d78dd} - {7b1cfc09-af49-4727-9222-38e67d7eacb6} + {350f2a9d-65a4-4b65-96f2-d4e374d1bfb9} - {0607a273-e551-48b5-90a3-39e7d7d235a8} + {6cb872ce-52d8-4187-8e81-6d4a1cf3f458} - {e6dbb4bc-60fc-40fd-87ab-1e770d19971c} + {ffe50a16-540e-42fa-8f92-b5bbc932e234} - {5ef8fd67-0c9b-4727-9319-9a18e19fe0b6} + {195d94fa-3908-424a-86ce-5cc50fea3f36} - {5ee1829d-45e6-491a-b632-6b4430a6351a} + {09121871-3725-4a0a-b871-d084f2f1c0ad} - {f16a5e4e-79cc-4223-af19-f0b24aded28e} + {43cbfa6d-c57c-4800-b820-b4359c8dda0c} - {40fdf2bf-227e-4c02-b44e-a856d0d78d0d} + {45e2db8d-270e-4dfd-bbf4-c6dc0077d579} - {22ad4336-d2bd-4d35-a842-d9e674dcffd4} + {4b1caeb7-1da2-4bac-8242-3eb70116c9ef} - {a9f1d248-066a-4eca-9f39-6d646168b1b2} + {1c38d222-b411-412b-94e2-30c5719b8df0} - {feee40eb-5af8-4d25-acff-6bb2cb0aa4f5} + {bf01540e-ebdb-41ce-96e7-0325980402e5} - {116b2f19-67e7-474c-9467-8f0019a9f6cd} + {a2789047-8abb-4741-a0b2-0fc1bafeee0b} - {d77db412-919c-4575-93c0-4584671508cf} + {82cc2ff2-416d-401a-96f5-65f28039f2dd} - {a18686c3-80a2-4e72-9377-d757de3b0ea3} + {b3b9d93d-03b4-4411-a91f-348a5162df60} - {b03cf217-0f61-4d62-b3ea-d133d7129d00} + {e614317d-8600-46fa-a2b3-5a6a0838629f} - {518f24b0-ed5c-4358-81d5-5dae5e85b2b9} + {38a63444-c4af-4711-b68b-dda3afd65b3b} - {ed5bf0fe-8c17-4a3e-9d0d-8de08e86e6e3} + {2fe5f544-b7dd-4d96-b455-e493dda8db42} - {92a5e389-2b38-4bb0-a7aa-49123026a28b} + {12495d30-674a-4731-8082-b6cb8e6f9466} - {c80d776d-9a46-437e-bd5e-886fc9209a05} + {ada17a97-6d50-4613-b20a-b8e1a8c0d2fc} - {a297d1d6-4119-487c-8c5c-0a5d87575bae} + {e6cdc335-7853-449d-9634-e7e455d13485} - {2498e5cb-9b26-4842-acd5-68b89afad24f} + {1fda07b9-fb20-49a7-98dc-21af9d51e799} - {32045b0c-76ac-401d-bdb8-e0cb67fc0e38} + {395c6170-738c-4b17-8d42-07fb0ab53b96} - {b45fe1d2-a440-4beb-9851-72a373065b36} + {8f761a12-f900-4cf4-9efa-4285602688db} - {b90341d3-b203-4033-b73a-eb08b887143f} + {a06206f4-434a-4c0c-9d87-476fe5d64716} - {bfe715a7-91f1-4966-8f1d-508399f21720} + {40b6eab9-1d2c-48ea-95c3-1558dfd653e0} - {b9e6bdd0-e91b-493f-805e-42fde5c0cb74} + {4b762480-2c00-432f-a000-0c1fbc2093c0} - {fe0f3f06-0afc-4160-8f94-c8e5d1659ef8} + {1fbbad53-8bb6-4c60-ba03-bd47b54a3ec0} - {93dbf062-ee5c-4ff5-ac43-0e0d7593b12f} + {054ddf47-da58-4416-9164-964585857f04} - {f2012989-4a16-4e8f-b868-d17bd4686371} + {47d389d1-8c00-4426-851f-856e5ce9da81} - {2955d9f4-ae14-4b1c-b452-072fad811089} + {68e1ad2e-f4a0-495e-bd4a-0bb6efc9aa83} - {c06a596d-7e1d-4505-be40-708954d65e08} + {c8052dc0-4967-4d8d-9ad3-8ff19f1e3622} - {b2894d79-9d79-4b4c-95ec-125a8937706a} + {5a67bdfa-e8fd-45d6-8234-6a5383d84eac} - {c6ea5538-5230-4468-9b23-a887aae25b4d} + {0c4c6126-7198-4b61-809c-d911cb1962ea} - {9dff5128-3863-4762-aa24-fbc8a03bf27b} + {2a33bbb7-8db7-4ab4-9507-cb676eac0ba8} - {3c7d9010-d906-4ae9-99c1-856ea11735e4} + {2ebda656-c2a7-41c2-b8c2-0711a22981fe} - {f0fb0769-3abf-4259-9645-cdbb1e8251cf} + {4d693aab-3512-4a24-b114-48037a713f7a} - {0ee6bd77-71a1-4e6e-8820-d9d349f88cae} + {04e13af1-c1d0-4c73-99d0-91c120805ac7} diff --git a/Net/testsuite/TestSuite_vs150.vcxproj b/Net/testsuite/TestSuite_vs150.vcxproj index 880e8d66a..6d76ee41a 100644 --- a/Net/testsuite/TestSuite_vs150.vcxproj +++ b/Net/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs150.vcxproj.filters b/Net/testsuite/TestSuite_vs150.vcxproj.filters index 5f4c97131..53ff14344 100644 --- a/Net/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,172 +2,172 @@ - {2494c4cf-4063-4974-8330-549dd5c7b51f} + {a447cd0b-d35d-4c5f-92ba-fa5ccebd7676} - {31658808-4f12-4411-9667-1c4d1e7d4eba} + {193021ed-7c0f-4c73-9c64-fcc395f776ac} - {e5efa281-0d02-4ac7-80ad-acbca35492b2} + {a8d08970-5c78-4202-9177-336bf182fcfa} - {5e6d16f7-ccdf-4c28-825f-6b63d3f31f42} + {0ab0e95a-bac5-49eb-aa26-d4519024d49d} - {08a79368-739a-43c5-b03a-537f6fed5808} + {32e847cf-e330-419e-b507-bd3f74eb8edf} - {97a0d776-b5f1-456a-b980-0d67cff16308} + {039e2a7d-370e-473e-a530-ddd5abe0917a} - {afd0b40b-753d-41f3-bfcc-2df3bd49698b} + {7eaf549a-4fac-4154-bbf9-62af27e7852c} - {419b91db-390a-498c-89ea-e9727aed3c01} + {4515d9c0-4de2-4f1b-9f99-e997fa6de2e3} - {032a90fd-101c-4cc1-8cc3-317ab4453350} + {6b356f25-6a45-4ab8-aae1-8f860b8c579c} - {780c1e36-f692-48fc-a42a-9a680b0c0149} + {e14a0ae9-03f8-4e5c-98ad-3dfdb039bf95} - {c155f78d-14b8-49a8-a5da-9c3a5c9b5a92} + {c9805804-7847-43bf-9bdc-f0d006d69c1b} - {97c9e8a5-8911-489a-a8a4-52474f6cd42d} + {11c6486b-76bb-49df-ae65-6f0bf7778bc7} - {48c181cc-6e36-4264-8f1d-425fad6f047b} + {11ea7fa0-d139-41e8-9a96-39175dcf463c} - {eb757d0f-0eee-4d19-b029-2ffb587f3901} + {5831e1d3-1a33-4866-a093-307bf3e71428} - {797e65a6-4fd9-429f-99d6-654687ae8120} + {2f2104d8-5a12-4ac3-a0ee-860da8b1eee1} - {fffc3971-4bbf-4a54-8976-46fd71cf7688} + {ca648205-22b9-4cfe-bf45-c811b8961f2a} - {dd57c34a-2f94-4745-91ec-bb830db2d376} + {6f0c36c8-41b0-409f-9c94-8b6d9050024f} - {eb1a90b2-9dce-4786-a09c-a003794ea758} + {f69d39a7-fe1e-4206-a78f-b4b0c3838509} - {c843ec65-2a72-40cb-8276-764bba29883f} + {14278392-6e62-4957-a2da-4cc43a60a279} - {a9f1d323-75fd-43f5-95da-f6d304d7253a} + {35ea04a9-73bf-4bad-b03c-d6b66bf4504d} - {2924f273-2004-45f1-9a4e-0e50076af4f0} + {7dcd73ba-686f-4af5-9480-1f7b49ef2857} - {e3d1ebae-9434-42a2-9b2b-c0b047576b71} + {6ca29e9c-10c6-4f35-88dc-2b2467033b9c} - {b9f61604-d7f0-4990-be56-9046a9656d85} + {ef718e20-76ed-4219-8aab-f48a3c3c32c9} - {66d87722-7a03-4eab-a48d-7f3ff2dd5ce0} + {500e99fe-d74d-4db9-9d4a-e8feb7554abc} - {dcb16178-d8b9-40e1-9abe-225dd6fffc67} + {1c36410e-e3ea-4ed8-911b-3eec5cb487b4} - {f1582ebf-0bec-4904-a79f-d02b7f1a1173} + {28fc7da4-c627-4f3c-b942-730c9f22ae7b} - {270601f5-b9f3-47fe-8652-9aa386dc46bb} + {f49ecd55-b542-4a41-8cc9-48801c182d07} - {10d3f351-a3f5-4ed6-a062-66be7d232482} + {0a322af7-5948-49ba-851f-054f63c2b57a} - {1ecf502b-77c5-49dc-a2e5-9d8cb63ccabf} + {c9af37ea-ce6a-4960-84f4-1891c66615eb} - {4393aaa3-f340-4082-968e-69804bf5b4e6} + {93c0c545-7e0f-41b6-842e-e49964f9637c} - {b436a5ec-4090-4bdf-9d0d-8500b612773f} + {91f02973-753f-49d1-8e8e-e790fc47575b} - {56869aa8-bdf7-4b82-bad5-917d874380cf} + {462139f4-a2a6-49ec-bba7-6553fae78e80} - {54461720-965a-431f-b233-08077adc57c8} + {17d01959-f7c5-4e5d-97da-1cf49a4121b7} - {edc0236d-3474-4394-8662-b8df1c3dc4b9} + {0fb6c603-a14a-4571-a3a9-3aa9378ba368} - {acd7fd46-15a1-4740-9410-84661e084004} + {b245d3e5-bd90-416f-a2ff-13f53e1fda1f} - {fa9776cc-8fb9-4fd2-8b98-110ef6770aef} + {738b544c-d1ea-4376-8924-b8a806a82cda} - {9407f141-a747-4454-95e1-c529eb807d22} + {0b56399c-f16d-444f-98dc-c2625f345f87} - {8e6c919f-5373-4cb7-b4d5-058fc7a5a53b} + {78caf1d1-7921-45ec-b001-4d74c20d1712} - {9d931529-f345-4149-bced-cb47df62773b} + {a43cb2dc-238d-40d0-a6aa-eae184640642} - {95f9f6fa-ac27-4f39-ae6b-e46ef53d63ec} + {0932e4dc-8748-4c3b-8a83-b2361673e21f} - {f432d7aa-991e-4da0-ae1c-08f37d393385} + {98fb1ff5-7fa1-4605-8765-41ba77bb6535} - {934d0d14-4a97-4934-a265-885fd1762595} + {422c5e51-0c09-47c3-898b-9496bb98e0ac} - {fd2c0f86-ce8e-4c38-9389-8ee896fd92ab} + {b80b1922-1079-4b4c-951d-f74f0d2cac75} - {620a0821-397d-4173-97b2-1bcd034fa986} + {fd05108c-7570-4707-b4eb-cc0dfc3335e9} - {37b98282-6e68-46aa-8d48-4db9fa4f0d3a} + {f650cf16-b362-4eec-a662-e7c234637a90} - {95429c3b-ca1b-4c8b-93ed-b3dfe6f595dd} + {4e14f166-f6e8-45d3-b234-19942f853cec} - {056bffbd-b0a9-451f-adb4-c02283698dfa} + {eca5a9d0-af19-4990-b448-af1232c33574} - {7a5a920e-6c5b-4003-a055-a25c653a2efe} + {1c67b70c-9284-4c4a-8e8a-7417a6c784cf} - {6b4ee067-429d-48f9-b83c-4c83e89901e5} + {cbdfaaf4-2b24-40fa-b258-52ea8e043a23} - {0f77b7e7-6ce7-4898-a425-9559a76c011b} + {cb2cee8a-471d-4e29-a206-bfb6cf7ace33} - {c93d72e9-896f-4abb-9f4e-d272276e95d6} + {f607c06b-de73-4532-bb04-47af7d314120} - {f2f7f7c3-7f93-47f5-b809-03143d687db9} + {00327281-dfed-47f8-b974-d9c76c45758d} - {bf38440c-5780-4221-be5e-36f340ccd25e} + {c2208c2b-270c-4e83-bc3d-faf6ec9545b8} - {82ffdca5-132b-466a-ba2d-550ca80f3ce3} + {25e44601-1767-483a-a33a-aaa8903dbd7e} - {7d061ad1-e530-4780-ac4b-221b0c05cc18} + {4dc3cfb1-78f6-4ed2-8a46-02bc95fab044} - {9dd29144-15c1-4a09-b485-c5cf2d5081b9} + {f346a326-7fb9-466a-b554-9b01b2b7a725} diff --git a/Net/testsuite/TestSuite_vs90.vcproj b/Net/testsuite/TestSuite_vs90.vcproj index 1ebe8be27..7f9ae2b2c 100644 --- a/Net/testsuite/TestSuite_vs90.vcproj +++ b/Net/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -383,7 +383,7 @@ - + diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters index 467f962a9..b855b07f4 100644 --- a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,172 +2,172 @@ - {4b660162-d40e-4033-9aef-cf8e4035f778} + {ab106515-04ad-4dec-a017-30c35975b143} - {aebd477a-ad3e-4953-b522-e309d43864fa} + {5065ca31-85e4-455f-9258-f275e245a098} - {841216e4-7bc7-4a01-af63-b0ad2e5630c7} + {2f7c8de5-4866-434b-b40f-d27965c6d56f} - {81ecdb7a-8e6b-4f21-ac54-966f92ea4183} + {dcacc945-94e4-4c34-afd9-e190a1d62d11} - {146bb777-d193-4188-9fc0-2b3695cc25ee} + {275f576d-cfbd-4e4f-8d83-5b47583c3ae8} - {b675e5ac-685d-499b-b0dd-40f2e8760ed4} + {b1ce7247-73c6-4a2c-b066-f7e89d7beadc} - {355348a8-513b-4143-8829-de4537d94dfb} + {2feef4ab-3019-4b81-9a2d-0cb800c6def2} - {ed3783fb-7569-40ad-ac45-1d869d601f2e} + {159245fb-97a9-4808-9d67-f3960d75e1f8} - {e55a8154-afc1-4e6f-ae93-683a904aaa78} + {b99bf61b-9975-4b2e-a74e-cf0c24698d3f} - {8e86c54f-61f3-49db-b716-2cf636d6f0cc} + {488634f6-5e1e-40a5-b4c0-8aec70e64d41} - {eac868bd-2551-45e5-b418-d0a781c318a7} + {768ab731-c000-4682-bfc4-a2c1b3ce0ba9} - {95f94a15-cfbc-4dea-9115-c63930cdc16c} + {6451bb62-43fa-459a-888e-e43aa8349060} - {4fb2a331-8146-4c23-9056-90fd53cfca76} + {67374d56-fcee-4158-8fd8-bc5a23fcc22b} - {9ea414f4-7f4b-4036-a2cd-895dcbdaac86} + {9eb63a04-ab5e-4574-b61b-990804bcfe1b} - {fe4a6376-df8a-47d8-9257-f852b8e7318c} + {cffccf09-7465-464f-b1d6-6696007f5238} - {92bab4be-3de7-4e41-a3ab-d32d43f95bff} + {8a7f4c4e-fdb8-498b-b054-616e571f548c} - {cfd7aa83-e123-4d32-b920-783b9ca30de8} + {394f30bf-14ed-4372-9dab-2ad0f285dd47} - {dc5cbdab-d6ae-4b32-87b6-0d38298b054d} + {54f36966-9417-4f9f-a69d-7be40700369a} - {4e17cc57-1c3e-4f0d-8741-046e04f998f6} + {a83b7429-b926-4e66-a67b-60e19eca05af} - {ddb11a3e-9cd7-4b8f-a630-19f0174b15df} + {11830fb0-6642-44ed-be62-d5eee18f2582} - {b5534461-5d17-477e-a7e5-b9178b9f1e2c} + {19f8ec40-ad56-4cd1-b62c-e257528d2a0a} - {e5841aed-c5cb-4e4b-9df1-27d6426668ef} + {9510749a-104f-4916-81f9-7d315c298d08} - {edfb2170-14a8-412d-bb07-be7347ba888c} + {4686e713-ebcf-419c-858a-5a1e8068459b} - {11fd268f-2ce4-4909-8933-aaa34be02ef8} + {12fcef24-3ad4-4d9d-a0a1-b4f2f36a5747} - {9023fb74-9022-41ed-967c-1170c5dd4d97} + {c0aba85f-b8db-4b24-ac87-ff1cced1c6f6} - {e5aec9f7-c645-40dd-8905-93d38d7a7e28} + {54ff374f-df78-4414-a546-9e887a23f04e} - {dafcae36-0bd1-4310-ad8e-b58b490dfa63} + {1b8563ac-5b99-4fe1-8496-a3c2dfc691df} - {0289ec80-696a-4ca7-b450-94457b2e980d} + {e60282d0-3f0f-4976-8dc8-686af02f9f98} - {9fa251d5-ff63-45d9-a598-7988ec03a08d} + {508ea1a2-cf1a-49de-b716-3548c5ec9b71} - {3855ea44-6445-498b-8426-826148d647b5} + {cd82fb44-c92f-435f-989c-faa179c02ae7} - {369737a0-150d-4b46-8847-7a4cae898576} + {92af3738-5a26-4f5a-b901-c650dfd4ef5c} - {add44cc9-adf4-41c7-a962-77af4a8c16c9} + {bc397e45-5707-4081-b3f9-dad86f4074fd} - {7bc058c4-385d-4bf2-aca8-abcd9a3f4a88} + {a2b5aebd-2ea6-4985-8caa-6123a6286d31} - {d5e93070-f3d7-4982-8d03-4a2f8caa6bc1} + {31395c4c-03e7-4051-9428-7b66a3516292} - {a82e5488-b60e-4dca-bff6-fe7fe85f6103} + {b77d7be9-d4c2-4a9d-b85d-f14f4f3ac483} - {074ba2f9-7f9f-4121-be96-48b2a5fc5730} + {36962959-2468-40f5-bcb2-3cc9103adba3} - {38e53b80-4b3f-4bed-b9ab-5409a75188a7} + {b3479ec6-7381-4d0f-8b02-13f9da880a26} - {8c4dcf97-3e08-4565-b0f3-eac3e097dba2} + {6af7b2b6-7485-4315-8724-ad6c9d4cd60d} - {11608623-65ec-451c-bd69-0a69b51ed5c6} + {9cc24ba6-6b93-4ef3-ad40-b25b69c7bb51} - {bd555e73-a5fc-4ec9-9cea-71c165097b7a} + {e62d080e-31fe-448e-b4be-eb141f019367} - {a8216513-410b-45f7-9f71-c4bd8336427b} + {5e3f5072-e142-476a-8fae-8f3bbca1ecb9} - {dca8db1c-e9bc-4e45-a4c7-127f9e932550} + {6ee0ea03-4806-43ea-a517-5ff3e8bc46aa} - {e1c45e39-af36-4894-8071-b9642fcffda5} + {ba691264-9566-4285-acfa-15dae6d90f96} - {29f51130-1466-4fa8-bb4b-5fb38dd96c62} + {80fb3642-cac6-415c-b812-3c666361108a} - {02d979a6-52b5-41bb-9bea-2fdabe277d71} + {0fa1bfde-6700-4032-84e2-a9c548896329} - {19158087-5d79-4302-967a-8de2d51cf885} + {258d1317-cda0-4364-b88a-e7e19e36992f} - {9f152b14-83cf-4f2e-9f47-5df7b8187270} + {ed3520c7-217c-4625-97d4-a64c027434ed} - {5c63b8d3-7f1f-4c2e-8750-cc5b9d9a8511} + {d09f2d12-24ca-42a3-b79b-2cb6d4132883} - {21f3722c-64b0-44a7-a91a-78073dd88539} + {eefd0287-8e2c-4c54-a155-7909a0833e2d} - {4be87603-ee91-4229-adb1-78e3d6d03328} + {7f01d0f2-b408-4d6f-999f-95e29e64876e} - {54bf2378-fe12-46eb-ab6e-c4e65ac53f4a} + {05b5cd0e-9b97-47e7-a2a1-9d3366139b6b} - {41f5d374-1d97-47cc-a5aa-69635b4ab5f8} + {6238acd8-b2df-4199-b2a4-5d0ff93c66dd} - {996753da-5c8f-46c9-8404-dd24f1613926} + {23485362-e5ad-4853-a444-7e866655b151} - {3440195a-31fa-4297-9e55-c58efe51bffc} + {ce0a8098-f062-4ff6-99a1-418f672bff3c} - {c9e9bdd0-caee-4a4c-b2dc-2da634295d3c} + {390dadc9-510e-4c63-9af9-396b0f739d1c} - {b697ad6f-ff42-45f2-bfb1-681651713cc8} + {e4a9eed8-7684-46f6-af8f-0cbfe85d09e1} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj index 777d362d9..14311ca21 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - PocoCppUnitd.lib;WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - PocoCppUnit.lib;WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - PocoCppUnitmtd.lib;WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - PocoCppUnitmt.lib;WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - PocoCppUnitmdd.lib;WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - PocoCppUnitmd.lib;WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -383,7 +383,7 @@ - + diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters index d74d4142e..259b9e52a 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {53a929e3-e614-44a9-bdaf-a9b611866d9f} + {c16c2fc8-4aaa-40bb-8290-ceab3bb2816a} - {1fcc0474-d8d8-48e2-b01b-e47b893763d9} + {4ab950c4-fec7-4037-a0a6-5f14eb761131} - {1772dca7-1e42-487b-8dd8-cc49872c36a2} + {49a61667-1e81-4edb-b452-9a0c53c3053b} - {216bb949-c0b5-44f1-b9fa-4d1bfdc217dd} + {2e60cb62-c10d-4d1c-96a1-6961e4f3df8b} - {991ecf48-4963-4705-be07-8caf9fe50f11} + {f69ebd75-72d9-4471-9adf-7d555c13ea02} - {a5e4ee75-bc0d-4670-9c28-f01c6345757e} + {e507b590-e05d-4e24-882b-59177cad6a2b} - {6dec5e0d-dfcf-45bd-b53b-ac87e4703027} + {6cb59001-b75c-4a6b-936e-50cdd2761f68} - {6d9251d1-c5fc-4473-a43a-4a4544652cd6} + {798de698-096a-47f3-a34b-4b2bab4ee40d} - {b21e49a5-b9e5-4bd7-bb1c-a9521b2efcf2} + {a5a17a81-4160-4565-8659-2164d7ea95e8} - {825e84a4-d278-4c2a-b1ea-934e298d979d} + {e8e9a3f2-a7bd-490f-939c-7fc7248a1a23} - {7df2fbf0-7d52-4054-902a-c9b95525ee78} + {a5e5dc8e-2512-4f17-bc31-e905609f03bc} - {dc779a9a-3ff8-452f-948f-21a8b5925619} + {3438feb1-3dfb-4fd4-9a4b-df1184b6cee6} - {f08b17e2-268a-4907-a472-844efd0f80d8} + {a9842816-4eda-4e87-8689-bfe87f6c36c7} - {7ba003a2-c1e6-4379-bf7c-c9a97b539243} + {8b03df6a-8036-46d3-9b0b-64d55f664286} - {0ae6ca25-5f21-4b48-a747-0593b3172cfb} + {ee2cf994-5246-4be8-8d3c-0d5dd9627566} - {e3fe678b-4e6a-48b4-8952-8ac56a7012d6} + {1729d387-7069-4e9e-a319-7e35d218a78a} - {830412dc-fb64-49f9-a4bb-5ccc67d7fb25} + {48459391-89f6-4031-8401-df3f6cad4fa6} - {a350e000-1d88-450c-964a-a41722258af3} + {f83e4d6d-acc7-46b0-9938-b6014e1df4c9} - {a46223a4-8b6a-41db-8e52-cee7a8e78685} + {9cc2ea0c-7695-4259-ad24-4b0e0ebc3e1c} - {16d7632b-f8cc-4bc3-bcae-d32ccbbe47ca} + {5060b4d9-7081-4217-a8f8-e87f80c21710} - {353a09c3-1cee-47a8-97cb-823895389c9a} + {81ee167d-1735-40b4-8e76-7812831b178e} - {0538d5b2-da14-406d-bf55-6a4570d5acc8} + {692cbb8f-9639-415c-b5e6-ac21450b1cba} - {19ecfd75-67de-4ac1-8f50-94f6e565837d} + {273d4736-81da-4af5-b156-1d703d9a82dd} - {0d76b3e3-aa0c-4f2e-9389-d40e20817cf4} + {3c5d1765-9a8b-41ce-aefe-50222acdca06} - {62508646-9d8b-43cd-8bad-03ec8c5e5bac} + {5a8d667c-97fe-41dd-a49e-2286069bdef9} - {2c33220a-9aaa-45d2-9cdb-477f37b9947c} + {83894fa2-0c62-4419-a20c-dff446b1d775} - {7473fac7-7559-4f3d-b848-b0b66024f6f6} + {1a69c536-f70d-4539-810c-a38cb3966f08} - {c5d77dbc-dc64-4a7e-aeda-627aee14c298} + {6c394a4c-8981-4061-ace7-8708422213d5} - {b75fff15-e88c-461d-b7b5-1f867241bd9c} + {9023c2c0-da29-4ca8-9f1b-b2a8d512e4fb} - {cb199db2-c162-4b7e-b9c4-6d88457e3ac0} + {4525ce91-81b7-43e4-b46d-926e8d9530e9} - {0a66fe73-f2be-4d9b-a5d5-990c20c6d407} + {45690621-b725-4223-b5a5-8a736f8e5cf2} - {a985e8c5-d93b-4b8a-8bfb-ddaff7afba8f} + {9869fb00-987c-4ba1-bd09-3c9ccd33d1ac} - {ca74b33d-7952-4c03-a9b6-c41937fe1d1f} + {5138bf27-d811-440b-9fc5-7e9ddd5e2596} - {540ba07e-2b0c-4534-a292-cf6adca6bc44} + {29225721-74f5-4bd2-a89c-ae2f7e793800} - {662c3f39-f648-4e3e-b828-9574065a5bdd} + {1166c985-6329-480d-9e7d-98906d78575e} - {83e6f2a6-8b93-4c16-bb87-b499f39799e0} + {30f40bef-dd0c-4be3-be03-775170fc4156} - {d29239be-11fe-4987-89e6-3738e5b467aa} + {0191c171-294a-4a0d-ac65-0d1358ca0747} - {47e7b60b-088f-4937-bdd5-b75b9b479ff4} + {a06f03de-d5f8-4d41-8bb3-6b31f4d3c723} - {3e949e23-f9ef-4baf-bba2-a33ec1787337} + {d1fd9043-e1b0-457d-a7d0-771712aca9c6} - {af860450-c039-44c8-a8bf-1bebee371324} + {41d92a27-32ce-4113-bac0-1570aec7b159} - {8edf12c8-d80e-430a-95bb-ce29d0a32f2d} + {7de4f70f-1c3c-4481-a80c-47513384cf97} - {75103b34-a873-4cf8-992c-b7f094fc1382} + {eddab5c2-d0f9-4d98-a212-4e3a250a2d61} - {090775d0-fd71-4a97-b908-5769c35a8b5e} + {4997263e-5a3f-41df-888c-2d3f2347f400} - {a6ec3be2-b2ac-4135-a130-8ce9f0606d03} + {3b376188-2a47-4172-83f8-f625cc9b192b} - {1ba0e18b-4bc6-4035-bfe1-8cbd9fbf5b33} + {f186fb21-5f43-4f53-ac6e-679a510ab871} - {89bed272-e18a-4f15-b133-437f0606f0e9} + {a842a1c8-ae33-4807-b544-97df663df8b3} - {536622e7-9044-4610-a27f-62b99c3f5254} + {b0d1bdbf-0f78-48d1-893c-16ba5aa0132d} - {3bb23990-ed24-47e9-b933-235469101627} + {be7f948c-834a-4f43-bb5f-f374b1b67d37} - {23b40241-9e39-4f4e-b281-f90d373e6dbf} + {00a7f005-de2c-4c20-ba44-568df13fbafa} - {a9ff9c9c-f18c-4057-bd35-65e68c72068b} + {3dbe3600-28ce-4632-be89-ae9af822f8f0} - {a2d5f69f-1867-4427-a2c6-e0b8362ebc1a} + {69873c32-1970-4820-a020-25c5c56f05b0} - {8ef60ccb-3cf7-460a-8d2f-0d15c0971b5d} + {4a41f4e0-f12b-4e92-8962-481d5424a4ea} - {57df5bde-dda9-491c-bcd8-d212aaea5c66} + {89e60afa-92b2-405f-9d03-aa15db11bbcd} - {da92a6a6-6ffd-46d9-ac48-c676760dfd4a} + {7db5c3e2-f260-4b37-8f2b-e1eebe5078c6} - {56b66257-5958-46b8-b3fd-2b47ba5ba320} + {b31338c8-fb19-413c-ac98-092d04657337} - {ed849d69-e7e1-4885-a8ad-3e293b6a22be} + {419bdba9-cc68-4c25-b783-0ae4bf51e49a} @@ -380,7 +380,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj index 8a1dc14b5..b43cddc72 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters index 94d6334e2..ddbade822 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {c2317aa0-b80b-4119-b71b-e8593f7492e6} + {a4e22ae9-a2b4-4d6b-9c44-c66035370ea0} - {54d08bff-0dfb-479b-b4ac-bf9eeff53287} + {7e084467-27ce-47bb-aa77-d1ee60a2c5d7} - {7170c3f4-3a20-4346-a55b-dfb93ce4ae31} + {a4ec157d-1a62-4113-a878-d1fb17372f72} - {24d121fa-5d27-4c2e-b680-e5c0686d2fe0} + {6d9e6e34-8884-43f8-a3c7-4ddc38779092} - {c6d9d486-99a9-4e79-871a-554c5371b11a} + {3ff3fead-47f3-495f-aa30-bfdd6644f386} - {98909b73-2a2f-4ab7-9b9d-a4b2b2fca8a0} + {6c8747c0-d659-4a23-bac9-ebfeef1e18ff} - {fc902bc7-5a38-44da-9090-636a1bcd3673} + {3f27b6c7-d679-449c-a0b3-733b38b3f0f7} - {9ae85b55-e852-491d-863d-4fc6086a3a12} + {cbc723d3-2144-4c5c-87f3-fd92caf9cd4b} - {9fe5d878-89a2-49ac-a5be-783b636425c7} + {53385872-dc75-4834-b391-24c87f9600f6} - {e0f62a82-bb42-43cb-8f68-80fc1cdab932} + {6d2d49ed-ad31-48c4-9f11-4e129c1b0d38} - {3b3eb351-bd70-407f-9da2-6521c0975eaf} + {3827210e-9f79-4f02-931f-94c2a7fb1eb1} - {b409debc-bfd5-4fee-a9e3-b1fb2ab92336} + {677081fc-f972-4380-b129-b258e18094a6} - {4089aaa6-7aa0-4991-a160-399d938a5bb3} + {545ebd1c-9dd9-4326-b1b6-1b12f7bcb73f} - {ad941f77-1136-463e-9f5e-5c4527d9bbc0} + {9876ab32-8f7b-4bc4-8438-df12c49c78ab} - {22f813e2-39c4-41e9-a4f0-2996f43988ae} + {b392ee03-b177-4204-91ca-0f429a2b2399} - {23e240e2-02bc-40fe-b9e9-75919ba04a60} + {9c5d99f8-0cdb-447b-b933-da504bd7ca75} - {99f24734-5810-4f06-bcbe-19bc88d9c4ad} + {cbdadeb2-d221-48ca-9b2a-6ff584b26af5} - {a17fa4aa-fb41-4458-9868-ca2b0240f8ba} + {dbe0bd2c-8995-46b9-b4e2-2fbce39f03d1} - {32de438b-f120-405f-b3e9-d937c1a5abcd} + {d98cdee0-3e86-4552-ba36-0fb480c07c5d} - {32201773-3f7c-46f2-aab0-5cf3ed99be3a} + {8497a096-fad3-45e7-81d7-22ab508656cd} - {0a135327-11e5-49cc-b158-3a021f4bb8e2} + {be11dc41-f23e-4d8c-83d9-2197bc6ad203} - {2d797cc1-ea76-4ae0-9ce8-4739120e1bc9} + {c02eded8-215d-47c4-b38a-ae2d29d1c11f} - {2ee1c0bf-4d78-4e76-b745-71c3ba737c75} + {cb626ec3-f025-4f5a-a54b-dfc6bddbef8d} - {f81661c8-97f3-4b91-a2a2-d7a68004012f} + {9b561e6c-8b78-411b-8805-3fe224692d52} - {54459753-a15a-4bc4-950e-5ed82a7e4b5f} + {2d68bc8e-ba82-4d67-a0e7-5c3e8c0f6bd8} - {98c6f5ed-7384-410f-bc39-b4f995a5213a} + {bb9a7985-069f-4b0d-b3f8-a6a10d533053} - {09612ba9-5674-4cbc-99d9-f4943667e675} + {cf4bfb01-a2fb-4c35-a2a6-85373e721ca8} - {a270189c-6709-4685-b4e4-4e06399c0129} + {c0e6512e-9745-45fa-b393-c01794e37cf7} - {86bf16b3-4cfa-4d33-9a7b-aab44fb21d8e} + {a1edb7ff-bbbf-4917-9900-37e68946d61c} - {2fcf1d24-fecf-495c-bd5a-49467b91f7af} + {8833b52b-2f2d-4183-9ff7-d493ccc88954} - {7369082d-b271-43ae-b497-405aea28853b} + {32ededf6-b088-484c-8f2f-011f72263bdb} - {0ec6c748-8866-40c7-97ac-f45587e00b3f} + {51c1bb5f-286c-4b59-9dbc-0b92ec818701} - {2deb0383-9500-4859-a004-a0685050fcb6} + {9b1bdc68-a413-400e-8f3e-26b1257cddbc} - {c8ddd087-945c-4f20-85b0-c5a0caa1ecaf} + {232b21d9-0833-4265-8882-c04e1d968240} - {e9c21bfb-ca94-4296-949d-b81b98e7a0a3} + {e391b393-9b99-424a-917b-bff63c432258} - {8d89b0b0-dfbb-40b0-8626-77ecea8e5d25} + {f151da71-6cff-4c44-8326-e307cd7859fb} - {6ef405d6-20da-4682-aba1-58727214ef1d} + {b82e2b85-49d2-4f0e-a3bf-946f70d802f3} - {3154d471-6a50-4b34-a9b7-2b33087184fd} + {ae4feacc-1c36-457f-b78b-fba2b38f4fb6} - {1d2a2942-dc49-4bf1-b20a-0c75ef591f7c} + {abe958a7-22c4-49ee-84e0-bb6a51e8c7ab} - {eb970bc2-6cce-4691-8217-51b2f8d52d6f} + {a7e06a0a-60e0-46c9-a40c-2b4f7b589333} - {33b7c08c-9aa3-48af-a356-13715f92b496} + {5fe7422b-a4df-427d-8b37-88fc72c81343} - {1ef0b950-1a7d-4951-b888-98683afe139e} + {7c33a805-1125-48c3-9de4-4ea88e0222d5} - {02d453ca-d32d-4325-8e6c-d2256663ff32} + {ecb72fbf-435e-45c9-820d-9aebaf9aca42} - {f02518d7-6c4c-4298-9dc0-bc1d0381fac1} + {93d5f775-0868-4242-9cc7-c47084b523b5} - {1edbcd5b-2c88-43ac-8903-3e4df04a6225} + {b4e8930d-e658-4bbf-95f8-aafa0637441e} - {50f72735-36fa-47db-8a46-41093d079bdc} + {600da5ba-4c40-4128-bb07-dd01f02170d5} - {01503cf2-0d3d-4550-810a-ebb6071aa4de} + {bf4da595-c818-48cc-a76e-0ad7b45a1892} - {7f14cf17-031e-4bf6-8ab0-5367ba3e9dac} + {6f507489-1f74-440c-a70c-be4296b2ff75} - {9a12f521-c2d7-4c1d-8031-3475b89c0f04} + {000e691b-cc94-4c54-8f24-1aa66b07a69f} - {85c8f6cd-995f-4915-b043-c2067749407f} + {887563d1-e58a-4d22-8777-63849ee84d4e} - {db536065-b865-4d96-bc1f-d7282e85bafb} + {deb09001-9b11-407d-8f0b-53f1ca1e0fcd} - {8cab4ac4-ac32-40aa-bf56-9df51e5b8ee4} + {74ee579e-7f81-464c-9e89-ff3433f11fc7} - {6d707cdc-d681-41c5-bbde-8cdf51d492ee} + {53b73ac8-3058-4a93-8f10-9a1ecd76f290} - {bc98c34c-638b-439f-9950-7a7018270de4} + {8033b931-b040-4a5f-acac-660dfa35e3cc} - {0fef33c1-9328-445e-8a37-25cbd9559144} + {266f094a-ce66-4d14-8c50-63b41401f293} - {bf3d6394-7d39-45de-a409-77e3d7145bf4} + {a5844a83-5883-40b0-b82b-cfc5c6e567c6} diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj b/Net/testsuite/TestSuite_x64_vs140.vcxproj index 0de872ec3..4230afc10 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters index c3a2f6ece..73d5d0f3b 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,172 +2,172 @@ - {0ad3c17b-3f18-4084-a233-1a94a0bf8289} + {7ccdc4cb-6c33-44f0-b86a-629233d54da2} - {c6a19842-32f0-4d75-ad4a-f46ed90b9865} + {6d6c371c-6fa6-46f1-bd79-19900a601be1} - {2280e912-1612-43b5-b868-c72c4fe1ce0e} + {3da6f06b-c468-4b7e-8197-f2a0744a0163} - {5ca693c0-ccef-447c-9d5c-e08aaf4d251d} + {c03f1681-f65b-44be-8df5-20887548e1e4} - {d9183be8-3ae8-4302-8119-b26247b93904} + {2b4c6345-b17f-4147-8829-a61e4e27fe14} - {269dfc07-ac78-422f-a461-b9da62899de5} + {9ccfc455-557b-4ff3-b12e-69d9b5c36afa} - {4c885083-b5f9-45a6-a77f-641db20cf65e} + {6cc67790-d462-4ac5-be35-e65865f5232a} - {81e9f3ef-e78a-4445-84a6-f62a2fa800b9} + {69bb4ef2-dcec-47c5-926f-0c8787171c3e} - {3d1d95a0-9779-4a2c-9629-520de615d8c6} + {49cb1aa8-649d-460f-aa54-f6a3ea04cd51} - {63bc27c6-89a7-4451-862b-28a8e01a6f8f} + {c6fdf3c6-d20c-4f6a-b7bb-8d99daece4c7} - {25cadf91-5b93-41a4-816d-f2a57dddd75e} + {634666c3-e141-4fd0-bae0-75ec50017815} - {4243876a-09ae-46a2-b4a3-6aa1d31bba30} + {2ef1de20-21d0-4e7a-97ca-c0f91aeb9ee4} - {d09830da-d997-4b2f-af0e-10304470ef2f} + {cd90255b-b43a-4133-b11f-eb9c0e441484} - {1f7d4777-1032-4f3c-b35b-0f8b1c67b2e8} + {63356a72-b14d-4730-a78b-f9b5232d1030} - {64b18d94-2061-4781-9c02-4f4f7f86c600} + {fb6ca49c-2a28-408d-bb00-d9aeac8c5293} - {9515135e-e7ed-4013-8172-2ce7cdee9994} + {1ebfcdcc-797a-463f-bcca-6d9f0e4df91c} - {df48516b-57f9-4988-86a0-0581da622070} + {ac6016ca-fbf5-4b1d-a28e-d0dd15303c68} - {81ff2943-d16c-4305-8dc5-f732ce1a6e1c} + {b6a2c7d5-bc5e-49e1-b65a-540181d405ff} - {d585beb4-5d50-43b9-b299-bee61b5c14ac} + {1100c4bf-ac47-4240-ad74-532113ee8cee} - {c32af666-5b84-431d-9d18-c232570d43ed} + {0e863f08-27ed-494c-8977-b03413a9631a} - {11878707-f46d-4405-8ac0-9e07c8b16e66} + {52d76196-c57c-45a5-9163-a4860ea7e50a} - {29a3bb7d-29cf-4a96-947a-79103ce8970c} + {edafd0d7-c8eb-4ff1-9b5a-c3da69b6af41} - {f1723489-b16a-4049-b6a9-54da27f80c1c} + {afd08672-1d12-4b45-9187-10bc72bf8441} - {b5bc3049-eb72-4606-84d4-1875a2b18596} + {3f530142-f4eb-4d1b-8bb5-2468b60ac192} - {800d3964-cb6e-4371-a9d9-bafb8dff6bd9} + {71f65ea4-aeb0-42d5-99c8-f40ea220f597} - {01a0eb73-9324-4608-87ba-c0f16150156d} + {0666137d-0380-4259-aa88-87781e533e31} - {efd651c5-1cb3-453f-998e-60bc2bbe29b7} + {1b0fe140-a103-4767-bdfd-6606d8d3fbde} - {5fbd2510-fe7b-433a-bc59-9da12febba09} + {69565086-be71-428f-81d8-b0e5113e55fd} - {3f8822f5-2b31-4ba8-bda9-24d2f4b37c3b} + {6bb7a0b8-0f43-425e-b774-7c9dcbddd70e} - {54a55210-31d3-4976-93c8-4f84d79599c8} + {10ad2875-599f-498a-ac47-6f8cc8f35bf5} - {cc9e2132-fafe-4c41-9135-b2d26344d2b6} + {5a9f496d-34c9-4c23-8288-fb799806aa24} - {c41ee192-c0ab-441f-a905-5839060c86cd} + {dfab0fcb-af4a-48e0-82d4-35af9d42eafd} - {a6826241-61f9-4ead-b950-17bc935e31c7} + {d290dcb1-a2a4-4ae4-a1c5-0e4780933e53} - {7c868a44-424e-4e6b-b335-8c76251a23fe} + {ea3c1ba2-5ec7-4201-8879-d07ad2458e35} - {15832ccc-a420-4ee7-a133-6dcfa08441cf} + {47dd52e8-e926-4b34-9b23-1dd1574a61eb} - {5d44d371-ef9b-4f24-bd53-53573722044f} + {b265cc67-a530-41f4-bb7a-d6f48874b5e8} - {c44a9b95-5f3e-4702-a017-0ef5d625630c} + {807098dc-7832-4789-8f0c-ee052369e9c2} - {0f0e4c13-1fe2-46b5-8a9d-5ca5fa4e73af} + {58b40530-eda6-42cd-a81b-33d87f46e18d} - {f99c2700-17a8-40c2-b993-3cc87b9dd4e5} + {897d376e-aa72-4a6d-8241-2c7b7d0637ee} - {62daf03f-8bbe-4c2a-8456-50422b269b04} + {71e7cbce-b679-47bf-abf6-35e6efe47859} - {fc9fa4a9-5cbe-4166-be40-43b99eed1346} + {794295dc-6460-4036-acb7-9e9ce400b181} - {429c9f03-070c-4e12-8052-b39ad6466a9d} + {0fe8a99b-9685-4346-ac1c-9da9aff2f969} - {47970d76-7905-4da2-9da2-aa9676649307} + {8c450d53-3aef-4844-84ef-e69fea6d854f} - {def2a8f4-8c20-4c74-9bcf-839de80606d5} + {b78cd1fb-6755-4262-84b7-fefb7a5a401d} - {d995c5ae-7da7-4399-a68e-8bf55c23e849} + {c22cc3d6-ef07-4bd7-8a13-92f7db8d8fd5} - {34e81901-aec2-4853-8902-f28cc67d6e9f} + {1f8dae3f-131c-4c59-9121-cee189500944} - {380d8796-d2b8-452d-841f-6c58391c236b} + {421a10d6-964d-43ce-93b6-b791d8bd9509} - {dfd92c71-0e4f-4b52-9796-103d189f0d81} + {0e9b803c-efe7-4aca-9377-d167345e4c5f} - {4d1a4cec-76a8-446f-b2d2-d047e6f05729} + {29a7bbd8-c518-4be3-9a82-faef7d18037e} - {e0e87973-62ff-4e4b-8b40-e0163143e6ac} + {66cd4c67-6d1e-497b-8e55-996efbb6d94c} - {1890f657-aafe-4a4a-bdd1-e3d6c3068fd2} + {fb36f3e7-a396-44f7-a4e1-8d98ec46254f} - {27d7932a-7917-4754-a9fe-b0fa8aade796} + {4b44cc89-6102-48d7-8bd3-ffcf4fee4413} - {9e28076d-7412-4ea3-bb0e-26c45f500d5b} + {7dca6da0-f56c-42a5-858d-7d88ddfa07b1} - {8369f1f7-ffa2-42e6-8855-f0f8cd7cad3e} + {6b0192b1-397d-469f-84ae-e9339ac0be4c} - {a3d96259-3ae4-4d41-a825-69537352ba95} + {35e430d5-1336-494c-be1f-709c66fd53e2} - {b7353482-0e19-464e-adb5-03afa6e270c6} + {1233db90-78c1-434c-96c6-d9dd65ac4ebf} diff --git a/Net/testsuite/TestSuite_x64_vs150.vcxproj b/Net/testsuite/TestSuite_x64_vs150.vcxproj index 3515b9360..aa2d28fe0 100644 --- a/Net/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,7 @@ Default - PocoCppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +173,7 @@ Default - PocoCppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - PocoCppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - PocoCppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - PocoCppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - PocoCppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters index 651dc4f31..7a6b35cf0 100644 --- a/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,172 +2,172 @@ - {d7ae33fe-a902-4db2-b535-97ddd4d03153} + {641c3de3-2f4e-4596-9785-98d59200cc81} - {72b32f0e-e55f-4cdf-a129-f11b1fd0df9e} + {d5ca4e13-e42f-4258-b608-0afcbf216a1d} - {492d80fb-afa2-4e50-974e-6e7e883f6bd5} + {a7b3e440-8239-42eb-89b7-0e0eb98070e3} - {b44a1da7-89f9-4b60-9b8e-4b55e7360c9b} + {d4c4c9b1-38ab-4e08-9e16-983139f08968} - {def0e6eb-c69d-4099-9cdc-424ac8366ff7} + {07697b79-663d-4b73-95c0-a6adffee4e04} - {8d7c51d1-e1ca-45d9-b392-f5a52695e114} + {9ad66a39-7e25-43e1-84f9-14bcbec492cd} - {d2a39c32-044a-4060-bc23-cf7751f629f6} + {39c59339-6499-4d3d-aac6-ab5dfeafa4fa} - {ed771131-bdaa-4f20-965d-8289eeb92500} + {fdfe376b-2fc6-4bc3-af7a-e9e422e7bd89} - {cf071d58-928e-451f-9a8b-c0b967a3e73f} + {1702aac5-5dd5-4caa-b7b1-491c0960a964} - {b6e2804a-ed6f-4d24-9a19-33290de28738} + {a6707554-3ee3-4447-8f6e-e2085d12c631} - {5f658c6c-8a33-4b05-be07-1183a393083e} + {6e0ba6aa-5c5f-4b79-b7c2-2088f61ae97b} - {fc76a313-5fa2-458a-a86c-2c3cc4daec1f} + {1fe1c1a3-fecd-4143-9fff-70f40bb5ef38} - {3757d635-1877-48d8-9d3d-05fc2125a6eb} + {ea91d715-dd1e-478e-9f31-df4391221124} - {debf07ff-7d49-4538-9c29-8b33c6f2d6f7} + {d2bc45f0-4635-49ea-b6dd-45d346bfd519} - {7f7ae079-cb80-44d1-bac4-378f6abae620} + {943707c4-d20c-472b-b1e5-38987cebcba2} - {e1f763c0-855f-4d96-b3ce-1a7d48377aed} + {f95389e5-be1a-4fb6-a288-a37e7503accc} - {9f42751a-ccb6-42cc-9799-5f588b08854c} + {b8248b95-725d-4d45-a550-9f9edef2258d} - {15904822-e9ad-4061-ac9f-d41603cfa28d} + {adf0cff2-f92d-4358-86bd-c51849330a8f} - {b677a181-a6cc-4b1d-94d7-9238dae15a11} + {ee9c5eb5-c155-416d-a69f-78e33b0a363e} - {c79015a7-5ab7-46c6-8c36-497c9fcac34a} + {6e416888-c7d0-457c-a189-548f06ddcd28} - {088017c4-cd7f-45a3-9aba-053217488a0c} + {9dac734c-986d-407b-be8d-859dc275a069} - {e4aa906a-fecb-4151-beb5-eaee62efd348} + {ea1a208b-56d9-450e-8d8a-079a80aa9b6e} - {d9d71cfc-34b1-4b12-8277-b0cfe046e210} + {95364116-be62-4f46-aae7-01557dc9e36f} - {97aed451-6283-48e7-b5df-19cdb237ffea} + {20c2f904-163a-49dc-bc48-6f502036df23} - {abfc8b0f-dea4-43aa-8a04-39ccdbad08e3} + {c1bd6a97-e27a-4463-ab90-95015fcb1d3a} - {fb30d633-9ec0-41ef-befb-97d3ccd69176} + {dbfd52a7-7580-4087-8649-8e95cd55673c} - {ced03afb-0ba3-4563-a134-41e32591115e} + {d511653b-ad97-4197-ad95-abfa16210e56} - {bb53f79e-9aa0-45f4-ab50-f6c7fa5a3556} + {9f728f88-816b-4b2f-9265-b9197888c0fc} - {c2eb7d34-80e2-4399-a977-14b869d52a28} + {d8c614a2-35f1-431c-91d0-52e33f047e8e} - {4f7a43fc-7468-4b85-9d04-f0810b113ebc} + {85c1255a-975d-435e-89bf-591d8150eb6f} - {15236f30-30a4-4a27-9652-ad3dcb79d0c8} + {05c23e26-3173-461b-a026-81f7b10356e1} - {94b3150f-b9ea-4c97-8f2a-ffbc1b3b96b4} + {3a5938bd-febc-4a67-99e4-0cae6ea01d39} - {6028c42a-6bf5-4d45-8603-5e6f76f237a4} + {74e4bfae-f2b6-4d85-9318-67ec2edd9b39} - {1909f02f-a803-427b-90ee-08c04210d2e8} + {bed73841-62e1-4d86-ac39-66ede1ee2585} - {7a1d7ee5-5d87-4490-a69c-440bc88d3138} + {580b29cd-5289-4f81-ba51-2c86032dd679} - {5ba8db43-bd28-4f56-bf54-47a4a70c30d6} + {bb07095a-569a-48c3-97d5-e5f7cd3d9b58} - {8aaa7d49-228f-49b4-aba9-53eb821d64fe} + {cc492368-24c5-4646-b3b0-740c466a0d85} - {5503edc7-b466-4919-b191-6c16766e0e5e} + {6719e6bd-2711-4d9c-a32e-a4f86d5258fb} - {e0328083-ae19-435c-a390-0f35edb0feaf} + {16ea20f5-4d94-4713-8ad4-1a69f895d58f} - {65cb0903-2818-4e53-8229-9a1cd599d6d7} + {5b3aacbb-0d51-48f2-9ae9-60c0fb01b430} - {941fadc7-d989-4456-8830-7d9bce83fef4} + {e997d869-b49e-4d44-abbb-4e44a232ba82} - {69cb3b3d-cb8e-4611-9803-229b83a454ab} + {5bd9e0af-fbe8-4d2d-9481-30b61f92e4fb} - {dc3176d6-e82b-4905-900d-682241537deb} + {833937fa-135a-4cba-bb8a-8e5f79f4e023} - {ba87813b-5d72-42b8-a40b-753dddaf331d} + {f499d60f-9ed1-4066-acd4-b6332ef4d308} - {124ffbd9-2429-4b9a-8fa2-7cfc739dc452} + {307eb85e-ce99-46fc-a529-114b038f9f94} - {ad8ba71b-5d39-4a15-a83f-77ede3d70964} + {c117e211-5890-4341-9b62-ae310f8b3ebc} - {3009fd90-d5b3-4b1e-a557-5a7a900a91b7} + {90d78508-469c-4ddf-9654-8cf6ca427470} - {55838aaf-cd55-4301-a50e-a7fe758bf8f2} + {aa7d6435-ecf2-4ace-a2d3-470c64f465a7} - {0660a617-6333-47a9-9e42-1b305eac8218} + {c0f4820d-19d1-441d-86ec-58cfaa9542ed} - {13f49f49-9cdc-4d70-b0df-3e4e9cd18ffb} + {4346da68-7b36-4223-b3ab-159304193cbe} - {d96c7a20-f8f3-46bf-8f60-ee0ad6085f08} + {8f2992ef-549f-4d31-a512-fd8a54009119} - {8fa3cacf-d9b8-4d0c-87bf-b170828314b7} + {afb5c286-acb9-4f5e-b028-7200d66b02f5} - {c7d5c9fe-fc61-4575-b19a-5105300ddb27} + {f692924d-208a-414f-afbf-93742c3330f5} - {00de881a-a166-4b85-9af7-f6c0883bdd27} + {e0ce7445-dcc4-4973-b5e8-9453c914205a} - {a192e34d-416d-4a62-9cbf-66a43fdff491} + {ee7d39ca-256d-4467-b014-89539973fc57} - {0511bf10-c553-4857-be10-ddbdaf285236} + {229f99cf-6398-44e1-9031-8d4d83461dd0} diff --git a/Net/testsuite/TestSuite_x64_vs90.vcproj b/Net/testsuite/TestSuite_x64_vs90.vcproj index d74da6a79..f543b6875 100644 --- a/Net/testsuite/TestSuite_x64_vs90.vcproj +++ b/Net/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - {1a20e745-7fc6-45b7-96b9-a7b5c053b79a} + {de4bde86-81b5-409f-9785-21e25df50fb6} - {8b1701b0-6090-4ab6-93c3-6fc6a9260cc1} + {8e740e5b-b035-42e3-a18e-0a059b54e1b9} - {2ab6a506-6942-417b-92b1-5ddb6acd78d3} + {fa9cef92-1cf6-406c-9040-03b8c9cf7ba7} - {cfdaaa00-1218-40d9-b651-2daa2b1b6dd6} + {f1bb4aad-096f-46c3-b00f-42b66ddffa68} - {b40ed1dc-2cdb-4b3a-9a4e-c98af899804f} + {da536134-5cab-470f-9a6a-3fcf04d36e5f} - {6efdebfc-7881-45ff-8728-88df397a124d} + {092ce90c-9a13-4f50-913d-760ab25b6d3f} - {70a124bb-bbb9-47d4-bec0-01e49ad64c70} + {3160d8f0-6621-497f-a014-57bae23548fd} - {01a30665-da16-4a3a-84c5-11dcc1763677} + {85753ab4-919f-4121-bb79-eab556ca702d} - {26e0f93f-57dc-49b2-a8f5-66900898c9a3} + {afde73de-c467-4531-a6f8-6201152bef9d} - {e39c51a5-f581-40cb-b7b7-209a21503896} + {08a3e285-b4fc-496f-82f7-90688209cbbe} - {90832d53-557f-4d60-acc3-826f5a52b744} + {ed1814f3-c267-44f7-9a26-36631c9507b7} - {2cb6b52d-baad-4cdb-8b1a-4c61c4c2b804} + {3a03ec56-7a28-48c8-a63f-94878c826165} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters index 9f1ddb492..6b5746595 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {01d556ba-864e-4f74-a01e-cfab49cd9028} + {873cd939-71c9-459a-b3ce-728c37230958} - {dac73941-a6b4-44c5-ba06-c7e3361a143c} + {354d11bc-2807-4652-acaa-a32950414190} - {959350f0-969c-4622-8b9e-510c74b2600d} + {0f8c9e4b-9bc5-4e02-8b0b-d056495cce88} - {eeb59b33-85ae-496e-bdce-80304efb2ef0} + {f35da691-b70c-4767-9e73-b9a19ca47adb} - {c68e09f0-1074-4e7e-91cb-7c92d23b9efd} + {23acd224-06e8-4b5f-8b62-f0bc2ebd70e9} - {a676ac16-8333-410c-b9f0-862b4e93a1b5} + {c2fe383b-febb-4dbc-989b-859d924807a9} - {74c54d72-d95e-4e0b-8f7b-ead5e18d8611} + {194af52b-99b5-49a7-9069-20dc49dd9ddb} - {4c0af080-3466-47ed-80b4-817578ff1d11} + {a88912d4-563b-4c54-a581-6e32bed8efc5} - {b0631b04-f1d3-4f7c-8a58-4336d9e008f4} + {62edf581-36cd-4f83-bf40-8c2c8baec494} - {6f9def71-ed1d-4e22-8393-de84bfb71ca3} + {0f32686a-6c4a-4065-8a2d-910d08a7a8e9} - {1162ec08-a090-4457-b027-b37f090876e6} + {10d62e86-6576-40dd-9187-83d4bc2b668f} - {c3e65083-25b3-421c-bfaa-e3ab88c52487} + {dff2279f-88cc-4283-89ef-e4fe5c56f1bb} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters index c5e5734fe..18732e87c 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {292d71cd-4740-4b8a-a29f-9dfa51f80364} + {1cc83f79-bf2f-410a-a7ce-66eda2f76221} - {cbd6948e-8e36-468c-a32b-6198289eea69} + {b603b8d8-1fdb-4751-8eb0-5460d0d43e76} - {aca38e46-e300-44a7-96fc-975b6aac4953} + {5faa19a9-63fb-47cc-8219-a175819ccd5b} - {705543df-190c-4eda-a4f3-d984bb7f3336} + {b069d250-5f8b-4f2b-a210-89edc0ec8242} - {9974072d-52cb-4c04-ad7c-3e5a4e286a25} + {047b73ec-4f3e-44d2-a1ac-d4150988dae3} - {8f4ce4ba-1c92-40bd-a6ee-d3773dfbfaef} + {e59ccb6b-be2b-4b63-b06b-46ae30c3fa1c} - {a2f317de-9895-4968-8c6c-f419ac1579de} + {1b29dbf6-fdd5-492f-9b68-45a06428029e} - {7d47a96f-ac2c-46f5-8246-b6d20b63ca8f} + {8125f775-2adf-4e46-af4e-dfd0cf73ecea} - {08a6a93b-16e7-47f5-954e-0f4e189f1039} + {acc4cb9e-c88c-482f-a27e-81d7d04a4cdc} - {68957197-bffd-4ca0-9d9f-85bf0bac1080} + {97c7eef9-2c06-4f66-b6c9-398119fcb3e0} - {f86eba72-6568-4bd6-b0eb-c5db57ee20da} + {a8d1d7ae-aeec-4473-b572-15b13cc05153} - {ae132925-2f84-467b-bcc8-11dbf4ba900d} + {a60bb155-b04a-4941-b249-6c9ac5a91d86} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters index 92e1237a5..c28387921 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {ba762dc4-c326-4752-8b29-ff187addf320} + {cccdcb8a-b2b5-4784-8759-47d7c075f26b} - {d7b5a941-6384-4a14-963c-7062bd08d5dc} + {b59220e7-4793-4bec-a1e9-7a4059a4d73e} - {eb17036d-ea16-4c21-bd2e-22a49f2e11b2} + {9db1dcdd-8143-41cc-8fe6-cb844c995821} - {6a529610-c47d-4b91-89aa-cc668fc5ba7a} + {394a7ef7-a1bc-4aec-8379-24cb75a8c0f4} - {b2a7e81a-3948-4f0e-91a2-9d60f56869d8} + {3b8c62b9-8fdd-4f3d-9c96-6f191c6dc64f} - {06cbd30c-838e-4b13-8bf2-ec1cc45eaece} + {1060843b-faf8-4556-ad56-95dcfa39ed81} - {08408d22-3def-4522-b656-815ec8b62151} + {44f42aeb-b236-4282-a137-9f8101df0fe4} - {155fcae5-a791-4574-8b24-0c0f64373d6f} + {5a358f56-8711-4729-95f8-cc6157754704} - {fc879d37-4824-461a-a1b9-1bb9ef4dc58d} + {75427ed6-f8f7-409b-ad88-4eb308916659} - {92683c97-c424-4702-bdc7-8769448a463d} + {df589355-1d27-4c5f-aa46-44dd1d2b3387} - {127e4202-3524-4392-98f1-9e248f615456} + {f12d4b93-3114-469b-a509-5c3638332a54} - {abd97328-3f23-4de5-a60a-2874bfaf6910} + {dba85608-d92f-4bdc-a53b-59377e4f1198} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters index f4db7a159..4d70110b7 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {476b0a65-a93c-4937-8cdd-985b00cc1a73} + {447d3457-92d6-4ed5-8621-1f6ff863d448} - {24c8bb45-6093-41ce-8f33-469780619742} + {33418c9c-0f31-4645-967f-86610240f5e9} - {2fa369e8-f936-4017-85af-9b52c524314b} + {892446c6-d9a0-48bd-a815-e58471cda786} - {fdc4a2eb-616b-4174-90cb-7575a3348869} + {0f9fa4f0-36fc-4a9b-8b66-99ce73682b2c} - {41398d45-0dd4-41d2-9a3c-9a2c4cabf471} + {ce2c87c0-e4f9-44d1-bf10-e701917e60db} - {3851ffbf-94af-4a2e-9e3b-460f47b4b12e} + {8116c3b7-ac54-4b8d-a71d-a8fa3739e699} - {aba0de4f-7045-45fb-a44d-a77dd9f8a8cd} + {ef45c6bc-74fc-4772-a769-6bb061787e11} - {97c6ebaf-c519-4646-b730-6377127a208b} + {fb348529-6478-4a01-a181-ca26883daa8d} - {15e2476b-93df-4fbb-b969-e054d2fba6ff} + {11f3bd95-d163-45d2-95e5-6b99baa1d0e5} - {060d58d2-2c8f-40e0-8078-fbf325a54342} + {518e0008-7a73-45b5-9cd0-4c8951849e92} - {b611071c-ba30-45d4-8d82-809693d7ee48} + {d0a4221d-3eaa-452d-81f6-6bc96264370c} - {474ee4a9-d551-4de9-a655-0cec2e629152} + {c05a7af1-460c-40ea-8630-393d0a301868} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters index d24a15d75..89296594a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {8994f590-d042-42a3-8b84-567e16ce78ae} + {372070af-2d16-4cef-9d5a-3ab6e9b04b5c} - {76d07f9e-cdd9-4bb6-aa9d-7083b2169470} + {707e1232-6570-48d4-9ea8-e4f9c73fd946} - {ddfb5131-5d86-43a4-9382-65045745bc60} + {90de6ee1-3c38-423a-82a0-f6c54d4b7666} - {1985d8bd-0a3b-4947-be26-89f54b973711} + {ba18da2a-c347-45db-8b7a-84dca9a307f8} - {30ca2ee3-91c7-46f1-bc99-378ab5d764f2} + {3b32d159-e189-427a-a86d-dc6fcdc04e62} - {10cb9671-6104-4dec-aa01-78afd2ee79a6} + {a6fb8f84-f90c-4a34-9365-12f96e78a737} - {0e4cc316-185c-457a-8351-49bb9531259c} + {078d2788-dc66-4c36-86ac-02142cab1371} - {72514ad8-2241-41c6-b7f0-4b90a37fd90e} + {6437f2a1-f29c-484e-a2f6-1aefa4cb33d4} - {2655a56b-63c7-4e01-8510-c93ba03f30f5} + {026a79cd-61f9-4508-af82-266a9a1e060d} - {a988ebc3-4daa-4492-a38a-22fca2e93f99} + {31aa3784-d799-41ee-bfc8-008aedfe2075} - {22145aa6-1192-4f2e-b778-ebabe3e221d5} + {435e3d78-57f8-4156-8e6d-9ffb4b5d1a8f} - {b9c264ef-0839-4987-9404-17624642abc3} + {c8975c83-d8bf-4b60-9478-59e6a8367442} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj index fb1b6e3f8..ee5fd6b1a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters index c50377833..20c58bfc1 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {8eae7c94-e434-4312-a55d-acfa3a9d7070} + {9c2efa26-dea2-423c-a9f9-d97d9985aba1} - {9e4f6f5a-f963-4ea8-84dc-d516afd0fca4} + {694caa45-e0b5-4ee9-b6b7-61f82d37e24f} - {37b53d0a-5b14-4de6-9672-ea929609b4bb} + {c4a15c90-feb5-4478-83d6-e79ee6eda9f5} - {d9773e6d-382d-40a9-ba59-4a777df35aae} + {c034c674-828e-436a-ad75-73e85a394a70} - {1f376db2-b7ec-4213-ba85-bcf049932c15} + {62970996-92be-45cf-86e1-6dd81e61c72d} - {4a5c84e5-2f22-4b1a-8f9d-fb48eae6bea2} + {97ff61dd-fd30-40ef-bf84-05c14e75e5c0} - {26681a52-a072-4658-9368-aa0b81fb83fd} + {5105f523-1701-468f-9190-747c32b66948} - {462e20f9-83a5-48df-b95b-9302beb9ad23} + {8160a6d5-3eab-460c-b71c-6a5110d201ab} - {aef1ab55-f52f-4d3b-9a64-ded940daea0e} + {d6aaf798-ace0-4fcb-b6a4-3ff3cf8bade8} - {69388c48-04fb-48a5-bae9-f0080c7ee0e3} + {fea6be12-7547-43cd-87d7-da65b4758e00} - {76cac19b-5d39-4039-947b-bc2f43c1aadf} + {43d99542-6d1b-40aa-9bf0-683899c462b2} - {743cc6d8-df18-4e3d-8234-f9eb19aebc8a} + {d635bf65-bd04-4179-8615-e9468f3eba7f} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters index e5d31bcdd..cbbe68d38 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {9a268a6b-4155-4d8e-b5ae-88677c1ec65a} + {3b82232d-40b1-4b4a-8080-faa62300b621} - {f5064488-a5d4-44c8-9103-1a8d276e6abf} + {4b6ccb20-d875-4014-a787-964fe710bcff} - {f4d1348c-3a03-41fa-a1e8-8da035484235} + {05a09f83-ee9f-4e1f-9f3c-a0683acc0239} - {3f2b893b-d012-4cde-a8df-f92827d2dc1d} + {10739beb-0f09-482d-a743-919e72513866} - {e8b1564a-0dbb-439f-860f-15d61a94cd99} + {a68264bd-0dd7-47be-a2a5-69d427879c5f} - {fbc4e4a8-8aa5-4516-8468-65ac03218182} + {87e168ba-df9b-4930-9a21-b1948159c0be} - {7372a540-762c-4f07-b07b-bef3cada5633} + {ddda8851-33bd-4920-8f89-6c612c7d1904} - {3b34fc6b-ff45-4332-86d9-1e95c23c66fe} + {755fa7e4-52c4-4de0-83cb-342e7e8e89f4} - {3af63625-6768-485b-9969-6bf8cf47e9b5} + {916c9417-c099-46a4-ad1f-476cb2fc31e1} - {914c0b94-ef3e-4c40-8a8f-088ca1e2c6d0} + {11195836-aa5b-48e3-9ef2-e9b175ab3bdb} - {92c4af72-7d1c-4574-98da-6bfbaa55a254} + {d1918f07-e666-4cec-8e5a-68c0080dfcd4} - {1b7b64fb-e588-4e3b-b843-070d555260ed} + {59d4140d-9cc3-450c-aeb1-a34c0dc7fa31} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters index c47122077..539b50e2d 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {48ae00b3-ea93-485a-a36e-2102990520ed} + {5fde21e3-b4e3-4138-bd7a-656aca4f79db} - {181170a1-6993-4ace-bb67-9614196f9a0b} + {c2c42b4f-1d23-4de2-b166-1b60e7e7f594} - {f4075af1-a2dc-4d97-8b39-0faacf1cf712} + {68ad80b3-cf23-4f6c-8df6-196aedf07157} - {5af805b5-f0f9-4bce-aaf9-a33b5828469b} + {6224dc57-76bb-4582-b801-614464415a5c} - {3c2d62c0-0b2e-41a9-a825-747e2aee7d57} + {5ab051ca-5937-4e55-9626-d6dc21ef287f} - {8ee36886-68c9-4242-9742-eb2139b9a6bd} + {41e88c91-5cc8-4e59-a6ce-a5de1ef8464a} - {35357a3f-b50c-4e2d-b22c-8f5cf8729b0d} + {656e051d-1fd0-4a12-b6f7-f5a17c807568} - {0cb4c715-8f3a-4f5e-b1f2-ffe599965501} + {5f878b79-0592-448d-b62d-c32846edbcb1} - {9b923613-5b70-4336-b05c-d328b8c67a77} + {6326304e-d59a-4131-af21-eec028332542} - {77f89a55-61e3-40b2-a675-b5d10f75dea2} + {38a1023b-c393-48af-a6ca-2229fdf3ad7b} - {6891bf41-a4be-400b-98c0-27ddf17aec75} + {fd16ac4b-2935-4fa1-b9c4-9426823cfafb} - {0c944c18-a608-4ee9-b82e-a156c52240f0} + {bc979006-3014-43b0-8e98-f3b45d0f3c5a} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters index 4848067b2..ffa72cefe 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {a7afc946-fa77-4b93-b50e-c6716c1d65ed} + {d5a60b28-210e-4bc2-8c00-502aa9bf31d8} - {8987c3d3-46b8-44c2-91ac-aa57187d3b8c} + {f31e352e-e6e0-40f1-96d1-c4dbc59a7385} - {ff54263d-c3f2-43bb-9a56-f46c81f2d7c6} + {df71e582-af12-4300-be91-52caada9d3d3} - {345e22d1-e8a8-450f-8714-fdce9ea3de9d} + {4726f576-8464-48a9-b829-c87241000638} - {3751364a-b2db-4987-9606-c8e9a6e8e44d} + {591d7a56-daeb-4b65-8806-e0966985f1a6} - {67b4d3c7-1519-469e-8f8d-817d707a96d6} + {2d1086a4-a377-41f8-af88-17452dc75427} - {dd511a54-46e7-47c3-996d-fae308820d8d} + {9acc93f3-33b0-4c59-87f3-18df92602409} - {daae72fe-336a-44e3-9e10-91c2106c295e} + {83810dc9-04e1-4033-a9d7-59e18635592e} - {159e91f3-aae2-4f59-a9da-d7be6daffe16} + {cb76989d-cae0-477f-aaa8-dc50c17cf3f4} - {21c7c4aa-bda6-4788-b59f-54e786190955} + {6786361b-897f-4616-af25-5c3a00a972c3} - {fdd65478-ce86-48bf-9dd3-31529c0e92d2} + {df6a573f-4135-4388-a366-b1b0d219cf7d} - {8c956fb2-aed5-4509-abb2-4a2598d8ef3d} + {f5c92a5d-a483-4ac5-90e6-e48180609ce1} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters index ddaf28ebb..c874c25eb 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {86b8d651-fda5-43ff-a23c-125a5caeffa7} + {17ee5989-92ca-4d04-a5c7-001092eacf05} - {bce64c38-0b96-43a7-8b32-e86e3d3d64d7} + {ef6b4b39-1e7d-49e3-9fdf-1faf7a64ef58} - {35106e07-f87e-47cc-9cba-132a4bbd178d} + {fe1770e7-d189-4f10-a0f6-e35364f58e1d} - {7a5ecd78-0724-423c-ab9d-86652bad1525} + {3f16349f-1e5c-4708-a069-88a273acaa93} - {279b1f52-96d9-42d4-9fda-ecbb9b549881} + {3c8f53ce-ee64-44ee-900b-c05a345b6809} - {7b6f737d-22ee-4f94-b328-4cb3ef267878} + {435e3cd6-86b4-4350-ab2f-4e82d8cc13b8} - {2559c5b7-1ca4-4a77-9941-d26b12505e4b} + {dde07db5-6e85-4a3c-8b71-a36f358c848e} - {b1323aac-d2d9-47ca-92e1-3424bd309203} + {77bc3055-1613-4526-9384-6e344f28c2d2} - {172266f9-dae1-44c0-a3b9-75f143eb21a5} + {05cf9015-1d5f-474f-b202-c033747b4f0e} - {343e2b2d-f377-407b-9f3e-b145dec7451c} + {0c67aaab-548b-4968-ac3f-d78367d0fccf} - {a19ad120-3354-48df-b8f6-5a24b1d4726e} + {d860eedc-01ef-4a80-8cc9-f933a1a1415b} - {d9b798af-586b-477a-96af-99b30c76e510} + {14824451-12ef-4f02-b020-ac14018eafa2} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj index 743d093d4..64948182a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27428.2015 + <_ProjectFileVersion>15.0.27625.0 PocoNetSSL64d PocoNetSSLmdd PocoNetSSLmtd diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters index 096512ac2..9fbce84b5 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {b7ff5766-fb4c-48ff-8e2d-e0097d45e99e} + {774c5c33-bbbd-4e88-b20a-d91534245ad3} - {c3627f81-565e-4ac5-97d6-cc625f3db0c8} + {e0d729ae-c066-43c0-89ea-bd48bb1a22ed} - {d84f4155-eb80-4625-a61d-8eeaad21bb16} + {e31b84e1-5fd5-4483-b529-43cb5f0c5b5e} - {b266cdd3-e6ad-49ef-a6db-273fcf550341} + {d9a98381-ea4e-40eb-a551-1f886c765417} - {65ae2133-a62d-4bae-acfb-cbeb41d537af} + {2d10d9f1-37c0-4db0-bec8-b83ea88dd51a} - {f1ca99fe-1754-41d8-8b64-a47c19fb181d} + {df887a80-8771-4067-bd89-f429fc826996} - {3094d07a-f5c0-44da-a781-9897b7adcdfd} + {bb8cbbca-ec4b-4219-a460-b9430c680c5a} - {7cd54e0c-aff5-4d4d-ae19-9b3f57578942} + {2f8761fc-715b-481f-a04a-73561f0c7f21} - {cb3d11cb-95f1-4fb0-8b9e-3a16f4446f60} + {578f3c5d-6b63-4b79-96fa-848dd2d60451} - {22dc6643-cfc9-45c2-9622-7e2630ebbc34} + {80d90131-d0f2-4e45-8acb-62a2559fef16} - {ad4197d6-50e2-4cb6-8163-7a7cbdc4ea33} + {0f548b1d-03be-4cc1-b7d9-e864bf9f1fb7} - {0f055ed6-6865-439d-a2d8-6ec981b81716} + {a38f3e61-d3e3-4635-b0a1-5417a8712e00} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj index 7555cf89c..c68b8eee9 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> - + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 1a3d9fcc4..4d433ea4f 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {0094b3f5-dd04-426f-8065-d1057bffd2c0} + {9c27b20b-1575-4883-a5b3-e21fe2c91de7} - {dee2a971-5909-495c-9577-5d5a7572b919} + {690aa1af-3a50-4a44-84bf-a671da320cfa} - {57d5f549-0c04-4ee8-9f1c-06d80ea691d6} + {13331a17-087f-4bdd-9cd6-fe733a939a72} - {460e47f4-796d-4b50-aee6-bb92a5d7367f} + {c27af793-9708-48e1-ba72-257f2a5dfde4} - {06990bb8-9bf4-4c33-b747-83444bec352e} + {27c03cf4-77dd-45d2-8cd6-9fe7027bc1e0} - {ea9b2346-9f02-461e-9346-8d6f35c870f8} + {ac0f97e8-8d2b-488f-b7c1-57b36729109e} - {53cef1ac-471a-4986-ae13-8314fe69a2fb} + {3d3cd1c2-b640-4076-b580-faa167a97ed9} - {42122895-a8b6-4a35-84c6-1ba499f20c10} + {3f149b2b-37bc-4d6a-90c1-5b38ebee1873} - {940dc02e-669a-407d-993f-cf761c52f708} + {3d1ac5a2-3c90-475a-9fce-84a764cb1f51} - {2e1e6a34-e5c4-4bd2-97e6-710c4f4e3453} + {d8b6d060-06bd-4d67-969a-75d528cf92aa} - {6797d4b2-ce2a-4d61-8b19-7bcbd8a02fcf} + {120ff0e9-e654-4d3d-8106-c90c183bcfd8} - {be71bb16-8dbc-4ef6-89ba-4b3e31f08cb3} + {6c18d667-285f-47f3-8952-4c4db5a1e008} - {af572ac4-85b9-459a-8616-f78324fb8b4b} + {41c9ec76-6bb7-4b74-b06b-2b6c32fc10f1} - {0ab081a2-eb29-4a4b-9633-1abd0419f420} + {11c80eea-25c3-4878-9eab-04b341240349} - {165ed459-b803-459f-946b-ccd208f21812} + {7a4e9dff-b634-4139-9c60-73b0dcca5f0d} - {32937301-e584-402e-9b8e-7ea5a11f30f4} + {8d5a050d-78ac-46b2-94fe-6716964f25dc} - {16335029-fdd3-4bae-a07e-058b86a3466c} + {cbc81b62-1881-4664-9e4b-66fd9f173b0a} - {25572456-d5a6-4931-b497-6d65f5354be0} + {256afedc-cf3b-4e1b-934f-87e591a84411} - {5365d86b-4a0a-4e7c-bbf0-df96a9df86ee} + {e84d23b9-eff9-4c21-81dc-4d20a783f831} - {fbe525db-9c1d-455c-9388-421299ff9957} + {5aa24339-681a-4f42-b345-b645174afd53} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj index ce54bbd98..1f648b488 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -37,6 +37,7 @@ + @@ -48,7 +49,6 @@ - diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 11673a13f..15b9e6539 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {2b3c0cae-3703-4286-b2a5-9f52f81b82f5} + {9166edca-d890-4cfd-9a41-c875a755b926} - {b5372dc7-7d68-407e-8950-7f248497d6f3} + {4cd35ed2-475a-43f5-8921-4a0a5ea2be6e} - {442dab13-c13f-4145-ad56-af2786759699} + {dd9ed803-4eb0-4167-a548-99abac9228a7} - {c276d5d6-865a-4ed9-8150-af70267900c2} + {60a9286f-329b-4d71-8ead-23e446705bcd} - {61e02789-5ce2-46f9-a833-d35cef5d8bae} + {f864e265-2115-4ae4-bbb3-4165b5b799f8} - {a304867b-7f89-4d47-9666-7e22d675e2b2} + {a508e16c-5731-46ff-b1ba-dbf7514eb5f3} - {32610585-0274-4d61-b117-32471f734eab} + {cc05fff9-609d-4520-8e11-3f5ae2ce138a} - {a611c898-64d2-44d0-8a69-546280ef555d} + {e4ba5e65-d6a1-44c7-91a5-ec39e4b097d5} - {1b1ee794-b3c3-4027-a6df-6da2328b7434} + {57b429fc-624a-48c3-a510-225bb0f6b8a5} - {a460da9c-cc78-4c53-a965-9aadba0d98f1} + {c5f60a1d-ece8-4251-813a-cca93fae0bec} - {7ac382a5-03d5-4192-9d22-95ffa8358ab1} + {d9c4b718-e3ac-470f-bd53-059de7d9746d} - {83d64af2-1a1e-4206-99d2-9f504504e339} + {902218d5-b4e6-4eab-aa76-97f3405281f0} - {4e36ab31-8608-413c-b46e-12d190074bce} + {3bf7259a-9f7c-45a7-93ae-79129fc48111} - {07e7c1d8-8979-4ad8-a899-b65cce7a33bb} + {3388f19c-d168-423f-ad17-9adf4beb1c0a} - {bd44d191-ae79-4d8c-97e1-439f2ec105cd} + {e0ec249c-5dd7-4c2a-a2c8-8381eb43632f} - {66baeaaa-0ca4-47b0-8a30-021e8f62cb9e} + {caeb8c47-f969-4ed9-9f83-10972d840d97} - {32469b12-1f57-46d3-9a33-ecb6e2023041} + {1157d07f-8e4a-4324-8c58-f9e1cbfb1c51} - {504b7354-6320-4ed6-a8bc-6a8c9dc8d0d7} + {cd3cfe46-ebd9-417e-8cfa-d196813c7cca} - {74e18c64-f038-451f-8b95-84f715558925} + {d871de9d-f89d-42c3-a64c-6dbe2caecac9} - {d6031e1a-0aef-487b-a1fc-7d9afa9a6459} + {5cb98b99-f585-4641-9243-a4961b6cb394} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj index 090f22161..171f288dd 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -327,7 +327,7 @@ - + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters index 1cdcc7a3d..4b99a3ec0 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {bdb700ea-f80d-43c2-84d1-d36701a98b68} + {526f8dd9-8191-4d83-bed2-38a498da8b66} - {cfb336da-b5f6-4482-be71-7093c0b5c107} + {e256eec3-03af-4027-880e-105fb6083591} - {81e3600b-cbf2-4b10-95b3-f9a2a99d34b4} + {8619b12b-a077-41c3-b4e1-f6380fc0474a} - {052a2d2d-11ce-4af1-9eda-005291be3548} + {1a831e4c-6209-494d-a916-c78a75a88c56} - {6c55bb11-284d-4ff1-a06b-9d3327e988c0} + {751dbed1-2d7a-4ea2-8ee0-2dafaf076e11} - {bae564c3-bb12-4419-bd80-5398aec50eea} + {fc1685c5-9690-4d15-9029-87d69eecd4d5} - {b5b8aa11-4cf4-4da1-8be8-ea72786bc320} + {1c1bbd63-086b-4358-9237-8e5eb4d3b3d0} - {aa57673e-bfb1-4379-b9af-dceebc4a3d11} + {6812ca22-8872-458e-befb-b6582a95686b} - {687ad50e-a55c-47ba-988c-b14d3b0d1383} + {9ce9eaa5-c23d-4d78-a8a0-bffcbc631f0b} - {4162e381-9815-49dd-9a9b-7453b9bc872e} + {9bbd9eb9-594c-4639-a125-61a93ef648ee} - {6e8342ac-fc25-43bd-9621-1b3a13f1ae68} + {c49d92ec-0b36-4fff-94a1-3f77536d12ec} - {37e3d67e-6c38-4f63-8b06-444cb1023864} + {db8dbc67-eb62-4a7d-8d29-8d8faf1841a0} - {5526c526-1951-4ef3-99a9-92192a6be9f2} + {1e3c990a-b119-4cfa-9abc-34840d533167} - {7fa3c7ea-a8ef-4727-9515-c4105e95f829} + {a32dd7c5-fb77-4caf-80e5-71616f531479} - {af53bd90-7286-485c-98db-01882d727b5e} + {3a884411-4b16-4bbf-8957-fb6d4906429a} - {47989df5-8b53-4022-bbf4-9d13d2019d40} + {1d1ee699-c258-4a24-93c3-a4c8909dbf94} - {e3aa1327-098f-46e8-a7c8-ea08a762793c} + {7b98180b-2412-422f-abca-65b2b580abf7} - {b9e09d15-5b91-4616-b0ba-f1dcb42a1203} + {20a03ced-8b30-4500-b4f0-52a9d610e72a} - {00340bb6-c416-4159-98f3-ddd553455924} + {2b4e71d4-389c-4bf4-bdc1-37b6bf3beec8} - {6036ad4e-67fb-4a7d-8c75-a23750ac6fe1} + {9eab0089-b97c-4113-a70c-cad4e6a86d32} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj index 359c24ff1..043f816a8 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -327,7 +327,7 @@ - + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters index 4cade6310..6955dc383 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {ed66191f-93c6-4065-85fc-8f4f04e2e3ae} + {391016e0-7e7b-426b-a9e0-5562c17c265b} - {5372aa75-991a-4151-8734-b1209373462a} + {d97e8552-36fc-4ef2-8e09-719da609cfa6} - {c8f038ba-be09-4934-89a6-1e4a7b081956} + {5d158d36-f791-4aa0-b293-e6cf54930cd7} - {f10dadfe-472d-49e2-b17b-052c606f602e} + {00891835-cb2b-48ef-a470-881cb2d6c419} - {e48726f7-12f8-460e-bda1-a3b823f3b25c} + {34d98c7f-a78f-4b60-a3e7-10fa184073ea} - {3bc9bb1f-6974-4e80-8732-00420029d936} + {d6c14dbc-07f5-4574-bab8-18543032a209} - {3b1f2e4c-7c3f-4890-ac3b-da2a58e8f69c} + {b7012f50-e77c-4e3a-85db-b2fa16fa7209} - {4a619fb8-a190-4b5c-8632-40b7e8a77354} + {232e8877-72f7-48b2-a869-446f14c097fe} - {ef318de7-fc93-4610-8ba0-00208976d6a1} + {bc56fa47-6734-4476-95a4-7e6390a539a5} - {39af5108-3610-47bb-961c-bc4206a05a32} + {1fc0fc14-2646-4a8a-8205-770f72aeb6b1} - {790c0df5-4cfa-4870-a3e8-26df6c927c5c} + {26cfb58c-d280-4410-8b63-7788865f51e3} - {7c34f305-c55a-4ed5-ab4a-1c8ec641aa53} + {abd31979-925d-4f8b-bd79-ef519fca4328} - {6c764e7b-a7ea-424a-9c35-d9b1252ba885} + {513ff3e0-ed21-4d80-aaeb-34d3d1220bdd} - {50491fa7-ced7-4999-96a9-973f491f6177} + {decd96e6-2170-4ead-a20a-5c4330e9e120} - {9e97d2c6-2feb-4649-90b4-3c48804053eb} + {9d7da482-e45f-4f20-9396-a710aa65ea3c} - {3dd2b83f-404b-4f20-9ae0-893a6f35199a} + {7fce5619-7645-403c-a2bb-0cb404029277} - {9d0521cf-56f8-49e4-b6e1-e93e5f6b263f} + {3d8883ac-b145-4800-ab28-6d351080ce0f} - {78aec5bb-d844-492f-bb40-539894e57a59} + {b42ef2ec-42a6-424e-a19e-b8210f7bbd45} - {6bee54c9-c38d-4cdf-8700-15f5e8505994} + {c1550e9a-4daa-4349-ab4a-c2d7b88bfc50} - {8fc9ec0a-353f-4cd5-86ea-0b39f51f0fa1} + {6f5d4822-5897-4d08-9278-980c9ce5b46b} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj index 70d97290b..d40aa997f 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters index ac57cac51..ea6bb10fe 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {8368551f-6270-4aab-a1bc-f8a9aeca4e11} + {56815554-ff48-4ac6-a8ee-b07a3d36e6e3} - {5985a33c-6a6c-4dae-8390-567604549430} + {2214664e-ff62-4673-a198-bc411ed8f606} - {c4c6f486-5202-44b2-8fe8-b4c70460466d} + {44de53d2-ba65-43e1-a195-d4b883a11b04} - {378333ab-48d8-45d8-a5a8-c2b81b206926} + {b398174d-22ad-49fa-b037-2e60745acff1} - {a0c38464-75d2-464a-a947-5ff6de2c1084} + {9968335d-ffe7-4a16-a248-805f34ae2e14} - {3ca53d31-c36f-49d0-a670-09a36fb541d4} + {9b64c59e-ad1b-463e-91ca-bc67420c511b} - {7fb3d693-b8fe-4945-a4a5-8eb8665da08b} + {88e896e6-dd3c-4d77-902a-60394d5b6d67} - {b0e732d1-c137-43ff-9dc1-976f8f7459c1} + {dbb83d90-19f5-4fb8-a251-3d723ee62528} - {b0a01bcb-e491-4be0-934e-f21197b31ca6} + {d1a36462-735e-4a0c-aa7a-c3b2a725aa65} - {4724325d-9c88-4078-af7b-89fd6b730e3b} + {b252087a-ae89-4bc1-9771-f839b7b0bbb2} - {1677ada7-54fc-4ba2-80e7-255ad80fbbe6} + {748c8716-48f4-4cd1-8c91-bf5252e0ed7b} - {a45c9971-4f99-42ed-9112-973b86fb00f8} + {80c214f7-3cdc-478f-aded-52f3f4a9e440} - {abc4ac71-ad1b-40b7-a2c4-6295aa6fb393} + {21233de7-0b45-4928-b081-5873d792b85b} - {aa7b9f6e-6206-4419-a48f-8d6f87620aba} + {2a55afcd-a12f-42b9-a472-c71bf7c5b595} - {37095a19-b399-4246-9bbe-e92862b69bba} + {891d380d-4938-441f-945b-721571d74dfd} - {4591217b-0a94-43c5-ab2f-1be39705639b} + {2eecc851-53d3-4fd6-b7a5-e6bbf344af27} - {eed0a7b9-cfe5-4037-8960-6248d5c48060} + {5450a0a7-a44a-4746-9b9a-7156927c1e05} - {d282811e-6780-4094-808d-724011d6f59b} + {9118cc30-cb37-444a-a314-19782196eb9c} - {3f36dda6-a4f8-45dd-b0df-b3d1084b87b3} + {af67f9e2-e34b-4f04-9ed3-017b31ba9e7f} - {1059377e-a3db-4d47-9117-c6f24fbef285} + {1f1e3e1c-aba7-4100-ad34-9e89b1b9ec9d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj index 475033cf2..2790562c3 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters index d01562fdc..2795e1ecf 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {7020d76f-9ba8-4adb-8234-db279950a561} + {622ef242-5639-4885-a59b-9c314233b4be} - {cd222825-9714-47b1-b0e2-964a192fff52} + {2942443c-1553-4d51-9bb1-ebc879e8ca4c} - {0d2b710b-f5d4-4c0d-8463-eb7e673dd9f5} + {c5cbea78-40d1-46db-a987-34f904276487} - {1a216fe6-f288-4f94-af72-f3dff24ba189} + {3b9e7e8f-5d5f-4761-9fef-5fd1b1d22a85} - {d46e6890-5276-4d18-8b44-b09519ba6b89} + {53614f9c-dc67-46aa-824d-ec83ffe1a4e0} - {3fd5deb2-db6b-4678-9bfa-383138fd85ce} + {1ba07cfd-37c8-478d-945e-79e84b25b0aa} - {339dee21-f686-4486-865a-67b35936ceec} + {321daf0c-69fc-44a4-9dbe-b503d3af6c08} - {80eab057-20f9-4216-90c3-00b802fdaab9} + {89fe5afb-0ddc-49aa-8699-72a57a60ff23} - {412cabe9-c899-467e-adff-5f35a759dddf} + {47b343e9-30bc-44e5-ba7e-af80b227b624} - {75a58dab-f327-426a-a216-eca8337937c0} + {14cd7e63-71ec-448b-a6c5-775ba476a698} - {726d8a8f-9a4c-4dd5-8022-ec3c0476e16a} + {cc496037-5589-4872-a840-347569224b58} - {56906363-3139-4513-8dd9-1d722db654fe} + {5a26dc22-d20d-40cd-a646-7c14ffcc70bd} - {f3afc766-376b-4ae3-aaec-f4a2b9d893e5} + {18dd3c1a-cdbc-4bf6-8d48-694450dd88ac} - {77eac50b-42b5-4a27-837f-ac80e48830c8} + {d63ac5c2-793b-4ca0-9f24-683354b46dab} - {a58a1052-9de4-47cf-bb9f-4e729b88d84a} + {880e9d86-d728-42d8-96d7-90a4568eb559} - {660d05c7-5c9d-42c6-b825-a317128c3db2} + {ed25636a-b46c-41c9-962e-1a252d6a1d2e} - {10ae5c75-fc0f-4da4-911e-c27ed29f65f2} + {0f170a1a-e426-4000-8e4e-6840011c8883} - {2475414e-db7e-4026-832b-5f7ca0ab99c7} + {a6ceb291-0f65-4b47-9d24-5cc105df8988} - {b368fcec-6e3f-4015-9ba3-30b0d9b82e2f} + {f5488a10-1b37-4d39-9b76-baa087ca6783} - {348ab8c0-daa3-435c-8e20-604c4fb583dd} + {5e339e55-46f4-45be-85bc-340f3c37f3e6} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj index 6a38dd23b..9a14d9748 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters index 773357311..ece78ac65 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {c8528bde-3cee-4dc4-8cc1-7cdc7bf2963b} + {8620b0ff-b5b5-46c8-b9a5-4bbb4a433d03} - {ca253d56-7ceb-4168-b236-5edbbeac2999} + {ca45ab2a-8153-4e27-9657-4c2aefe3281a} - {7053a9cd-e39c-4d2f-a493-27e9f974b5cb} + {7f0ae212-3d6c-4844-97f4-3b01b723ab4c} - {4a05c76c-6fa8-4a56-a95c-cf1a9dbb44a7} + {4b72b9f7-eb7a-4f44-947c-b9b194abf6c6} - {7507b54c-35a4-4ea2-a2d3-e4ce8a70aca8} + {8b99bfbe-0d3d-4e3c-9dc1-6762f3b0d118} - {b097a419-863b-4428-a4d9-2c7cbe2ec9b0} + {869e289f-f0f9-4b25-b3e7-e05232c50462} - {4a8612d4-5285-4440-896b-a87469d06068} + {731162b6-64ce-45d4-bab9-01d8aec1a06d} - {7eb5f301-8c05-4399-bd0f-d8a1e027d20f} + {d47cdbb7-db89-4349-978a-0ab257979412} - {6746c8aa-1e09-4e66-bf7d-2b8609a6373e} + {10e0f27e-fe24-4bdb-84f4-3317b0c39eb1} - {30c9c20f-3e84-43f5-90e6-0f5b32edbf39} + {20b27749-7da3-4113-bde7-1c853da0f8ea} - {dae1ad5c-da56-473b-bd0c-9f37c14f9034} + {4e7952d0-23c0-4dce-9e39-164d20726070} - {23e2e3ab-f809-4ab9-a7d1-28c7c5b5d09f} + {1a688107-d87e-4b3b-a248-c8bceb95f5c1} - {06c7bfbb-5a0b-4607-ad93-007666ee2a1c} + {65d6ee79-ec09-4cd1-8264-35f02abb27a6} - {1288686b-2af5-4251-a70d-bf1b57a8a433} + {b45c57cf-ee60-4664-b4b1-4c29b2165b3a} - {929ce7fb-bc99-45f5-85ee-63877f749939} + {e839fb00-1cec-468e-874b-4a8c5fc5d1b1} - {2a3cecbb-2a6a-4acc-a51a-14d561a0a98b} + {72a195c1-6809-4db6-a6b0-4508b3e310f1} - {c205d826-bbe4-450c-8e3c-2aa87b0f0e3d} + {efb5c059-6a1d-4251-9590-d0c222884a97} - {2bcfa5f0-85d3-4778-8d8e-13278f036d1f} + {2a629ee3-e362-414e-92ff-3d839c767f25} - {4638e150-ae0d-46c2-8403-8469caf11807} + {edea0ef2-e01d-4420-a7bc-82b4305353df} - {960650f8-5d80-4c1d-ab5f-827dd9f83031} + {f5a49a95-7099-4b16-89ff-644e1948c77d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj index 66f96bd54..4501dea1d 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -327,7 +327,7 @@ - + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 538fb5793..dce4ab074 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {dd89ff2f-d76e-4052-add2-673c543a4080} + {5a909aa3-f2c6-43a1-a94a-c55c8dc461ab} - {a87c8957-b307-4ec6-b093-61233e07df19} + {e10edd73-6300-4966-b368-6c8342d86d2c} - {95cf48a2-4e94-43ed-92bb-d6bd32097de4} + {f54dbae2-2199-4058-b1f2-6c4eeb142d7c} - {39ef5068-330e-4e5e-b3a6-07c5a298398a} + {8fa9fb5b-025a-4e52-9a59-c2d27d1ba63b} - {1d4c3c5e-5467-46d5-885c-3e3f60dd02f4} + {3c44a3a0-2c3a-449d-8251-c805c3b8149b} - {4e24a9f3-71b2-47a8-97b1-ee48dd90a8c0} + {418743d7-24c7-454e-9ae4-961afc53509e} - {ab0dadfa-0cbd-49ca-a958-e5d29a95d2fb} + {b25aed4b-783c-45b3-af47-e03adca31ca5} - {ec6c23e2-36a7-46f1-b1b5-c27c0948baaa} + {04ef72f0-3ced-45d5-a5a0-65ed64cfddb2} - {4d8c4f66-9033-485b-888a-5a2c62591f5f} + {af559953-9dfa-455d-9daa-3ec27efc30bf} - {12fb7618-df37-4de7-955a-959fe68e7c34} + {1a059a04-f86c-4905-91b6-c0e78f2583dd} - {43b69d08-81d3-4fc8-b391-b3c4b6d622db} + {d1862fc1-25f4-463a-8d98-4a88234ad875} - {eefd122d-9468-48ad-9d48-3e90ffa23d8d} + {0e3d92b6-829d-4cff-873d-7fb158915175} - {5b996114-019c-413d-95f9-df3aeae98cea} + {f08661c3-a6e6-4589-87c7-35005022fc52} - {90e3340e-e235-4964-914b-f39304df3554} + {b753e8ae-4567-4e1c-a0a0-da0a2345c178} - {536db2b1-265c-4570-ac79-54f1b70fa199} + {b5be9728-b820-4612-9a26-93058ee7438c} - {9849cede-9347-4a42-9847-765b8890f67c} + {278f8cda-c84f-4df2-ba04-76b032a42ec7} - {c8c837f2-dbbf-4aaf-a63e-bdfda941bd64} + {ca262a9c-bf97-43eb-9913-af5e51712c70} - {b82a8545-e9d1-496d-9bac-8acc4383401f} + {c31cde9a-76a9-4215-868e-67b18ec32fca} - {59f00fca-a764-4430-b84a-bd660eaebb94} + {f2cf6523-46dd-441e-bd99-bcaa0a67daf3} - {0bec0ecb-8737-40c8-a7e8-cb91dfaf7341} + {5aaecffb-d722-4025-98f2-28a88fd18376} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj index 978ad8662..ca096f988 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -327,7 +327,7 @@ - + diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 4c178dc2b..1c7c23edb 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {0451c3e4-ff5a-4ea0-b1c2-8dab2493ea8b} + {a510f6f0-d16e-4a92-877d-9c4aa64c5692} - {50f7b03a-89ef-498c-ae45-7f8c6ebba4de} + {187c49d1-f924-4b2f-9303-c3562463314a} - {ce2bd914-49ac-4370-af18-27a82ba37c91} + {1384e05a-a9f3-4b01-8fda-5b54662d9307} - {12c249ae-86ae-411b-b67f-242e415fb362} + {65140118-1604-4bde-8efd-b00ef6e4732c} - {617c34bb-5d2a-4bc8-a094-04a5c659bffb} + {19565b2e-d0ed-40b0-a2d2-b0c41f3b4756} - {3eb470af-be82-4afc-8ac1-7a5c438bcd93} + {45d331ed-d85a-41c7-a0c6-2cbb7ce2c5cf} - {0dec20b0-d4a2-4101-9f94-c9198dd40dd0} + {005cc0c7-a25f-464e-9bf0-a71f5ee33cf1} - {37402606-1b77-43a7-abca-068e4371f576} + {f02bd7a2-8a16-49d4-b5ed-be36d1d60d4a} - {cc7c6dd2-b0cb-4276-a25d-b2ee7d4c0a57} + {2018057a-cc37-4594-a7f9-f9f9fcba9060} - {3995f892-7e89-4f92-9a34-941ae5f72f9c} + {600d7a3a-090b-47ca-b42c-5541f46c2aa6} - {d6f146ed-6599-435d-9387-2754bcb39e26} + {82e8ffe2-4eb9-4884-bdaf-d8b7873a1636} - {902270fd-b24d-40ce-870c-3ea5da1cb662} + {443d352e-4461-4e41-b935-bc4f93ddaa9d} - {187b1af2-769d-4009-bce6-28755bab1e18} + {0014948c-6ea1-4fa3-9b76-2cef6a0d09e6} - {f540bbd5-e608-477c-80ba-93d9ad5c4556} + {7e49f21b-8659-4189-b387-33a2aaae7acf} - {a64a3c48-1de7-43a9-b6b0-c58bad7bba1b} + {6ea3324c-7ae3-4d57-9b9c-d5b01e60640c} - {8d733118-42a4-4a33-9194-b5511bba8a85} + {5f865109-d5ef-494c-be04-ee6a1f07da9b} - {01503b17-9fa5-494d-a1ad-153a3dea0cb8} + {ed04f9c2-d1c9-40f7-a03e-610f2273e6ba} - {3a5b5f6d-5672-4b8c-83b4-8f895f2e852f} + {a490fcff-60db-4701-aa78-8493e5af0a8b} - {1cbc7329-d6c6-4d5c-a748-078a755e8d6d} + {563e2669-1dab-4508-b83e-c9e206acbd97} - {5155d229-c252-45d2-9541-ea0132ff02ef} + {8eabd61c-27d4-441c-8a5b-4d0d9a6702e1} @@ -104,7 +104,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj index be71d6b7e..5911f1f2a 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 7a947b7cd..4ef4c725c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {c9055f2b-863b-4ed1-96a5-618823dcd0d7} + {ff0ca9f7-fda4-47a2-a628-24d082b50c29} - {9041646b-3834-4303-94f9-f7eb4de40be2} + {0f5ad05f-daf1-4d13-a367-83eea3c1b569} - {faee5586-962b-4280-a9d1-ce65508e5665} + {910f8262-f73c-46be-9bda-50c6a86a355f} - {12db23ac-2e7b-497d-9123-42eeba35b683} + {4de1fb74-7638-4511-9367-a0685fb9fa82} - {0b1960fd-b22f-4cd0-8ebc-626fb5c0956e} + {e4a7703d-3d69-456c-bd60-dc29506d6b19} - {ecaa96c4-898f-48e8-b4f9-23651a4c547f} + {ac438f78-ca9d-49da-9f24-aa7793588985} - {e9eb6832-c233-468a-8f78-aab35b20d8fb} + {ad63b7d2-08b8-40d1-8653-29d292fbd481} - {d56691d6-2acc-45a2-8f89-132b74cb40e5} + {f9b374e3-0654-4c88-8179-2f82e960bcb4} - {2d032542-09de-4afa-a10c-54cf3f5cb153} + {a047c89c-9a00-4115-ae6d-7c94d43d4cd6} - {8838afd3-6c39-4356-98a4-9adb8bd3a0a2} + {80aceee7-6ee5-42f7-8ee6-8e8765917e19} - {4a3e1565-f71f-4320-9eba-c35b0c390fcb} + {bea87d34-81c5-46db-9c30-f0fa7bcd69f3} - {059c5b72-91a2-4b2c-a364-039f4415e42e} + {6a92cfe5-8a0a-4967-8ece-d24e60f202f4} - {f472e918-834c-40aa-b067-2a57d425a56f} + {97578bae-168a-4663-88cd-78c0c82b0dfc} - {5bb68968-b37f-4653-b9a6-3ce4f0c67a0c} + {06caa7a6-8bc1-49f3-b161-c7dbb8d0017c} - {7879b35e-d8ff-4084-a230-517287a2857c} + {da10e198-6154-4da4-b0e8-46b8685e4fa2} - {10feb1cc-3d5e-48bd-a988-de7afc298401} + {95d2478e-597f-40e8-ac11-7753bce9cc68} - {441bb2f2-d3cc-4c27-ba2e-12a212d8abd1} + {a52007b0-103d-4be2-937c-a9f69e20fb12} - {0edb9dad-3694-49d1-af73-8c5a95b4114c} + {35814c79-6f44-4516-a095-841775d4a9b3} - {a05b0230-2c70-4ba5-a988-d1ad13fa7721} + {7fc0377b-d2aa-4038-89ca-98499b2049e4} - {d77dbf41-f2c7-4e5e-a220-bf5f24b919ae} + {dd518031-d032-4621-9fb4-30e4d115f027} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj index 60be45ae3..abc4efaa0 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters index 9d8390c06..b7c5c25b0 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {fea81601-7561-4719-a0a9-e198ec8b67c8} + {89b4541a-52bb-4b85-b41c-dd15d55e1a0a} - {838fae75-70d4-41bc-a005-25bda5bc40a6} + {27df703d-3972-4078-b031-ed844d0fb358} - {9f91b53c-6b3b-47cf-87b3-42b9b2159b85} + {4eb74448-d8c0-4e05-91ce-659b020ee12f} - {9a32391d-f0d1-4451-9644-43f5b4c87472} + {0eecb657-9162-42e9-ab3d-c56fc77209e4} - {222ec5cc-4908-48d9-ab71-b5ba858f8778} + {3c0ae314-f213-4fee-9b34-353275f5b345} - {b4b12e9f-6339-47e3-89b6-bda1aaa8478e} + {9d099b07-96ec-4eeb-9c54-26bbd9bbda79} - {99a81a3d-c250-4bf7-8a99-55e130ddffce} + {44bcb5f5-9c24-4371-a34c-64b3e90ef8c2} - {8c12a219-2101-457b-a3ee-a81ed34d76cd} + {ed006a47-8fdc-4254-9179-bc7443c6aa3b} - {e8fd7852-31eb-4f85-982f-0047cd91bdfb} + {96eb83fe-d103-482e-80da-d4065da85596} - {f654cc06-4aa9-434a-9306-2fdcc165beab} + {99a5ed57-5651-4d5a-a7ab-36d7c7165584} - {2c499c97-ea46-4ef9-8509-d9afac3f0aec} + {6cb43296-7230-468c-87b8-6af06aa70f24} - {54fae206-bf93-4ad8-81f8-54fd0d3ede4c} + {dac24d37-bd5b-4dc3-a6da-ee48a8b331d0} - {a1f03607-66ac-4a28-80df-9103b0d6b105} + {b39529d8-9470-4cf8-9cf7-1d89026342bf} - {6798ae2c-c8b9-4b7c-be54-e86dfcfb1e08} + {13f1bfe5-f902-458a-83ea-dbecf86fa6c3} - {a70da9e5-d5fd-451a-8b38-af43756324ea} + {e501814f-f2f2-4dba-9f49-775a10273c0b} - {ab3c2502-96c2-447d-831c-216f37f209bf} + {36338f26-ddcf-43e3-b6ac-17033e0ce5bc} - {6413e9fb-b2e6-46f9-a573-28f1340022da} + {535ca1fa-6e5d-41ca-adf5-4bcb5b2bbd0f} - {c0b1170f-fb3b-4acc-87f1-20873cfca7c2} + {89371b5e-1447-4f63-b093-3c6e8e1a6a9d} - {b2be3318-622e-4f3e-9932-8da851aa6904} + {e3004af5-a344-4500-8ea2-9991d6832f3a} - {9af07f87-5f0e-402e-b99b-82f769154b3c} + {f910ac10-7ab4-4e4e-9d4f-952b40349f89} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj index fb0498546..af6afccfd 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters index d9140c2cc..1ce9699c5 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {31d274b3-33ff-4a85-9aca-9c9d4081b3f1} + {af60f5f9-b963-451e-bcc7-352ca8b683f1} - {ee738d74-3c74-4dcf-80a8-a67fbf66ed1b} + {28b80c90-bbf4-4dd0-9588-fa332f83d915} - {85949c5b-d90e-4ea7-b064-4707134f2496} + {bc868344-0300-48d7-a920-0f1fa1cbddef} - {49ab6b02-a4e8-4dc0-a4fb-a9b31c540734} + {29fc6fe2-a71e-49d5-b6d0-65e7bcc0829e} - {71edd5f7-32c8-4b75-a378-5cddf3c5a81d} + {6c95d605-c063-4748-b963-ec3439a12f0b} - {76fda2e0-6165-490e-b2cc-ada29bc790aa} + {ff2a88d3-d8d7-4d23-9e80-0d66b92446d6} - {d7920698-91aa-4ddd-a0ef-31a024288737} + {64495201-8656-4606-a478-2e9cab53958e} - {d9e17cc3-bf0f-4763-9ecd-02817d39f87a} + {216d9cc7-5372-409d-a999-7f75eb32f5a0} - {cabd86b0-04dc-4567-82b7-b2730d288552} + {028e8e2b-d431-46cc-a749-902a03535344} - {281d9f13-bcde-4e4d-8c57-fd7c70552095} + {b392b00a-3cc6-4cdc-99f3-3053be9f8a14} - {7b9d72f4-3a42-453c-ab21-9f4c511c623e} + {eb22c1a2-d2de-4ef9-b94b-8a049b15ab5d} - {f48fc74c-b542-4bd9-8280-e3d5b9714bd6} + {f6ce265f-7ade-4a4d-b7be-52170da1ce95} - {2f224634-c775-4f91-9cd1-429edc244a6e} + {ef2b6e4f-c9ed-49eb-a5fe-5647fe1797fc} - {4219f4d7-d2ed-47f5-b322-b9edc1b45aa0} + {cd2837fa-86f8-47db-9356-4fc2a58889c7} - {d942916f-8786-41b0-8e2d-4b492c6fb590} + {1deb9cae-90e5-43c4-89a6-1ec675fe26c1} - {28835c70-c56a-4a42-a03f-8330c22a6190} + {7d08d914-c3b5-4372-8a90-ce1dfd38a737} - {014fef2e-70bd-4965-8d74-b29df4d00017} + {4660ea3b-79a1-4c0a-b99e-52304c80cc5a} - {18c1f42f-d779-4dff-b739-b654d6f11e6b} + {f308c4eb-6ed7-4b71-ae1d-d6a9bc5e9d87} - {f28f075b-154a-4fc0-9e5d-c9c459b71c65} + {ec1a9608-51fe-4c6d-b603-f0cb1da3832d} - {7582dd96-0b59-4d7b-98ce-cfff2d2a5b68} + {bf2a3c42-0478-44b8-944a-9844df15016a} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj index 45f64be81..f9ba8549c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\openssl\build\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;..\..\Crypto\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - NetSSL_Win - {A097DC74-A5FC-4A0B-804E-B18892426E77} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd - PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt - - - ..\bin\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLWind.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoNetSSLWind.pdb - - - ..\lib\$(Platform)\PocoNetSSLWind.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLWin.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoNetSSLWin.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoNetSSLWinmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoNetSSLWinmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmd.lib - - - @@ -289,6 +31,29 @@ + + NetSSL_Win + {A097DC74-A5FC-4A0B-804E-B18892426E77} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoNetSSLWind + PocoNetSSLWinmdd + PocoNetSSLWinmtd + PocoNetSSLWin + PocoNetSSLWinmd + PocoNetSSLWinmt + + diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters index 7f6604a85..d935fc890 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {2aa8fe5f-a5c5-441b-bb06-bcb9e2eec66e} + {a0c82ec8-8b8b-4242-b2ef-893f93a460c9} - {65ae7916-188f-4af8-ba81-4dac010b5fe1} + {26c67b2a-20f9-4584-878d-8386a27d9bb6} - {061ca554-1953-4f73-b097-a23f0e3850f2} + {19777075-a3dc-4ac2-bb93-f0bc1d9b9a13} - {397a8f6c-9c4d-4c5c-a9d4-832ebd6bbb37} + {60442a81-fdfc-4a13-9b17-f81991499082} - {096cb75d-caec-4e6a-8996-fa4bdaa8f9e3} + {7b7cb407-b6eb-4acd-a3a9-121be520d15c} - {801c889d-75b1-4e5b-b79a-23e4a7ef8168} + {c88e03ea-8be2-4a65-8808-542c673a3b4c} - {bacf9326-8af3-4dad-8282-b5f49633c5ea} + {47776cda-b63b-4367-8209-6654335c5473} - {4e5a425f-af6e-4351-bc0f-1f47c3d6972d} + {006821d8-1873-4b23-aff6-e439778f94c2} - {f4f45f0e-2123-44cb-b93e-62af248860f8} + {a0403664-946d-43cd-b82a-964158e8b117} - {f4e544e4-cde1-4be2-ad79-9d3ce08587a5} + {a5a53cf0-4e0d-4f15-9173-09a2ac4f3b59} - {88051078-8bde-4030-b65e-b4e3555d45ce} + {6267fc96-100c-4f3d-955b-b23d4ba82361} - {57accd4a-c8cd-4372-87a5-0f6daf91e096} + {4099a142-7027-4a55-97ad-6bc50c5805b3} diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj index 8387c5640..2f2281e49 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj @@ -1,264 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - NetSSL_Win - {A097DC74-A5FC-4A0B-804E-B18892426E77} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd - PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt - - - ..\bin\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\NetSSL_Win\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLWind.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoNetSSLWind.pdb - - - ..\lib\$(Platform)\PocoNetSSLWind.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;NetSSL_Win_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ws2.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoNetSSLWin.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoNetSSLWin.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoNetSSLWinmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoNetSSLWinmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\Net\include;..\Util\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoNetSSLWinmd.lib - - - @@ -289,6 +31,29 @@ + + NetSSL_Win + {A097DC74-A5FC-4A0B-804E-B18892426E77} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoNetSSLWind + PocoNetSSLWinmdd + PocoNetSSLWinmtd + PocoNetSSLWin + PocoNetSSLWinmd + PocoNetSSLWinmt + + diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters index 802c7fdbc..250db9091 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {6cf193c8-a0bd-46dc-a1a8-3429c566e04b} + {a6035a16-c327-43bf-b9b2-2d977eb45992} - {0f7ef400-b993-451e-ad9a-3a0f3dfa03d5} + {fd96a11d-8b72-4a81-8b52-48de48a97d61} - {9248547d-1ac5-4c99-a32a-e0f7abebb75d} + {9bb4df7f-d0b3-40aa-8870-9714662ea21d} - {c4ccad69-6fc8-4553-916d-777813f0b312} + {8d3b57a9-2f47-45f7-864c-00d9be4439cd} - {323d592e-46d7-4c04-ad2e-2da059d7964e} + {f14fbcbd-4379-4e44-ba4e-ac0ccd5e2302} - {45877981-fedd-4fac-9243-a25373dc6165} + {7d514256-4828-4e31-b869-debeac2f5f00} - {1aea5bbd-cb9c-4537-bf0a-05e86cdc32c6} + {b4f3146c-3c22-4ead-94b8-bdc43de64f51} - {5508afa6-5a52-4d40-a65b-a84f137ccfbf} + {bf94d401-62f4-4f09-a3b3-b3719ef7c491} - {d95a8f73-3a30-4d0b-89b6-921967c2553a} + {5105176d-6840-4a77-a650-c1345c8bf5e4} - {09d7e25d-ef43-4435-964e-c3208045fad4} + {fb43d56a-4ba4-4be7-bad8-e25b355d3fa4} - {086c5ea9-6d95-474d-8710-7bac2e7ac189} + {9f683a88-d3b8-49f5-8752-005e1998afba} - {b9177075-65d4-4093-9e2d-f187619d9c93} + {ccaf7901-2dab-4a47-a8f5-142eae3415c0} diff --git a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters index be19a8a97..9b1cad311 100644 --- a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {94df0de9-b652-499a-a099-5856e40ef10f} + {d44fc7cd-7123-4459-a544-fb02c573ded8} - {66e014e0-ec75-463a-82c6-5722900bbed9} + {b42fa0c0-7482-4fbd-a681-e0966f87f0f2} - {c7fd676e-3cc2-4aa3-aaa7-8ca4cae70ac7} + {17793a04-3993-4f1c-9457-66eaceb08bba} - {3a60f79a-db8c-44dd-97c5-0132959e6a03} + {45fae5c7-367e-4abe-bccc-5084aa37ffde} - {cb28a8db-5705-4541-8623-ed372096f631} + {042bc49b-b7bb-48ba-bed3-d58f63d8defc} - {cd14ef29-0a81-430d-b325-22e3c644a48b} + {d7d5d9e9-43a1-49b5-94a0-dfd27eb2c519} - {ff814b24-10d5-4373-9d0d-1f4d14a6f5a1} + {f9a77f73-7bd8-4a4e-814e-7aca0716ff4d} - {4ed4a727-3ab7-401b-ac0f-e1a9b310f753} + {df2129bb-0cf7-4ff4-94d5-ffd84ad1fd26} - {5781645d-bd7b-482f-8d6d-0c620e6f4f90} + {621c1beb-16fa-4588-8419-989aa9043f2d} - {a7267a9a-5536-4c3f-922f-a671b8ed57d9} + {d18f5d40-16c2-446a-8f99-471cdd8022f3} - {9594b13e-8734-4c8a-9015-5a19fe134717} + {5b2253de-e017-4c18-8339-acab198d8468} - {5accfef0-935f-4244-b8e5-74f8a14dc4c2} + {954e316a-e4ce-479c-a3b4-e4282f500280} diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_vs110.vcxproj index bb75ebbb3..f5e7d47f3 100644 --- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoNetSSLWind PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters index 5adc108fc..2d1627e18 100644 --- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {2d5de744-dacd-43b7-8e09-9ce6ed84e74f} + {17837a76-c6b3-410d-9f12-fa770ede2c47} - {d4391e90-cc9c-4e0a-a6f6-fa1efcbd2947} + {1072c3f7-bdca-4ca9-af0b-1bc471beedf1} - {1b2a28c0-ae3f-4ba0-bfde-bc828b5c753f} + {8af9f4f5-f4f9-4246-b5fa-aac0cbbf9fc3} - {760e9cb6-8800-4a61-8f52-8e3abd467a21} + {546bfb4a-f542-419f-b599-bf2f8976d005} - {69028cff-4ac5-48c0-a513-df847b3a5fd6} + {2ee6a423-028c-440f-8084-e94b46b9c539} - {69811941-f45c-42a6-957b-3d6175b57ade} + {ce1f1bb1-928a-4cb7-b4a5-9cd9b1e0bc6e} - {ad751a11-7a11-437b-922d-03c7150d25f5} + {7d92fae2-e83a-4ffc-999f-df0d5fd0e52e} - {6997e061-4f94-4985-a869-3367278752fa} + {843947b9-c29e-462b-8cc8-4e3b31fe9185} - {5162e22d-6794-40d4-9a1a-94c1ae0c6597} + {e8b80fad-ff4b-43f4-a60a-6e77e2c92eaf} - {cb59207f-ac9c-4392-a92c-830456d70111} + {b314a4bf-3ec0-42c7-a7ed-ebe2d2de8414} - {6f782fbc-8eaa-4385-82ae-b0e916e098a4} + {a1f09f6c-5066-4bf2-b014-7a2936e21192} - {d6670f36-bf3b-4953-8876-5915d7fc8fe7} + {a20ee76c-220c-4f6e-9e4f-c6333a3683a9} diff --git a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters index 73a214a00..4d4c65a4b 100644 --- a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {e7a41b9a-9a87-4e58-af29-f8faaacf4ec9} + {7088f115-e351-48b8-bd57-0bcd7749d7d0} - {db3e1219-f280-41a8-b0be-3233f093de8c} + {258a60bc-bc58-48aa-92ae-28f8bd7dac55} - {43640d2e-6122-40e3-8807-f8b6b6dd156e} + {dddddcb9-9753-4b80-9e35-2fba69e1a2ef} - {fa01ff8d-b565-468b-a92c-83df42bb102d} + {ceb568a0-a531-43f4-91f3-fc937187bc76} - {584aade3-2b13-4dc7-967d-8d27ed0d0c4f} + {4a723689-0599-4f78-bc36-b2ebfba03451} - {1ddca0ac-4709-4f35-b804-f338f7f6d379} + {2dc6af6a-2f84-452b-8410-d39864262b6b} - {2a560daa-5d23-40b2-ba6b-eb4e4ca0a5ac} + {d80b1309-7b76-4cef-8601-c85295dc5bb5} - {747858d9-2727-4019-8010-8b92eada0078} + {b50aff90-e492-4492-a531-6de58261e48b} - {e0b84e67-495a-4317-afc0-3ab978f63f35} + {867b2084-fbc7-40bf-b65a-630e74b799c1} - {e27346f4-e462-4a08-a3fe-37a49420e419} + {078c83f2-4573-496d-b027-40233e164d5e} - {244f6127-f190-443e-bd3e-2b1754e3d078} + {0b188691-a2b2-41e4-9066-200aaa845562} - {5d35e41f-6506-4921-90b2-85f12cc0a46e} + {e579528a-2028-49a8-86fd-f03891e7a2ff} diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_vs140.vcxproj index 5ac077923..39275569d 100644 --- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoNetSSLWind PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters index 639470124..6c2ea31dc 100644 --- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {6c0927b4-f42b-4df5-86c5-33818ef8799b} + {c161f211-5989-4966-bbb4-49d2868d1fcc} - {ea782caf-5f62-4297-bd4a-4a25813a1262} + {2f75312c-48c0-4ed3-bb65-aa0a5b631a57} - {675745a5-73b1-43f0-b895-d7682df2f57e} + {35f2ff70-c637-43d5-9216-d1d0a2294e06} - {129a4464-8d56-4638-b303-283cd3c4697a} + {d4f59bb2-e281-48e7-b5cd-d98f71e0b709} - {00998800-de85-472d-a254-8c1e74f96187} + {ad57d232-3991-41bd-9a07-c385e994ab62} - {59c4f48b-7e8e-4756-99c3-126a0e75d142} + {460ca731-fed3-4fa7-b917-36b7ddea77e7} - {17117897-0435-43fc-9bda-dd4668cfe6e2} + {8dd65e1d-ed6d-4b11-9663-e9b00295c4c9} - {746208d6-4651-4e90-bfaa-974919328bac} + {f5d301a1-1e40-425a-ab4e-77ad6235f95a} - {56b91308-c249-462c-96f3-7e963ff3317d} + {468c961f-5606-4ec2-84f5-eed948ba3464} - {94c61c66-c8f1-4e8a-9e8f-7225122f52c4} + {8bb93f5e-4223-49b3-aa12-e7aa57ba6fb3} - {83263c33-d373-4daf-a3a1-9a43961594bb} + {da9dc65c-4f4a-4d6a-90a3-d71038a73de4} - {4b055117-68fa-4a08-bcbc-27197f931858} + {0fc9aeaf-26f0-411c-b0c7-430e66dac35e} diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_vs150.vcxproj index 60c87bbb7..78ebf7316 100644 --- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoNetSSLWind PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters index 639470124..a6d425ccb 100644 --- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {6c0927b4-f42b-4df5-86c5-33818ef8799b} + {b7e49256-d518-492b-9f0e-99111d157330} - {ea782caf-5f62-4297-bd4a-4a25813a1262} + {2353da61-3889-4dc5-bd6a-d70f950a9702} - {675745a5-73b1-43f0-b895-d7682df2f57e} + {dcc73eeb-9929-4d37-8061-9b922519c3e0} - {129a4464-8d56-4638-b303-283cd3c4697a} + {5b2672f5-3096-4015-a96e-ad6f5bbab734} - {00998800-de85-472d-a254-8c1e74f96187} + {739edc4c-e58d-46aa-b640-acc15324a056} - {59c4f48b-7e8e-4756-99c3-126a0e75d142} + {b2161dc5-122f-44bb-8c08-25e7124f0e00} - {17117897-0435-43fc-9bda-dd4668cfe6e2} + {9849eed9-69e9-48b4-8d2d-dd84407fa78b} - {746208d6-4651-4e90-bfaa-974919328bac} + {6176a3f7-86ae-4b92-926a-6b27ffdc5d9a} - {56b91308-c249-462c-96f3-7e963ff3317d} + {8b9bfd91-48c3-4cbd-92e5-9f4efa02d453} - {94c61c66-c8f1-4e8a-9e8f-7225122f52c4} + {0dd403b0-8349-4356-86b0-a7c79b186d66} - {83263c33-d373-4daf-a3a1-9a43961594bb} + {e63ee727-41e4-4ef6-98e1-996060e9b492} - {4b055117-68fa-4a08-bcbc-27197f931858} + {b6c91120-727d-4afd-816d-1d9af78b9576} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters index 21f259842..fd08b091e 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {45e3aa7c-8b96-4878-a44e-ddb60234b7cb} + {456417e2-2939-4b15-9583-ce334d918474} - {61691814-3a71-4d5e-abab-946cf5a67d24} + {7fa867c4-f33d-42de-a5ac-947a44121d03} - {4619273e-b228-4d62-9ecf-7adeff5ce001} + {46d5cfa6-567a-4255-8ac7-dd7fa8338480} - {2d5cfabd-c361-4b5d-9b3c-b3296f4b367e} + {14290e0a-d52f-4ecc-b809-2d64e7acf273} - {7108320d-acbe-4dce-b862-a0e3aa02d06b} + {61bf1273-0bfe-4d1a-9c48-e9d220a068ab} - {a6c64e66-5bad-4803-a654-efca405352e4} + {3442b2ee-cf57-466e-8815-ad97ffea99c1} - {9ab55bbf-b9d8-42c2-b39f-637a8e08f162} + {7af2795f-a7fc-448d-bdf1-cb171daa0284} - {d0f2dc25-b0c0-4870-8995-d250ad9cea9d} + {338c0580-0d3c-4c87-a1a7-a34ee9c2fb5d} - {e0f0e569-617d-4db9-96ee-e4c47fedc6bc} + {78e20ac1-7f21-40de-a55d-0773640c1221} - {7ca7c0e8-7c11-487f-8878-51dc53e3dee5} + {0e25f034-5d34-4f35-a078-645d91e76bd7} - {de66ea79-651c-48de-9fd3-4e8869fdddfb} + {52ef5eca-72bc-4ecd-86f5-4a1ea6b8b551} - {b675d1c8-63d7-4b43-8e75-e03e748d664f} + {dcf41622-4c50-4b08-9d53-7a8d012d5407} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj index 96e07b83e..3a6fecd9a 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoNetSSLWin64d PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters index 9605741a0..cbfd910ce 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {bb7b3651-e73a-4a7f-b845-c1b4cf47a624} + {86486de2-aa6c-4783-be62-27a411f6b0a4} - {f2ad28be-4268-4b94-b748-05666a7a02e4} + {c7ae497e-4190-4173-a83a-ccb195fff361} - {514a21e2-bf9a-4eee-b2ea-3c1c181927c2} + {d525bb9e-8f6b-4790-b509-e83da4af2a09} - {9c221b3f-a831-4cd7-9ab1-9d16720aa014} + {3d6cd1be-f552-4930-b0e0-6139539b4400} - {ea780c75-6d45-45fb-8379-a427766a997a} + {428e8cf3-f2d2-45aa-b5c2-815ba77eb3fc} - {a5744266-6409-4def-8b6b-aba2126452fd} + {3654bb41-2806-404a-9366-4184beb72fcc} - {cbf47019-117f-4418-823d-f64e9ca8e003} + {fb27be65-8fc1-4070-87b1-01ee08cdf77d} - {9d000a70-c8a3-4f29-8594-76be31e3f9c3} + {62aa9a58-b820-485c-a163-051e5ee5fad9} - {c7592fa0-e170-4d8b-9ca6-00f8837e4460} + {41e2d6b3-906f-417d-8f63-d1d932a65ea7} - {7e375d9c-f3df-46d4-ba36-1763e9c0f627} + {9b4da4cd-a654-445a-bbd2-fa17a678b5de} - {1d9d9148-e2d0-4719-a5d5-1d5f200dbf9f} + {9bbb62b9-9208-43d2-99da-b3fc8606cdfd} - {49f1a3fb-172d-41ca-891f-5559629e2a8a} + {49bcbf18-d072-42af-8979-cd3373d4a914} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters index d62acdbd7..a833fabdf 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {c44b00db-fda3-41d3-ade8-b119a65a55ba} + {af7ba983-ef91-4422-ba90-6212b7ef4543} - {e448d9a0-3eb7-4518-a7d6-cc5be3f29d56} + {ac0ec2a8-2780-4882-b481-3df9b6fec594} - {5c4ce0c2-1141-493e-b5ce-4f8a5aaf933e} + {d124c2c1-52a8-4bc5-a4ac-aaec3dcb5e7b} - {3587743e-90da-4b7b-a831-c42d59ae8721} + {f3e162e8-dbd4-4b31-aac5-37f61b0c85dd} - {4591986b-0885-4d5c-ab1e-d237322cdbac} + {6f6761a3-f5e6-4350-9dcb-4f9944c5eb5c} - {5ef335e1-6d1e-43cd-81a3-adad9ea04817} + {5f45deef-406b-4ef3-a5fc-a65831c1cda1} - {cb51d473-7129-4963-ac45-8ce97bf5ae68} + {b5514e71-eb39-4acf-b3af-d0579ee41747} - {5b24b626-1324-4047-ae86-2ea5de7c2ebc} + {acd8a1ad-a381-4659-9207-044b81098ba2} - {434e3a1b-cf5a-41fb-a037-3b150fe53853} + {9457dd7f-0e98-43a7-bba4-1aea5e41e4aa} - {7877f9ee-4483-41ad-b681-e192e3d83637} + {006827f1-4eea-4b7b-9db9-5b275bb2d467} - {ffbbc615-586e-4fce-aa71-d54a2379b531} + {be045dbb-1ba5-46a9-bc1b-56d4975de21e} - {d294ba76-ebe9-4e59-94ab-bebc630db63e} + {13c04125-a325-4d73-9ff3-4736ef1c95e0} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj index e2fe54a77..03fcf20ae 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoNetSSLWin64d PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters index 0d71648a7..34e86fdab 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {1f86acc0-fa97-4545-8d9b-3a115876234a} + {195d7abb-73b0-4caf-bdd8-b2b8469ef8b7} - {168614e0-1445-4194-8d86-9d47dcde23f8} + {3b7f258e-7861-42ee-8feb-38b97cfb3baf} - {3bff70e9-c344-4211-a145-de42ccfd1c8c} + {534acb19-71c1-415d-a142-8d6fdf318822} - {07d4a6d0-aa41-47a0-a277-10a335373547} + {fe8381a5-5cf8-4505-94ca-9cf8dd37f1bd} - {ba1fb140-f669-45e1-8cf7-5c4085ee595f} + {33a04922-4288-4405-b31f-29d85b22bf79} - {b79636b2-f974-41f6-9b26-1e51ca297122} + {584b33d1-9309-4b26-be38-fb3f3c7b84fa} - {6e7782b1-a70b-4a55-b951-9c273d5ad64c} + {95bff298-a7bf-442b-93e7-30ef83fb6613} - {1afa2814-cecc-466e-b6a0-2e451a9252cc} + {ff34f1db-fc70-4a09-99f0-f43583a2315f} - {ca876045-a04b-4d1a-8556-9ad7db4926cd} + {938dc364-c685-45ef-86eb-a3cff79dedc2} - {4b551fe7-329e-439d-ab21-d968045a0b3e} + {c024f8b5-a141-4cc7-8f57-f29858d1d71f} - {789e2f28-4b72-45a9-9d35-93a57aab77ce} + {ab8d1fd0-d423-4259-bd80-531105e22c87} - {c1d72117-bdf1-4bca-a3e6-596a007e254f} + {924ab81a-d183-4c6f-94f6-414a121c23f8} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj index 0a5b08fa4..8f4536ddd 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoNetSSLWin64d PocoNetSSLWinmdd PocoNetSSLWinmtd diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters index 0d71648a7..6ed672917 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {1f86acc0-fa97-4545-8d9b-3a115876234a} + {576b42fe-b5aa-47e0-98b2-573934e095f2} - {168614e0-1445-4194-8d86-9d47dcde23f8} + {6af74f94-33b7-4a23-b20b-c515275beb1a} - {3bff70e9-c344-4211-a145-de42ccfd1c8c} + {5b6536e6-9cbd-4a25-8768-f52c11c05a52} - {07d4a6d0-aa41-47a0-a277-10a335373547} + {44013d1f-43c1-40c1-9993-87f19ea7bdda} - {ba1fb140-f669-45e1-8cf7-5c4085ee595f} + {fb776141-0687-435c-a251-d09f1ecac2ec} - {b79636b2-f974-41f6-9b26-1e51ca297122} + {d8a27445-d4cb-4887-a4fb-ad5a5340e810} - {6e7782b1-a70b-4a55-b951-9c273d5ad64c} + {77c5c900-7166-4de8-86ff-9e2da08ebfaa} - {1afa2814-cecc-466e-b6a0-2e451a9252cc} + {6b4ef558-7a40-4b56-8768-036fed117595} - {ca876045-a04b-4d1a-8556-9ad7db4926cd} + {765ccecc-29cd-4aa2-8dc5-17e9d39ed73f} - {4b551fe7-329e-439d-ab21-d968045a0b3e} + {5c542840-6e3b-47db-9fbb-bc2b1abe2c82} - {789e2f28-4b72-45a9-9d35-93a57aab77ce} + {f8de1674-86d5-4e1d-a5ec-677bd4f1aa68} - {c1d72117-bdf1-4bca-a3e6-596a007e254f} + {39bbb7ed-66b0-4098-a931-82269773d8d7} diff --git a/NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj b/NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj index d40c5ff04..6c53bcaf2 100644 --- a/NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj +++ b/NetSSL_Win/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> - + diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 93b0230d1..b1831251c 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {84904118-76ee-4f4a-8435-0623a699500a} + {25a156bf-e3bd-4697-9787-db13d4a7a7a8} - {d34fcd63-45d3-4f21-b5c6-d6dd7447f968} + {dae3e082-5724-4034-a1b6-205c712c556b} - {42a475e6-c800-4d29-8148-417963b7baa0} + {39f2da14-bfff-453e-b2eb-85a56a18eba9} - {1c684e19-e9cf-4dbc-a581-1ab695e328d5} + {5325088e-b562-49ef-a1a5-6a3ba9b5f42e} - {38b74dc1-3328-4417-bf9e-678580e53fc5} + {f95de635-275d-479c-9d52-77d15a97dda1} - {652f46e8-fa32-4163-9683-44559eba8833} + {5a40c452-1786-4604-8fb7-5a0d447a67a2} - {d37f8528-8f91-4afe-9a49-841af88352d5} + {b98554a6-ad8c-4496-ad3c-632faadd0572} - {3387c9bb-5eef-492a-b203-1a0117b53460} + {3a5aa353-82f7-4f7b-9bf4-c669e590b156} - {fac1a00c-2340-4705-863c-ae411119a4c0} + {53a04886-ffa9-44ff-9de4-b0c1298761c5} - {e40bed2b-aee9-4431-b103-74d34b636d42} + {8f06ce9e-1378-44db-a08e-619f09585a3e} - {3494beab-2173-4dc3-b5dd-e1d410bb521b} + {a4ee6e14-2864-4234-b416-e4ebe6642ba6} - {b7f6287a-5d47-4f4c-adf1-2d3ad96b5c8f} + {de27518f-e094-40e6-817b-1a7b73da4be9} - {6e9aca60-9754-4466-853e-39caf2460733} + {7f0c2495-d5e6-4d1f-bb44-0393a3fdb3b2} - {4e4fe9f7-c194-4af1-9671-1d764c63f4a1} + {9683449e-86d7-4cef-956e-67605dda3c58} - {356ad5fa-2a23-480c-952b-27256d883f7c} + {b646e2e8-18b5-474c-b178-0fc2b1e09022} - {a5b5ee3c-9ac9-40a7-ba86-3904ed99294f} + {d670faaf-0415-445e-b020-83031c1ffe26} - {9eb6faa9-0270-4014-8d9c-2b5437d6a4de} + {748f4932-ac2e-4621-9fcc-c5b86f155f65} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj index 8a44221dc..e9deed5be 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -35,6 +35,7 @@ + @@ -44,7 +45,6 @@ - diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 4f29c3a35..95e5b43cc 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {afcc8e71-7588-4b86-926e-7a46e5474ca7} + {1a96d783-a572-4abd-a559-b8836db9274b} - {f76ab6a2-b1da-4117-a7ad-928023ed54b5} + {e078a961-cad1-4737-aeff-019e4e9082da} - {50b8e7e9-0f2b-4ae0-bf26-de96626306eb} + {6b41eccc-8810-49ca-8294-55026c645a45} - {dea9dd55-714e-48e6-8d0c-c1a5447a883b} + {7df638dd-9d9b-4a56-9d4b-d84f9f5671dc} - {9f30c50d-03f0-4c7e-8b6a-9593eab81ef0} + {7f8b3fba-1472-4ba7-b371-4925f92eed4a} - {61dc9ace-bf01-48cd-bfc0-00cb1607900f} + {31a7d95a-eb3f-43b9-8d3e-be86e7b42a14} - {140e1c08-02bb-4c3e-958d-9f50db057936} + {3b386dce-e484-4de1-a4d8-abde5be418ae} - {07f30895-a4b3-4367-a050-1c62a6cb611d} + {4d4caa6b-600d-4ebc-8944-ae706435a243} - {fcb70988-fdd5-494c-b375-1d627591b02c} + {3d392d5b-6b99-414d-a166-3842c3e5bf62} - {42c8a3ed-513f-441a-b4a7-f6e1cf30f2f9} + {ce72b523-285e-4700-a524-6deec2f27769} - {e02838d1-2aad-4bed-bcfd-b62ee7826695} + {012d4a59-ee43-42c5-9b52-820b3a1be9b0} - {aee3bccf-1197-457c-a9f0-2bcfb1beb5f5} + {21ddad31-1280-4674-b57c-82f7d588dc14} - {07369dc3-5239-4f2c-abfb-ec587b7c8ad7} + {4139637e-e4ba-4ab8-a103-680ad72e2061} - {6eb8b975-ffc9-4c2f-9688-ddea62715c50} + {d6d5ecf8-79cb-427c-83b4-d5c43ef7a23b} - {82847640-ac77-4000-9bfb-539070ef33c5} + {61f51417-b718-4b71-905b-0e5bd22872a6} - {e80e256f-8465-4e04-8e0c-f3f01ef4a998} + {37241103-ba5e-4452-ba44-e84a29c07ad5} - {ba85373c-1308-4c40-aa31-028e598842a2} + {eb1e899d-2402-46b0-91d0-4213073a2b76} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj index 4276bc1b4..8151d9f8f 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -325,7 +325,7 @@ - + diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters index c7f3477d1..0b9a27688 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,55 +2,55 @@ - {7e9b311e-1780-44b7-9426-dfcc5f9b6912} + {46f4786c-da7a-4b65-8e9a-5f42d9233ad2} - {f21cc134-f163-42ef-af57-02ce2e494c50} + {b0379ba4-88a1-404e-bad6-9a75d2b85aab} - {76031e71-da43-42fe-81b0-5eba83c6e900} + {774ba64e-961e-41de-bb95-a77552d5e3ed} - {5d64599f-8595-4974-bd8e-fd3e2279e9de} + {dc1effc0-fbdb-4fcb-809d-9677dca63152} - {462dc31a-8f03-48c5-83ec-80eb2cd2bb5d} + {941d3677-9d1b-4406-a19d-1ea6058b9a59} - {16ee4ba2-7700-4d51-a58f-30594026988a} + {284088e5-87f1-4c84-afed-c6814246d946} - {2d2f47ee-ffe3-4697-9ae7-3274ba846f3f} + {47ef9231-039b-4d2c-8695-c6f1a462ed0e} - {e395382c-2646-4812-986f-5070a39c2670} + {c51b0582-6b42-4db1-97e3-829a11bac16f} - {af934aae-1982-4716-83c3-efec70e2da32} + {8e96b4ca-bb1f-40e9-9012-b01b1a7a30d0} - {25f3e701-c255-4abb-a800-aef01c4d23bc} + {7db3bda4-8d01-43b8-9191-e598cf74a51e} - {7246ee4e-dc5d-4f5f-a112-014a010b6a42} + {9f5846c2-d8ff-42f0-879f-22b13cf39d1e} - {8858e225-5a8d-41fe-b479-b5de4e1876b4} + {5f434ee2-e044-4f59-b72b-9bd00db3ef18} - {359e2948-80fe-4610-81c7-463a97c9fa2b} + {5a72ffde-2f06-4f61-b6de-19cf15968996} - {0b5ab0b8-443b-433c-be48-1ba297b912ac} + {05e308d2-624c-4258-9478-feb30f5aef35} - {195c60f1-77dd-432c-87a9-673695946148} + {35a83a23-feb8-426e-9c2e-aa546b15e0cf} - {987f0edd-b0f2-4315-9c70-64b9748d51e4} + {53b4d280-0bcb-422c-a9a1-7b5286f27b1e} - {eebb5cca-72ff-415f-98bb-a085cd353795} + {0e1d2595-7ab9-4689-96a7-6c53dc136317} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj index 7cfc55487..0682ed2b2 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -325,7 +325,7 @@ - + diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters index 38b5f0cc4..ca9c3d8ac 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {946cbc0b-c071-4cf0-92d0-a831d21d7651} + {6e8fbfec-9ecd-4998-b4f4-cf12689a5dc2} - {4ffc66d4-57f8-4dd3-9ad4-39b79d96f222} + {4bdb160f-91f9-4129-9f17-9b7090910c47} - {a825b3b7-e80d-425d-9dbb-703920388aec} + {b70b359d-fec5-4b5d-97d9-9b0c126dbde6} - {d24f4dc0-4cc8-48b5-a497-bc0979fefea7} + {55a71d07-6087-405f-b600-116876d1aac4} - {a792e284-714c-4c99-addc-2d06f30155e1} + {2ad97208-275e-4774-a80a-ef46d9f4d890} - {94f6f256-f838-4939-b016-fc08ab598501} + {98534da0-eb60-4bdc-aa26-444be92b13c4} - {732c42c6-f2ab-4fb4-a183-17def8292826} + {217b9bd1-7995-4f76-ab2a-520d4cb582a5} - {506e332c-fad1-4274-9aef-da54b7eaba3d} + {3a830f18-a9c1-4329-ac5a-3ce506f7743a} - {ce2a611b-690f-4f4c-b547-41f72b76e59f} + {ec2c60eb-4f8b-4cad-965d-8a1382939e4a} - {76ba667a-e3b6-4b3b-9237-737adc777d67} + {d2c4210b-b9e3-436c-b1d5-5be77253e1ef} - {2b15c9fb-ee90-4734-beeb-11136cf7febb} + {95f6eb48-55c3-442b-9841-8ba9de7ab1ab} - {72bdda93-ac73-4e67-8930-60d482c7e4a6} + {6f512c26-1221-4f1c-ac72-8cc0384aec62} - {91a1bea1-85f6-4a35-9bcd-726b957cd774} + {52d87d81-e666-408b-9a04-98fc65caf8e7} - {660a7fc8-8b9d-4238-a815-d4a602c58ffd} + {9d0b600c-bf4c-4221-a6f8-f001be81e96e} - {c402066f-be9d-4e20-b3b4-1cb82d68b575} + {f3e0aca2-fc35-42c0-b53a-be9280424f11} - {782363c3-2527-439a-bc38-34533c68d82c} + {d8d275cd-4d40-41f7-b143-940f938af139} - {290a2981-15eb-42af-8159-fdce79b83a8e} + {ae3eb3f3-a683-4aa1-aea3-3beaad26adff} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj index 9d33626ec..3c7c64f54 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters index 96ee352ac..90dd61095 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {64962a53-72dc-4580-b49c-fe1edbb50d61} + {04065258-bb01-4bf8-a85e-c3b76b1ff482} - {07c58c07-a064-4ec7-b218-a1809f1f19d0} + {efa4fe13-ecb6-47f9-ae7e-ac4959f2f63a} - {3f43619b-2824-45c4-9fcd-86842900adcd} + {056577a3-4afd-4a6c-a7c1-8b076eb6282d} - {f744c9b0-2268-4aea-9e90-5a63aba1f782} + {caf3dcd1-23f0-42b9-b59b-1931ae69c926} - {f24d22ca-53ba-48cc-9d75-32c43716ba3c} + {eb0f5df0-b4d2-4268-9118-b76db26ad64c} - {1e1dceac-1a1a-4f32-9c8e-acdbf73479dd} + {f7744661-9e08-40e8-a3c6-62afbde52031} - {a8409d23-a8a3-474a-bf5b-10475e0e1953} + {ba81b6a4-f004-4c1a-ad97-da1c8308c9f6} - {914890ba-bee9-4f38-8109-48f1ce838fcb} + {fd758286-b8f6-4fea-8ead-e36ca0a2ece0} - {ff8bd5ac-e638-4dd2-984e-f262ba589f84} + {4b8232c4-8448-41ae-ada2-79df848c1872} - {c545bd9e-88fe-4779-ab44-4653d491b019} + {7b54cd59-f273-4acc-993c-691b0c103ad8} - {58e3b4ee-5c54-4bd1-84df-cd444efd3524} + {e05a2b91-3618-4186-820c-acf5c6dbdb11} - {fa2944fe-57ac-475d-a2c8-e254f542467d} + {1a818181-208e-491a-884d-cc41bd35f676} - {20e93b1b-9d95-457a-b656-0d3f39b30612} + {70a8b28a-574a-48c8-9b9e-c3a80c1b83f5} - {73f93ac5-e204-4ac5-ab3b-aad50bec67a3} + {8937229b-248f-4713-be44-a5a240981238} - {b6e2398d-3c62-4f5c-8092-0b464fe4031d} + {16b495f4-1c06-4b1e-9401-0ffe498dc59b} - {36824149-7376-4f12-86c9-5213f4b89d78} + {13de4b7b-b7ca-4c48-99d5-6b1a79408b1d} - {0e1bed46-773a-4513-b56e-823460084a4b} + {83e5fccd-8597-42d0-b332-a218228357c7} diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj index 79105d216..a3cdffe52 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters index e00f0fed0..766fc59b1 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,55 +2,55 @@ - {d72963c4-7449-4b7d-be4d-7ebf93014c39} + {d271502e-2967-495a-87c8-f95f64c1007e} - {eaed31e5-c238-40d5-acb6-13d30ccab040} + {18ea005f-f08f-4ae3-9dd9-b23e15fc86ca} - {9b5a54b3-0a2b-4f4e-9aa5-07e73f63b2ef} + {cef1aac7-2a44-4bd8-8374-f6428308c57c} - {98a12e4f-da9b-45cf-91dd-a63a1ca66488} + {27884581-bd04-41ba-9163-414101d11063} - {046e631f-4e39-425a-9895-c0132536956f} + {1ef2b730-3003-414a-a011-3270ff46e0a7} - {8c18f91a-6a37-4e88-86e5-748a83bc23b0} + {002fde7c-357d-4877-a18f-be7165735f46} - {3d411a9d-5245-4223-b6f2-f40d9e4ce550} + {f7cefe33-c6ab-40c0-9175-2d1783a46cf8} - {fb86066f-b1b0-4a8b-a5d0-49153f29815f} + {921954b6-3044-494f-8230-985eb2bde9e1} - {24d02f45-30f2-4a20-a932-a25863ff46ff} + {016ba4c1-b108-44a9-80bf-5f1ab5cd76e6} - {15a17851-780f-4b50-9aa6-0496fa0ae967} + {80c27895-6878-4e89-b0fd-858944779267} - {5401fa22-50e2-46e6-ad94-fe24afbf2e9a} + {547198ae-c0a7-4d66-accd-777714d5ae4e} - {7cc66608-6eb2-4884-9259-fd362de3fba6} + {7c6829a1-45aa-450d-a427-2509c45f1f98} - {dfc81336-dfb4-410d-b335-8d1ffa73ac3a} + {095d91b3-c052-49d8-8ee6-7ad7fd7987b3} - {8543820f-27f5-463f-be2e-65c5e3ee3b09} + {389c5764-c5ca-4bef-a94a-01a5e4b84bfd} - {08dc5b88-b97a-4ea7-a238-d7c2a7276f46} + {b08e0953-7004-4eb5-bbb2-a938f96578df} - {f0ecc8c9-49e6-4062-8b31-ac0d11956088} + {e4295021-a722-4744-9b8b-0c227bdbe288} - {073df5d4-8d98-4e02-8de3-aa4ac379047a} + {d522d191-53db-49dc-9968-b27a30ecc9b8} diff --git a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj index f577de137..bd6f0d4ce 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters index 9a625acba..3b573907f 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,55 +2,55 @@ - {15a7c22e-f054-4bd7-86af-3c8ec4ca2f7c} + {13f67848-0b5e-48cb-80d9-8d74866802ad} - {bca4f0c8-9ab5-4feb-9241-08b230bf6ff7} + {67e9da10-33c4-4d63-8812-a1976be945f1} - {b4550967-1d7a-4096-af9b-0f6baeceb613} + {1b5b22fa-4477-4959-9f14-64a21554ef71} - {71a48da1-8dfa-4b5d-8695-495509f6f8d2} + {bce983c1-6f78-4dde-b98e-830aa41cbb4a} - {c513efdc-b3ec-4650-9a91-66b1a4a69c65} + {2534fa78-3d7f-48c8-a8a3-fb17a08aaa5b} - {c64a84e9-c422-49d6-b86e-901049489ca3} + {b01ce167-30fe-4fc2-a64c-e29990f267d3} - {076e01d3-127c-42fb-940b-f84334d8beb3} + {31b00c9f-7e5d-4886-bcbd-8a43d7179cac} - {709fc8c6-7635-4d60-b2b2-9205d7c740b7} + {8a16e4f5-477d-47ff-b9ca-0a3d18f48c88} - {3acc993d-14df-4168-87e5-3b594107d7b1} + {cccf1429-ec9d-484f-b149-d0c27563a447} - {ee2c2034-afea-4b4e-b36e-35fc0a795ae8} + {ad325498-9e8a-407c-bc30-d55597f26efd} - {85a2b18e-1800-4026-96a3-577afdafe8ba} + {b4d3d935-a80d-47ed-90f2-cc969484a0dd} - {457b7c9a-8f3e-4f9e-bbe3-dea246b1d756} + {0ee866e6-9fe2-4eb9-a2b3-e99f1fda08dc} - {ddbeeefa-833e-44ab-b74a-cdc880bb9b46} + {85629b31-a6c8-4d45-a0a9-19c33ed48f2c} - {d67ff6df-53f4-45e8-8fe4-b50ba266753c} + {6e757848-0d40-4d14-94da-306fb850a6a6} - {d16a6d7c-accb-429c-8a23-3a1248cd2f97} + {94b53021-04c7-4a61-a157-edcd71582120} - {5dd61bab-82d4-4324-814f-73113f9a9880} + {5737b3b0-2800-4383-aa0b-56a3e95da7a8} - {f584d29b-2b66-4449-b8fa-d5c2cdf3784e} + {30d89cd9-ab52-4059-86c0-2a298dc61c07} diff --git a/NetSSL_Win/testsuite/TestSuite_vs90.vcproj b/NetSSL_Win/testsuite/TestSuite_vs90.vcproj index f179a1aae..a0a8cc535 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs90.vcproj +++ b/NetSSL_Win/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -325,7 +325,7 @@ - + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters index 259344787..665ad3de4 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,55 +2,55 @@ - {c2743a24-b786-49e5-a237-cf9822fd1029} + {8245e5ef-3ebe-4377-9d1f-51de32bdea8c} - {72312c23-83c7-400a-97bf-f1d1eaf71322} + {a2be7860-e384-4a92-a5c3-ba2297fe7710} - {17efbfcf-58de-48b2-8314-7a8fb2c2c8cb} + {cdc12fc3-61b5-4268-8f4a-3d32b2108638} - {7d9eb97e-9bab-4cc3-ac84-952a03f2c1ec} + {dcbd24d6-f452-41f6-952f-685a24ebf7a4} - {aa1d9a99-e7fa-4f9e-9331-db0e5300f2aa} + {abde523b-1c61-4bce-a37a-885e507b5fab} - {88aa6d34-0dfd-4a22-8621-9fdf1d0173d5} + {af853821-aff9-4574-b99d-19b6e81183ae} - {4881ec73-0a6a-401d-89b3-f6ffee8415fc} + {107099da-4a97-43c6-bddc-bfa37c9e4bb7} - {65b40084-ca1f-4d4a-9277-f71c95d05ca3} + {6fce4b9e-5908-4779-9137-a0ce1e725da0} - {4602180a-6b40-4aa8-987d-cb0eac1efe0d} + {f7a94db2-93f0-4b35-8e60-1d36de08f3ea} - {064e1dd3-5139-4e3b-a8f6-30fec94ebc4c} + {66c9cd0b-9e93-4c41-aed8-28c00a6b8011} - {8dc122f8-2180-4faf-a81d-9ae0b4208299} + {38d52f3d-0616-4961-9405-755e1f514fa1} - {271d5550-ce6f-4137-bce7-f9df9637bf18} + {cdd11b1b-5847-473f-b584-64809069acba} - {bdb0ea20-d966-47fd-a8c6-f533b27f3984} + {b107364d-db0e-4622-b2d9-bd345cf31bfc} - {6c3e4754-2cc7-48e9-964d-98dd84ba0018} + {f2ef4b7a-7bf9-4978-8527-024988c6d4aa} - {1152737c-da13-4061-9063-c97a9470861f} + {ea92d46b-7e3f-4af0-a528-7d559c6a6688} - {38cf59e2-c265-4085-b5c0-c62a1ca573d3} + {1b308667-b7a9-4f89-80aa-78859ec5b004} - {44202274-0ddc-4844-8f86-0ec350090998} + {8711fc43-183c-44ef-9438-e8a828dc4140} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj index 2d2364bdd..c8cee4879 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -325,7 +325,7 @@ - + diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters index eb8d39a72..12bc21b8d 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {460fe2c2-7de2-45e3-858a-38fa2a383056} + {ee87cd0b-adb4-4825-a696-3b1a62c93091} - {1a87cbc6-ece6-451d-a376-febe284658b9} + {902368d8-2c21-40d1-ba4e-1b45b64782a8} - {698a7845-0222-4bcb-a9da-4027cc385340} + {5c687ed4-da9f-46eb-96c3-270acc4e4c1d} - {9d69658e-da5b-4b73-9077-b742156518f0} + {ba8f271e-7ce0-4735-bfe6-678e65a6f319} - {93e8012b-acb7-4a80-8259-25cbf756bcb4} + {0dc3a725-2825-49cb-a3f6-9c381af832e9} - {1465bb31-8c4d-41f7-bfb7-fddf22b6e57f} + {e5719766-63b1-4e80-80c2-951d600e3d48} - {25d9f97b-ff39-416d-a837-46dec37fb3f6} + {9a404be7-0a86-4dc2-b93f-342d21a2bce0} - {4648745f-329f-4cd0-a4cc-4caee2e5ae5a} + {3968e954-f4ea-4681-b08c-dfc7dcab051a} - {142e2622-0c87-49bd-b7a2-40c48a026be6} + {94938e44-1045-4466-88ee-291c851036f5} - {f84b5496-aee4-41ef-8e35-caf989712598} + {d8de7234-99ec-4839-9e6a-f540a7f225e2} - {4b5f9e32-3bb7-4a70-bb01-aefd569a4a89} + {3f6682fc-182d-409d-8a35-abdebf8dcd9e} - {a824ae4a-a69c-4452-9686-9967f0d0b895} + {93f440b8-7413-41c4-8fc3-f6d8afce4a59} - {574aa076-cf7d-4e87-bba0-0b88f44d0962} + {36358012-d55c-40b2-bbd9-cacf5c016485} - {f5308aa4-985f-464a-a6e4-b27a6bf67d26} + {ab165f87-953f-4265-a309-6ca5e893c6a3} - {18edb940-3272-4e58-bf0e-76b9280b27ec} + {b60a4b14-f7ad-4499-a55c-072513bbf55f} - {f4b00699-4985-4442-b601-c41d8b1e7c2b} + {fca37bc1-cb5e-4ad2-ab80-c960c38ccdc5} - {f89d9c93-4bc4-4534-be11-2685eb0839c3} + {437fbeba-763a-409f-96d3-6c339b58098b} @@ -89,7 +89,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj index d7396bc9d..80693894a 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters index 6bdcccbc4..4aac1d79c 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {46ea8f7e-f63e-4417-b070-200f089ea788} + {86cc2765-3a25-4c26-827f-023a85320f97} - {fe5a8204-0572-4580-a63d-70700cf185fd} + {891a7ee2-abe8-4392-a34a-82e7759fb148} - {ac7501e2-273d-4b69-a532-1a5fc1efd1ac} + {1cfa8df6-c6fd-4402-96c7-fc6daca5e4f3} - {c8faeb3d-720f-494d-8202-dd5440ff6438} + {2e660d9b-3af7-4641-90b7-daf55f586b87} - {babd1e30-562b-47c1-8dbf-9348a3bcdad6} + {6abc86ad-a98c-4302-8c73-b3aad157a347} - {3bc6a319-9224-464b-b205-17f62b8fd6fd} + {8a673009-c90b-446b-887d-d48abef53e6b} - {a9f2fb1f-f1cc-4dda-8c9f-cf68fbadddd4} + {4c21540a-cce2-4cc8-9e82-af8e874144b6} - {16235977-1ed4-43c0-a5f7-a2b14c75cfc7} + {00498017-da3a-4132-a1df-ae4b27391aab} - {7c497233-6abe-4d23-924e-b111b867f87a} + {b694d7d7-3cf1-4849-8e06-377c6b993e9d} - {15832f5e-4e30-449d-8dd4-03d4bdc7e5b9} + {a8446b47-b0e7-4223-9dfc-b31f212e135a} - {4a3db25f-9295-4852-b426-d52eee274d78} + {b443ae5e-33ba-4391-835c-53f56d310e4d} - {017f5592-4359-46d4-8a1e-3ed5e0d67a81} + {c8134ef4-9c7d-4083-a0a6-d9fa61e26966} - {8279fac7-4c56-4b25-973b-7923870019ef} + {6364b804-e2fc-4ac2-8ddb-8632bd932918} - {2f7d8f22-5d1f-4399-9f49-3691814fa7ef} + {93d2c21f-6328-4bc4-af0e-c11286f996d9} - {7b2ca693-c93b-49b9-bc92-82eed5cbfdac} + {63c7731d-b309-430b-801f-c164815af94b} - {c3510a04-3e40-4b51-a43e-4d9017103300} + {8ff84646-9e9b-404a-afe1-87555862655d} - {e6020374-8c9d-4109-9619-0a5bd0bd041d} + {4b3b09f2-4d49-4dc9-a060-cf98fa92cba9} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj index ee6e14209..4497da30e 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters index 1e95aa8f3..1e691fd03 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,55 +2,55 @@ - {6e988154-119f-4a60-94ac-592712f83d5a} + {c5286a3c-6e7e-4dc3-96c1-2cc3b0b6a5bb} - {00682444-0032-42e5-94d1-5ee780917597} + {ac905c1a-f732-4d7b-b1b2-3e7fa329af9d} - {a63d6a27-c765-4e23-87f7-3c92fe645a32} + {8c85391c-8a99-4755-b19d-07901f037f2e} - {ca4644e4-768c-4ea3-84a4-ed3d9a3b2276} + {6398d93a-b8c6-4872-b9ba-8045bcbdd1b5} - {b7d7d2bc-215e-4ee2-962b-55709070262a} + {c75cac5a-977d-4860-a200-5a3af110a242} - {7dd6a66d-f355-48b1-85f7-ea0fb5c1b1e6} + {04727125-9535-4a8f-a2f7-cae3b7b29710} - {80fe3533-b1f7-495c-b798-f0777305af7b} + {0ec5d9f8-eba5-492e-9bd7-4eadd6d2b8e0} - {bc95f01a-03e5-40cd-a787-b63a5efc8cdb} + {f4771496-a10f-41b9-81f6-4103e5c3db7b} - {a6ca22dd-664c-4a00-84fe-f6683725e7e2} + {66b34a7c-0cfe-4aa2-a73b-376ff5fe6138} - {1277459c-a015-4ad3-b30a-5c1f7753c637} + {045cb774-29f5-4dc4-838d-e30ca6e6a2e9} - {47cf5228-0c81-445a-ae6b-2aa8e4378a9c} + {a58c6d3d-c989-4223-bbb7-ed3a524bcef9} - {aebbb12c-7bd7-4591-8b1f-1dab4f3115e0} + {29ecffc5-c4c4-4bfc-9143-f6815d667fdb} - {96452213-d6e8-4f07-b8cd-2e8e8dcd7ba8} + {015c7b3c-5809-4095-a99e-d74bf0fb10e1} - {37d4e4c5-8576-4706-a07a-b87e087aa2b8} + {68fe61be-b2fb-4cf8-9c0a-cdc07241c9a3} - {e191bb0f-bf12-4679-9780-fd4fc4ec1e24} + {c3eaa8c9-cd55-470f-9b7c-e77f2c0fa08d} - {4c72c29d-e917-492b-9326-091343729e7a} + {6fb72c7b-758c-44b1-956b-8f376bde3832} - {90479fad-eae6-45a9-9e51-e5a4cbb7b025} + {ca1aa84c-c91e-4315-b026-0d42231e0c52} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj index 6bfa78fe2..091ef03e3 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters index 8c8f708e7..4ff8ea804 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,55 +2,55 @@ - {f1802a8c-f125-4c50-a4f2-fe050781c398} + {547ee0b3-619b-41ea-86b0-e90a71bf9126} - {8e82fe52-c219-4840-be92-427d1e28fe89} + {e0571cd7-e12c-40d7-b21b-ecca3da81d4b} - {9e4e934f-67a2-4142-a5e7-9ed79613fe0a} + {34d1c4b2-d0b8-49fc-a7af-09acfdc9a0b7} - {96ea29b0-6b55-44c1-91f0-04f734444870} + {48a1cba4-5264-4e36-8ac4-b00457a32e50} - {c2362210-e533-4192-b6a0-3e5c8b047fda} + {f000a6bf-4414-4bbf-9f07-989c957a12f7} - {aa91dd4f-f19c-4ef8-94b8-86244f08cbca} + {58b8387d-c112-4bc9-92c4-ba71577f0c3c} - {257defdb-988a-4195-9501-891273bc8a19} + {6a3c90e9-3f53-4dc3-9913-3539679aa33d} - {1671104a-ed37-4d92-9fe4-fdb9673d6c3f} + {690d4b2a-2fd7-4bcc-8483-0e5e7bfa58a5} - {97fd4085-3bb2-4a3e-9eed-64c6b2d49211} + {73a5abd6-2cc7-474e-b14a-26dd233a2f32} - {950a44d4-bcde-4d20-bb7c-d83c6d48818f} + {078ec701-0d2f-4234-aead-1fac5805fe9f} - {140289f1-b708-46a5-a4d2-2c2fe5032b08} + {257ea44b-973d-494d-a55b-369eb90105bb} - {a45313db-9214-4d66-bc93-89535cfb7bb8} + {b144c0ab-5e66-4410-b9b2-c3cf56bca38c} - {78f8364b-a1b2-4ddc-b47c-67b18700bc24} + {4005802b-5d3e-446b-8b33-fafac9597033} - {66351d42-8b61-482d-89ef-64b99cb8ac85} + {44d156a9-85a3-4198-8c78-0c90e8189620} - {5b68071b-44ab-40b2-a989-e481fcb5d2fa} + {fce53c44-c7fd-4eb7-a0ee-f1c86abf5c47} - {1ef515da-b2ab-4966-8e28-ae8f0837e580} + {1851043a-9e7e-4135-941d-5d4f13b6200a} - {52161699-dc9e-47b7-8ec3-a8d95ef15f3e} + {e9808e11-6356-40ac-9605-68164e4699bf} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj b/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj index 9b95a7121..6d2f58833 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - {4ec4ee69-1a5b-4e44-82e4-438cc0976f24} + {7e8410fd-a04f-43ad-b50c-201473523342} - {f22509c2-8489-4bf5-827e-ba63b5a366a8} + {b591dbe3-097b-4093-bacd-d693013251d8} - {8192e6b9-a88e-455e-8879-687da906e609} + {2db23698-61fb-456d-b5a4-92f451b67955} - {0b9c74e9-a690-4de6-9b56-d786deb91544} + {d63e732a-4d21-4541-a262-0d674e355eff} - {772ccb91-6aa3-4234-856f-df9b1ebd1f26} + {2b47647d-2d6b-4f97-b43f-fd715668286f} - {4c8085e9-7925-4f13-8483-cc0567dabce8} + {6fa43945-15d0-4587-97cc-4e878d89d564} - {6ef91156-d00b-42c2-b1a0-b4bb6df2173d} + {98d8cb4c-7587-4e1d-940d-178339f59f72} - {4157f63b-ad77-49ba-8187-b77d7e1780e5} + {48bb4826-f63d-4973-b146-0e01d4af848a} - {81a85edb-b46b-49e1-adeb-652c053a14ac} + {cbb34de7-880d-4f81-90e8-569c4ed46db5} - {2f2db5a8-ac11-4044-961d-b85d68d5c281} + {1e3934ea-f28a-4500-aec3-5ed4b1e41e7c} - {59dcb753-82f5-4114-b1b7-abbb5a80186a} + {9912853f-2274-4381-8af4-22f1b482124d} - {a47111ca-98de-4617-82cc-fa4fd70fc724} + {571ede50-dca2-4437-a868-24a61e4e88cd} diff --git a/PDF/PDF_vs110.vcxproj b/PDF/PDF_vs110.vcxproj index 24d215e62..b2d757c2c 100644 --- a/PDF/PDF_vs110.vcxproj +++ b/PDF/PDF_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoPDFd PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_vs110.vcxproj.filters b/PDF/PDF_vs110.vcxproj.filters index bd63b1e53..5d2a328ad 100644 --- a/PDF/PDF_vs110.vcxproj.filters +++ b/PDF/PDF_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {a9824f87-d98b-47b9-8327-48fc7646282a} + {5882ae88-1291-4f38-aac6-778641eec44a} - {7b96e9e6-7fde-44e8-b878-815e08e8c5ed} + {95d1cd9d-9511-4833-8cb1-373b4b99ef37} - {79ff792a-4b44-40d6-8781-7d6511cd6965} + {b20f59ec-84ca-4135-8832-1aa56bc43bb2} - {0edc6e70-984c-418b-bb61-f045c11c087a} + {87e71ae2-6bcb-44c1-a5d2-44b87d9ba8fe} - {95152b56-632d-4df2-9fe6-405e03c79c4f} + {f77d544a-210b-4030-bf0f-30937a662dcd} - {103a1c76-d14b-432b-8ae4-5dfa3b27d55f} + {d3c86e66-4c21-4345-9b31-b6f631bc4e37} - {03ad0bec-7cbf-4fea-82a4-39511a10611f} + {26a1aa3d-c8fb-460a-b9b6-4ea59abb4739} - {ff91ab21-63a5-49b7-8fed-4c6daa66049e} + {fe12c2f9-61cb-498a-b8a3-f3dde724c379} - {f61d0148-3f10-4938-b87f-04a5833e0a62} + {be9e43c2-691a-41a2-b381-3c0c2777a029} - {f8840220-4cf4-4099-a6e2-7c686918744b} + {d7bf5a89-f6fb-4c42-b596-7aae33c6fc7e} - {b1fd46d4-5c49-457a-9d31-32013eb05cb7} + {3c15c8d6-14e1-4d30-8b1e-f11c04be45e3} - {69c75fed-df49-4046-ac48-90874a8c42bd} + {9f4bbda1-e915-409f-9cc9-2c20d5e2db7b} diff --git a/PDF/PDF_vs120.vcxproj.filters b/PDF/PDF_vs120.vcxproj.filters index c6df8226c..96a990689 100644 --- a/PDF/PDF_vs120.vcxproj.filters +++ b/PDF/PDF_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {ec4b9760-b389-45b7-b08f-6b9cb09855f8} + {0107f519-9abe-4e8e-bc7d-34b46cef05d8} - {90659ffd-361c-4662-ad2b-3bfc08706ef2} + {f2a14b2d-9c3f-41de-889a-6e1f9a669be1} - {25d62e4c-8a2b-480e-9f6b-87e1bf0ba5c0} + {e048c51c-14e6-4e6f-a753-a4b76255b2c1} - {da15d77b-4eed-4031-bd7a-b017b9c76b41} + {45ba50a0-5128-4305-bfb3-2e3a196adc0e} - {b2ad969e-4950-4a6d-8634-5da522e1cd09} + {e8ab54b9-57cc-4aa6-a935-650f5603a357} - {a24b0043-1ee9-4525-81d4-88bac694b049} + {d5de156e-28af-450b-aa0a-7b38581edf82} - {7ce05a07-b04d-478b-bd9a-65611cd5761f} + {e7cf64ab-4eef-45aa-a535-7d7f0e2b156f} - {40ad39ed-7ea2-4552-8155-f1d42897804f} + {1a65febe-d798-45c2-9a97-ee09b0f675a6} - {d344e3c7-2d12-4b2a-b5df-75d7cdde8bd6} + {d3860fe5-7681-4e9b-b986-df70629f770c} - {7deece97-4654-4504-a746-4ee0fdc59447} + {33323087-35ae-49ab-8ce3-de366e353ae2} - {3aab2564-7bd3-41a2-af00-933bdb76d0d2} + {82f742b0-059b-4751-811c-e2e10b9fe57c} - {11f56755-5aea-4be1-88f9-c69b42de6772} + {7c1ffcf8-58a2-4e02-8364-ae5a5af24359} diff --git a/PDF/PDF_vs140.vcxproj b/PDF/PDF_vs140.vcxproj index b0b910446..593d1c499 100644 --- a/PDF/PDF_vs140.vcxproj +++ b/PDF/PDF_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoPDFd PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_vs140.vcxproj.filters b/PDF/PDF_vs140.vcxproj.filters index fd7c86d0e..46b7c765f 100644 --- a/PDF/PDF_vs140.vcxproj.filters +++ b/PDF/PDF_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {f7c7f0bc-15e3-437e-b086-f0d56de6d936} + {12ea3f16-ea38-4e06-9540-210f5bd21f28} - {a3dde60c-0d29-42c5-9789-40a70b108b01} + {4cc57f50-db4f-40c9-bb88-d0d1216fb502} - {ac1a8ad8-06d3-47ad-a91e-e77b2fe25830} + {d5979ab5-f933-45e7-8fcd-accfca63f7e8} - {c7cc0c03-28e3-44c8-8a05-339fba539192} + {6badd15e-923d-448a-abb0-b93e3da1d15d} - {a16dc8ea-4fd3-4828-b006-db55ed752f21} + {601c8548-fa0f-41dd-b6f9-11a7ae8e0291} - {fd622f4d-2468-432f-aed8-714a86cf8486} + {0422c12f-20e2-4175-8f4a-6391d67db7a9} - {c55208c0-94ef-4bae-a550-b167f7e79166} + {ae16ea28-a3d4-463c-ad80-88fea0f3aeb8} - {e959e4ab-07fb-4ae3-b03b-af64303ba19b} + {129c3a89-449e-4a6f-85d4-a2f5b7ac0685} - {8109259c-457c-4ecc-ac8e-3760c08a5ea9} + {6540929a-da09-4118-9a53-b031b1bf89c6} - {68eea0ca-a04c-4be4-8cd6-22e57b164ca5} + {b01a68c7-80b6-4766-a9de-8549054f61fc} - {c3a1c528-b5df-4dde-9a72-1b58efdfe797} + {a61824b9-830f-4f35-a8d6-e8f16d18de41} - {1fc04f60-3252-4283-83b4-4eadfb369aaa} + {ca64d446-1355-442d-8939-a3f2de0a3671} diff --git a/PDF/PDF_vs150.vcxproj b/PDF/PDF_vs150.vcxproj index cc93a9470..67203833a 100644 --- a/PDF/PDF_vs150.vcxproj +++ b/PDF/PDF_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27130.2010 + <_ProjectFileVersion>15.0.27625.0 PocoPDFd PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_vs150.vcxproj.filters b/PDF/PDF_vs150.vcxproj.filters index 5ecaca8f3..d1e644784 100644 --- a/PDF/PDF_vs150.vcxproj.filters +++ b/PDF/PDF_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {31553af7-4be8-45d2-a4fa-edf5ae5a8e65} + {fe436334-a329-4b98-9995-3c04e1a70539} - {1cd87bf7-f18a-45a6-9ed0-707251dc656a} + {4fd39783-8b65-457e-bae1-34158f581f2e} - {c5b639d1-61db-416c-ae8b-230640d212d3} + {097aa04b-a9b1-48bc-b344-458c8dbf8155} - {ba0694dc-b0d0-44a3-a5f0-89c36b757ce0} + {1fec6760-f5b1-42e8-b748-8f6d15276d0f} - {a18e0ce3-1ee5-4c9e-8685-6379a8aa585c} + {87a36c3c-1e22-47d2-a956-9fcbfa466c54} - {da728dca-5695-4948-9e5e-9fd343ff7a11} + {18182097-8ff1-4c74-8071-affbe0efb76d} - {0d02441e-94c0-4468-bc3f-a4581a614f37} + {cee456ef-ba0f-4f63-a5bc-8096d3fae06a} - {cc8e8e98-52a4-4913-ac64-6fd3990caaf3} + {69c12041-0c3b-4df7-b16a-ab4f25845520} - {a20c5e3c-f11a-4dfd-aaea-51fd68d4d167} + {c8ac937a-c184-4e83-8eeb-943057cc571e} - {189578d5-31a3-456d-8c6d-106b46a43dc1} + {62067444-b8d2-44f5-86d5-e4f267036fa8} - {5d7947b0-5c1c-435c-a58f-dca49f5782ae} + {b79c3054-53e6-4d95-b675-d98a4db53a6e} - {fc98017d-f717-454d-89f7-0be9eaac68de} + {2ec2bcc8-8305-4b20-bee9-fe23ee522286} diff --git a/PDF/PDF_x64_vs100.vcxproj.filters b/PDF/PDF_x64_vs100.vcxproj.filters index d6c2881e7..77ec596dd 100644 --- a/PDF/PDF_x64_vs100.vcxproj.filters +++ b/PDF/PDF_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {923f4d03-ee4b-405e-ba4b-5bfb29ecc75f} + {5be28c8b-8363-428c-810c-187ec544b2b7} - {d0f392fa-e6a6-4023-a155-19f0129efb9c} + {87686e8e-3861-4fe9-bcae-92399b11c5b2} - {26f986d2-1251-474f-a6a9-c603968a57bf} + {65402e92-e177-4497-a822-35c8463b0e31} - {d12a7bd9-dc78-455c-b577-9912dde3d0df} + {9a550a23-6bb5-46b5-af7f-fa51bd3bae54} - {d54061f1-8483-4818-aa14-d9c7e9428785} + {32cde1d5-6c62-426c-8df9-2080da4c3106} - {f6f41331-4de9-4929-8959-5bf70fc03ac6} + {68b79b9c-281e-4925-ae31-eeb388e6529c} - {f25fd1bd-a9e8-414e-b211-6de36d66afc5} + {f48c1582-64e4-4a79-89cd-32227d144610} - {b4c5dcf8-af13-4c58-891e-8b0c3ff5f74d} + {37a2f8c7-675f-4227-b304-6a46208a3f88} - {9436a6e4-b64d-4ae7-87f3-ca5ebcd6f995} + {e6bb9955-796d-4b52-9729-873058e30dea} - {d8323530-f71f-43ca-a52f-d64a81d8c378} + {e4ff5321-4ef2-4e77-99e9-da9f0335e873} - {e004eb1f-244a-42e7-a711-910a53f9c0d0} + {58aa62c3-8545-44b4-b015-8985b4bd7583} - {ab85e182-48e6-4a5f-884e-9587056ef811} + {4ffbb673-5476-41b0-b60d-509542df609f} diff --git a/PDF/PDF_x64_vs110.vcxproj b/PDF/PDF_x64_vs110.vcxproj index 3f9254f8d..6011cd2ab 100644 --- a/PDF/PDF_x64_vs110.vcxproj +++ b/PDF/PDF_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoPDF64d PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_x64_vs110.vcxproj.filters b/PDF/PDF_x64_vs110.vcxproj.filters index faaf80b3e..694842821 100644 --- a/PDF/PDF_x64_vs110.vcxproj.filters +++ b/PDF/PDF_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {7171a08e-278a-43e7-98f4-98eda96dbe11} + {c48064dc-b0d6-478f-8e5e-b6c649fc64b5} - {bca57ba8-159c-4888-a214-9cc05a00b067} + {e63a271d-713b-48c1-bc7f-132784929ffe} - {a4003039-c4d7-4df6-b67b-85f880fdc6dc} + {ba2862e1-f2cb-4b76-8a77-373916b48450} - {7eb98137-a9d6-4cf9-aa25-1a6c4b7005ee} + {987f0e0a-2089-4b3f-b2d4-163b344c4ecc} - {74ca3f6b-2d17-4d2a-bb68-b72d2f30b979} + {4a6ea6ad-775d-4b60-8a1f-cc05b2f68ba9} - {5d433641-dfbc-44c1-a536-d3bdb3d6452e} + {9669a3f0-0606-4422-b463-9f45cc125a9c} - {9f8a193a-b2c0-4ee1-aa03-5cb0af6cd3ac} + {f4292e0b-7333-4930-a9c7-bdb79d9cb55d} - {127ab6c9-2bec-47d8-b038-d526ccd5f1d1} + {7a90c4eb-7444-4a16-ade8-dafe0dc2c89c} - {a65abef3-7570-48a0-91d6-8fc46bd294fe} + {5dd0d3b4-6288-4621-a338-7f3c22512016} - {54c3bda1-8db2-41bb-be1a-d5475e1041d4} + {a9846458-a45a-4793-b4b7-5eda88f2949b} - {cc1eb6af-a12c-4b1b-87e8-0bea79bdc38d} + {97c6e062-db4a-441a-b34b-eed5d6998a48} - {f2cb7984-d070-421c-b8ee-1a80572c2980} + {a386404f-e26a-4b89-a75f-c50592e5db67} diff --git a/PDF/PDF_x64_vs120.vcxproj.filters b/PDF/PDF_x64_vs120.vcxproj.filters index 193bee4e7..7ea48707b 100644 --- a/PDF/PDF_x64_vs120.vcxproj.filters +++ b/PDF/PDF_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {aa00f502-9283-4376-952d-aa2bafd5cb8f} + {d4cdcd15-c9bb-48d9-b30b-87e77c357229} - {c1acc77e-e9d6-41c1-a5a4-caee5336adb9} + {05800818-cb03-47c1-a315-b42f1fe611b6} - {ca831495-3bb3-4c25-9ef4-d3a9c34e1278} + {3a7a71e2-1712-426b-8a14-eb7651189785} - {aee5558d-057f-43a6-be53-a10579b3cc71} + {471846b6-517f-45af-a952-9c7e25433171} - {fe19ea04-31c2-4914-91bc-a8cec59f1b18} + {d401f890-a1ff-4bee-b9b2-3580cdb5bff8} - {bceb6353-e6eb-4cf4-aedf-4225a0fb954f} + {db9e1711-acb5-4517-bdc8-1d5d779f59e3} - {ad23a87e-bb9c-4d2b-8a70-a9080b7519e3} + {4bf7a8bb-34b8-4af9-a1dc-7e4c9910b3e7} - {ab074dff-7f6a-42b6-99c5-6c5dca7bf322} + {07315d10-a5b6-448f-b108-f6774bbaefe0} - {6b02f48b-eff9-4268-849d-2b99291d9783} + {42e8e38e-b5db-41e6-ae2b-19073763c155} - {38dca475-e675-44f7-bf1a-840151084de1} + {eb7e62ea-a443-40f7-8e86-b0b6336a4e20} - {41554b66-5155-4068-b58f-e664ac4f65fa} + {bce04ff6-3a5c-4657-85ec-da34c0ac7659} - {7ae00e9b-6925-4c5a-811e-3d0a110caa17} + {b18de6dd-df64-43f4-84f0-cf6f309776b0} diff --git a/PDF/PDF_x64_vs140.vcxproj b/PDF/PDF_x64_vs140.vcxproj index b202f99e8..768573626 100644 --- a/PDF/PDF_x64_vs140.vcxproj +++ b/PDF/PDF_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoPDF64d PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_x64_vs140.vcxproj.filters b/PDF/PDF_x64_vs140.vcxproj.filters index c73732fc3..a4aae1428 100644 --- a/PDF/PDF_x64_vs140.vcxproj.filters +++ b/PDF/PDF_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {a333418a-2d33-4fd7-b58c-f7582a00228f} + {bccdfffa-3af7-4ec3-a1b2-31d304c94bb7} - {cfe2f397-a07c-4980-b3fc-60dc34b63f96} + {1eb134eb-bc99-4776-9679-8260dcd3b1c8} - {8627de64-c316-4060-b135-3c92b5c9642e} + {96639199-df08-4ce0-b57b-5e46347b7127} - {79fe905b-b321-47b3-9c0a-7c2cbcf340c1} + {fb7643e9-a8b1-48c5-9696-e7fb17f9b610} - {718bfd09-a1ad-4c1f-ad51-a54f81d86ffd} + {70efc76c-2197-4ef8-9db1-b9057707b5c2} - {b415870d-d07e-4e24-9cec-4bd673e86c2a} + {1ab3c33b-dd42-403d-98a7-36deffc471f1} - {0be46bda-a0fc-4ca1-91b6-3b22d284a2c8} + {c0ae236b-43b6-44a5-ad9b-99530e35fa63} - {7112cada-de24-4bbe-ad6a-07ba16bc9768} + {194cb8ca-bb7a-4f86-b472-b5e049c15121} - {843c82b4-8394-42ea-bec1-8aa643e06af7} + {7987766a-fcfc-4efd-bc77-e7095ba135a4} - {30bfc99d-ff27-45b5-81a5-4ea3f121541c} + {22fb4da4-448b-427f-8940-efe071575a00} - {43f2f752-d45b-4c56-9c53-7fa4ec4afd1a} + {ff88b3db-7265-43b4-9b7a-c9f9af9858cc} - {b8765d95-3aeb-4df6-b549-53fb29345791} + {03d499d7-66a6-45ba-9a1d-d342e2de445b} diff --git a/PDF/PDF_x64_vs150.vcxproj b/PDF/PDF_x64_vs150.vcxproj index 5425aee77..7757ac9cd 100644 --- a/PDF/PDF_x64_vs150.vcxproj +++ b/PDF/PDF_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.27130.2010 + <_ProjectFileVersion>15.0.27625.0 PocoPDF64d PocoPDFmdd PocoPDFmtd diff --git a/PDF/PDF_x64_vs150.vcxproj.filters b/PDF/PDF_x64_vs150.vcxproj.filters index 7f6909344..28f4d0aa4 100644 --- a/PDF/PDF_x64_vs150.vcxproj.filters +++ b/PDF/PDF_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {d468f98e-1b2d-47b5-a02e-5a6078582291} + {bfabfa01-1db2-41ee-b006-df902789f8c9} - {53893544-c3bb-4864-9369-1170cba42e1c} + {13148f7d-40ee-448d-a48e-5ec236685472} - {4fb11d12-564f-40f7-b5fa-d48ca2b6990b} + {97353a5b-3cab-4ad3-9696-7f98636dd0e5} - {d548f24d-bda1-4d63-8179-f6b340e71702} + {f850433c-1b02-42bc-8f75-fa0277a50562} - {d00ed937-93eb-421d-aabf-38a7a2024788} + {ba5fe8d1-4c37-45d9-a7fb-70dba29ff539} - {ae0b5c1e-4ee9-46a0-94e8-e6942a57bfbb} + {4d0589f4-0b94-4327-9f6e-466d99237011} - {91b40332-9629-4f91-9166-4aabb830e0f6} + {3aabb6d0-8d4a-4104-b3d7-dfef21515128} - {17e93f2c-2eec-4396-a138-abaf316199b6} + {fe7f6ab5-21ed-42a5-a25f-63d324253569} - {4f89efb5-45e1-4eaf-b05e-4f8987ff9a33} + {4b4038d0-e4c0-4539-bc27-86638d2a8d40} - {26559b47-3a71-4609-9240-597de03f8245} + {f2c6d7c4-2abf-4c82-9fe9-7d28b6c29a89} - {76a9d067-fbed-46ae-9ed2-aea233852165} + {68edfbd3-0a63-4361-81e9-4b3da7623594} - {a574a134-a017-40aa-a150-2dbc3d9cc7e0} + {7d5c87a8-a747-405e-87bd-c7084759063d} diff --git a/PDF/samples/Image/Image_vs90.vcproj b/PDF/samples/Image/Image_vs90.vcproj index 5e57aa977..c734e96b1 100644 --- a/PDF/samples/Image/Image_vs90.vcproj +++ b/PDF/samples/Image/Image_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -318,7 +318,7 @@ - + diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_vs100.vcxproj.filters index e949ec954..958a032b6 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {f60205b0-cf53-42bd-a415-0c350437494d} + {1714e2ce-0a32-45f1-a162-839e4b7a07ae} - {aefc8658-0fec-4242-b195-803e28b0dac3} + {4f778548-f1cb-4286-9dca-4c02bb6c90ac} - {a1b184c3-ab04-4b6a-a089-67769b7543b5} + {6fbd3312-51db-43b8-8424-3110529c36d8} - {b0f55278-d526-4339-a602-bfe7c1eb8c7c} + {919316d8-5ef8-4f43-8882-1d7681c33468} - {a24f3f7e-4936-468d-bd05-d784413b984c} + {26cf3275-46ce-4c24-9fb8-27ed3b46d621} - {22d861f2-ceb0-4061-bc85-7502001c8fff} + {d2c5ad1f-9730-4c6a-8055-5e5746995a6b} - {0fa3da9c-33f0-4138-bcd2-40606f85a5d6} + {e9363089-5742-4cb4-ae48-012ab357265a} - {b53a4b7d-59d7-4699-b18c-763bccc83623} + {dccbae3d-6615-4ec1-83c2-d56eeeb7655f} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj b/PDF/testsuite/TestSuite_vs110.vcxproj index 70ee068b1..92811737d 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -318,7 +312,7 @@ - + diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_vs110.vcxproj.filters index 0f56c4ef7..89c3ca96d 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {96bb359e-a036-40f0-a7e3-eaf056f0d433} + {e8768912-6ce1-4909-81cc-af707cf23b8f} - {d8e43a0a-1af6-4071-becd-9bfbdca2b154} + {c10a2aa3-b7f5-4744-be72-fa11cd7a9c1c} - {eb8071e4-9bc7-43d1-ae62-22a95874b730} + {df561f84-5dc7-4ae5-beab-22e48efa6062} - {fbc47206-ec1f-47a4-990a-b7b0ced87677} + {ad28a23c-e477-47ea-a494-556310294a55} - {b559f952-325a-4314-972c-21a8bacb81cb} + {2f5050e3-fafb-457a-9f24-ee59032cf0c8} - {42944ef0-a562-44bd-9439-603d31b4369f} + {f5c1e17b-c6fa-4e8b-a42a-2898df63bc6c} - {258aafb6-c801-4ba0-b8a8-8a0eedd3bdcc} + {07d245f1-24cc-4fed-8d86-80e58d042080} - {d81afc90-e4cf-4fdb-a32a-524f9fec5cdd} + {cccb3ce1-f27a-4a39-9043-6c45da5958bb} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj b/PDF/testsuite/TestSuite_vs120.vcxproj index 4830dfc22..00a668d6f 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_vs120.vcxproj.filters index fa5e59294..d72304dc6 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {9bda5e92-8371-40bf-8309-f8821cdde5aa} + {13d9ccda-d0d6-4762-9b33-48054644dc1a} - {5ab4a9ce-6941-4cf4-a0e4-ef76d84d70a7} + {93f6c1a4-2730-48b6-b597-3e0b025db117} - {0cdbccff-fd58-4d1e-a297-a0ca794f9352} + {de999fdb-9df8-4494-be33-e2bb7a39b080} - {a735d638-6f21-46d2-96b1-2886c686aa25} + {c56e68cf-db52-4fe4-baf9-2bc34e8baaa3} - {6ce264d7-75d1-4b69-a5c9-ab5dc5add17a} + {5cf79902-9cb8-41fe-9ac0-fbba0f8b0037} - {c0810433-e860-47a5-b75f-6e18096799fb} + {9d127008-d0d5-4f3b-b9a6-bada3d478f1b} - {e2bb6cc8-0be4-45f1-87f8-f4ef5a352086} + {edafff50-78af-4cab-a05b-25afc05a2d14} - {adc99b41-3cf1-4f7b-a025-c034b0c17362} + {1fe92f98-70e0-4674-b62c-93dd5deaf1de} diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj b/PDF/testsuite/TestSuite_vs140.vcxproj index c068ce4e4..7488962bf 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_vs140.vcxproj.filters index f51772550..3f5b3e93d 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {6a87788c-1818-4726-8246-92ec5651b921} + {3834f5c2-40f6-4395-a1ea-ed72a58f83af} - {62ab3308-242d-40dc-bddc-68ea8882f97e} + {57f00ead-fd28-4e52-8371-d0a499a263c8} - {3d491ae0-adf7-4611-bdcb-e87036381e0d} + {696844d4-98da-458f-8b0f-46ba66bade27} - {bb873a12-15d7-4026-98c3-567a6e314da6} + {90031bca-a81d-4c53-9fca-f6931d9db42f} - {12dbc9e4-db5a-405f-a7c5-5144bbd44279} + {8d5da3eb-f0d7-4014-b461-ba3d5a22201e} - {f605e0bc-d4fe-401d-90a4-8b756909bd85} + {b7c0e865-b198-43f8-8915-52449277cb8e} - {127b8ed4-a675-4253-80bb-1fe39346f48d} + {185e38aa-7b79-422b-b458-796ca3f180bf} - {8f47fa83-f566-4757-9f13-ef90fc2dbdbc} + {f7118981-8890-469a-9ebb-6c398a9cdbd1} diff --git a/PDF/testsuite/TestSuite_vs150.vcxproj b/PDF/testsuite/TestSuite_vs150.vcxproj index c01449d7b..ae3dc6cc8 100644 --- a/PDF/testsuite/TestSuite_vs150.vcxproj +++ b/PDF/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs150.vcxproj.filters b/PDF/testsuite/TestSuite_vs150.vcxproj.filters index dfd8c37ce..73000c178 100644 --- a/PDF/testsuite/TestSuite_vs150.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {17842ac0-1f2c-4d42-8434-4fb08301dbf0} + {81fd4d45-be4c-466a-b20c-8d18e777c5fe} - {8bf9a7eb-b5f5-4192-b4fe-2fa6b3d9e2cd} + {04f269d9-4f55-453c-898a-2dafa10e438f} - {724e52ff-91ca-4e71-9cd6-f315efa3d085} + {5d9a5b3e-6108-4f8f-89c5-112c6eac6ec4} - {6eec62e2-68bd-4253-97fc-c13d82bd2208} + {e5aa8bf6-278b-49ee-a356-fb990c0b178a} - {836d8928-4782-4951-9c8e-c6b2e7190808} + {151616eb-378b-4cc7-820c-fc13cdeb1744} - {a2781900-598f-42fc-b24e-1e2bdb34e7fd} + {b377b1c8-4f16-4391-87f1-5634a4c2b8de} - {625c169c-99d1-4562-ab46-8be29b0b885c} + {1c936b76-b446-4b3d-98e3-61cd274599fc} - {d8103e28-2f6f-448d-85a9-eab17925248d} + {e0ac558e-1cf6-4e26-a006-9410a6483ac4} diff --git a/PDF/testsuite/TestSuite_vs90.vcproj b/PDF/testsuite/TestSuite_vs90.vcproj index 25b183dee..c85a0ee5a 100644 --- a/PDF/testsuite/TestSuite_vs90.vcproj +++ b/PDF/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj b/PDF/testsuite/TestSuite_x64_vs100.vcxproj index af6060574..eec1a13ec 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -318,7 +318,7 @@ - + diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters index 224c660f7..2095b5274 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {e6481fdf-6c01-43ad-855d-83334a1ade96} + {0086e790-140b-4fbd-a600-358438949058} - {6449d0b4-b002-4010-b1a6-69e4f2063d3d} + {6fc1087c-6e94-4775-b6c9-aa2087b3e5af} - {430fb762-a8d1-4975-8725-364b646792de} + {c1085422-8011-49ab-9ed7-2be517290972} - {0a72fdce-5619-41ee-a21e-183a330873df} + {4d885f7b-6805-4cd0-ab2c-747ef6eb68f1} - {3f32193b-edcb-4ee6-a9f8-d1da03e82ad6} + {7951346a-4d81-4892-8e7d-86d432ab44b9} - {a51f6b1a-d5fa-4b9c-8686-5f13f6b33303} + {1aea0973-f9cd-47ab-bbad-694f595a97ca} - {593ccf6d-baad-4bd6-b32b-08c80f6b7854} + {67980e7b-2740-4b18-94d6-8dfe93bcd278} - {65d9bd61-24d8-4ebc-a17c-3f6949ca755d} + {39e7bbde-ecb5-49f3-94a4-7fce8449b69c} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj b/PDF/testsuite/TestSuite_x64_vs110.vcxproj index 26167b4aa..cbb62bf24 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -318,7 +312,7 @@ - + diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters index bab65ed80..cbfc7a632 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {33be258a-3c4e-4596-83e4-6dbb11aa3fab} + {807c7344-68e3-4951-81f0-3e95195c6524} - {b4cd2a10-ec37-411b-b449-2121eb6f343d} + {0a49fb2c-9a15-44ab-834c-7b486aa3caf9} - {cada8fd4-3952-4964-b0ef-d8475ce96842} + {35bc47e8-3b19-4fd5-86a1-d3f62849cab5} - {779a4a61-a6b7-4e9d-8326-fbc43a3c46af} + {6ea6fe95-c4bf-454b-a9a2-623939dbda34} - {ce6b4b0e-14a3-4853-9b2c-1e9b659e0e3a} + {b3e898aa-e880-410f-bba2-845b006df374} - {35a880dd-b8a7-4538-b72b-a5d6c11bd4eb} + {a4fe6243-0dbe-4e6a-9467-c22200865bb6} - {06d9395e-92e4-411c-a9a1-cfafed060c95} + {51448f56-7c49-48fb-9483-a8850fef48d3} - {5e61fa47-32d1-42be-894b-5ac50fbb206b} + {c0a43ee5-3376-4484-8e28-c6aaf5cc2b0f} @@ -41,7 +41,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj b/PDF/testsuite/TestSuite_x64_vs120.vcxproj index 568e7780f..d2c17b2df 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters index e0cf88cb0..eb390315e 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {46bb378d-1ec1-4ed9-85db-74b1ff21f9c5} + {2ef6ca5a-16ff-46ed-893d-031565c4d9af} - {09d209fc-b23d-4c6e-bd5e-88093c6d5355} + {d4253814-5c88-431b-89f7-1f29632ac9ae} - {97ae46a8-6cf4-4d03-b234-a6c972ff3038} + {22814df4-e585-4a28-8289-59de2911e09e} - {e4a33409-a638-466d-83fc-9a2224468508} + {e19baaf2-09b9-4361-a1d0-47c97d83402c} - {62c25f39-3ce2-4609-9d9d-dc00bbd55fe4} + {9928bd23-0887-403f-9033-33a2cc040b51} - {7938f35f-dd02-49ca-b071-6282b75d3236} + {e62c96a5-d3d4-4314-af37-9543857dc782} - {3ee1ca7b-0afe-454c-bccb-8c0904ba408d} + {ae45e162-a871-4532-99bb-37dd073561a5} - {abbd2201-8044-4269-acd8-e78f60d707f9} + {09aca6f9-4246-4cd5-a89f-b73ab5c6aaa5} diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj b/PDF/testsuite/TestSuite_x64_vs140.vcxproj index 3ff7c9270..99c79517d 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters index 3ac7ed176..4de281c49 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {ac00dbb6-8cac-474a-a966-2794df21a291} + {34bf8e03-c9ff-42f9-9551-5390c9ecf367} - {31d15f2d-0d2a-4842-b874-556eef459007} + {92e61942-6ecd-4083-8251-09e2be28b345} - {b86aab67-fc66-419d-8953-bbfce79207ee} + {05d19e7f-c522-4bd4-ad7f-3cf1d5bf14ba} - {4b39748b-39e3-402d-8e79-e6d2722dc7f0} + {bcb4cae3-c1f3-49f1-8c61-7c072d63971d} - {ff57ce6e-4825-4987-ad58-a7059dcb8a49} + {bd6f6929-5776-4371-9e54-8587d46bd4b8} - {b7c72ce0-4517-47f1-8c12-ee728facce70} + {3234b502-b882-45b4-9018-02b7cc45d0dc} - {5ee412a1-f809-4256-af81-7a3a2cfd0db0} + {cfe91f88-3f14-4b1e-9158-4ffbd7f95cf9} - {07ea23d2-0f1c-4da6-b0db-1f9ca78853fe} + {2b2bbf60-c338-46ff-afae-f294bc083529} diff --git a/PDF/testsuite/TestSuite_x64_vs150.vcxproj b/PDF/testsuite/TestSuite_x64_vs150.vcxproj index adee77c70..3a420bfcf 100644 --- a/PDF/testsuite/TestSuite_x64_vs150.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters index 7cced47ee..6de2b6fa4 100644 --- a/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {325b2f7c-c3f8-46fa-8e4b-1a5b5d0d95eb} + {414fe879-5069-4a4e-b828-fa9756272f17} - {cd0d2fe3-2f74-4e7a-8faa-8a32de69bf15} + {757c8e54-0489-4834-b9e5-ffe77466cd7a} - {18e15055-1f45-4e0b-a33a-8c0c54f75cd0} + {5bd61cbf-01b5-4c1d-aaa9-de1f895d8801} - {99d4f4a5-0a0f-4948-9713-b36774ddca77} + {b208a8e1-639e-4617-b94e-d5681c19af4c} - {992601f5-b140-497a-87df-c8788a76cdc8} + {73a5cf64-330c-4d17-9c5a-01e69160589a} - {3e048861-fc50-4883-b5f2-a16bf33272f7} + {9c004226-f671-4ee3-8954-d0b3db48c0d6} - {8a8b461e-aef7-44ef-b9dd-245990375350} + {285d2519-4b70-49a2-a0c6-e9e010b4e2ce} - {aca1b0ed-0b63-4ea2-a732-1e163c7ef6e6} + {38d234e1-7904-4160-9df6-eaffd252aeb8} diff --git a/PDF/testsuite/TestSuite_x64_vs90.vcproj b/PDF/testsuite/TestSuite_x64_vs90.vcproj index 7b3e65b1b..f9ef50441 100644 --- a/PDF/testsuite/TestSuite_x64_vs90.vcproj +++ b/PDF/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template index 94f2e8358..dca4d78af 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_shared.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_shared.template @@ -3,7 +3,7 @@ OutputDirectory="bin\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template index 6b1036671..32b50aec7 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="bin\static_md\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template index 0df19f640..e2e836e5c 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="bin\static_mt\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/Win32/testsuite/release_shared.template b/ProGen/templates/vs100/Win32/testsuite/release_shared.template index 18a8ebb5a..c447969e7 100644 --- a/ProGen/templates/vs100/Win32/testsuite/release_shared.template +++ b/ProGen/templates/vs100/Win32/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="bin\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_md.template b/ProGen/templates/vs100/x64/testsuite/debug_static_md.template index c78f1ca2b..b2bbcc587 100644 --- a/ProGen/templates/vs100/x64/testsuite/debug_static_md.template +++ b/ProGen/templates/vs100/x64/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\static_md\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template index 47a854417..2c7520b6d 100644 --- a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\static_mt\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs100/x64/testsuite/release_shared.template b/ProGen/templates/vs100/x64/testsuite/release_shared.template index 5484f1cdf..e4cf9845a 100644 --- a/ProGen/templates/vs100/x64/testsuite/release_shared.template +++ b/ProGen/templates/vs100/x64/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template index 6b1036671..32b50aec7 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="bin\static_md\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template index 0df19f640..e2e836e5c 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="bin\static_mt\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/Win32/testsuite/release_shared.template b/ProGen/templates/vs110/Win32/testsuite/release_shared.template index 18a8ebb5a..c447969e7 100644 --- a/ProGen/templates/vs110/Win32/testsuite/release_shared.template +++ b/ProGen/templates/vs110/Win32/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="bin\" IntermediateDirectory="obj\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template index c78f1ca2b..b2bbcc587 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_static_md.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\static_md\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template index 47a854417..2c7520b6d 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\static_mt\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs110/x64/testsuite/release_shared.template b/ProGen/templates/vs110/x64/testsuite/release_shared.template index 5484f1cdf..e4cf9845a 100644 --- a/ProGen/templates/vs110/x64/testsuite/release_shared.template +++ b/ProGen/templates/vs110/x64/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="bin64\" IntermediateDirectory="obj64\${project.name}\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template index db37414a4..b8604b7a6 100644 --- a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template +++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template index 3e7ab788a..fcc713332 100644 --- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/Win32/testsuite/release_shared.template b/ProGen/templates/vs90/Win32/testsuite/release_shared.template index dbe14e78e..6995cbb8d 100644 --- a/ProGen/templates/vs90/Win32/testsuite/release_shared.template +++ b/ProGen/templates/vs90/Win32/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template index 67c24af54..75bd2f609 100644 --- a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template +++ b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template @@ -3,7 +3,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template index d264302a9..e4edafbb1 100644 --- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template @@ -3,7 +3,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="1" + UseOfMFC="0" CharacterSet="2" > diff --git a/ProGen/templates/vs90/x64/testsuite/release_shared.template b/ProGen/templates/vs90/x64/testsuite/release_shared.template index bff52b590..a09d6d7a6 100644 --- a/ProGen/templates/vs90/x64/testsuite/release_shared.template +++ b/ProGen/templates/vs90/x64/testsuite/release_shared.template @@ -3,7 +3,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2" > - {6dcae768-8067-47a7-9481-ac894f3b30b6} + {d6cf8d8f-b244-4337-b52e-c991b2697c1c} - {f89b1edd-a21c-48b6-90e4-b636be5fdbd6} + {9dde7f9c-d2c5-4f58-a31a-af4f04a23082} diff --git a/Redis/Redis_vs110.vcxproj b/Redis/Redis_vs110.vcxproj index 77a1f8665..c4f87a532 100644 --- a/Redis/Redis_vs110.vcxproj +++ b/Redis/Redis_vs110.vcxproj @@ -285,6 +285,7 @@ + diff --git a/Redis/Redis_vs110.vcxproj.filters b/Redis/Redis_vs110.vcxproj.filters index 6d5236c20..a2960112e 100644 --- a/Redis/Redis_vs110.vcxproj.filters +++ b/Redis/Redis_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {00b62a5b-811f-446c-a9ec-7d4a0be21b51} + {95229aa7-64b5-423e-bbfd-25d4c79aff38} - {31c7afaf-db79-4c7a-b181-38f9203efbb4} + {bd5b74f9-bdcb-4b0b-ac46-c57d0e9bf1ad} diff --git a/Redis/Redis_vs120.vcxproj b/Redis/Redis_vs120.vcxproj index 6ee874ece..5d2c4a403 100644 --- a/Redis/Redis_vs120.vcxproj +++ b/Redis/Redis_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoRedisd PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,10 +265,10 @@ true true true - + ..\lib\PocoRedismd.pdb Level3 - + Default @@ -276,28 +276,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Redis/Redis_vs120.vcxproj.filters b/Redis/Redis_vs120.vcxproj.filters index 0aa7847e8..c69d39db7 100644 --- a/Redis/Redis_vs120.vcxproj.filters +++ b/Redis/Redis_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {5baf4745-44bb-4873-850a-e4bed127388b} + {14a6448d-f227-45a3-b077-55da84d9fb78} - {a0f08266-6bac-4f2f-abc3-c0912a9f7750} + {4d1c4995-75ad-416d-b815-3a0e39ca9e7a} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/Redis_vs140.sln b/Redis/Redis_vs140.sln index 04498a30e..7220e1bf9 100644 --- a/Redis/Redis_vs140.sln +++ b/Redis/Redis_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_vs140.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" EndProject diff --git a/Redis/Redis_vs140.vcxproj b/Redis/Redis_vs140.vcxproj index 40c3ace57..f601c36fe 100644 --- a/Redis/Redis_vs140.vcxproj +++ b/Redis/Redis_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v140 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoRedisd PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,10 +265,10 @@ true true true - + ..\lib\PocoRedismd.pdb Level3 - + Default @@ -276,28 +276,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Redis/Redis_vs140.vcxproj.filters b/Redis/Redis_vs140.vcxproj.filters index 8a9b28b28..e5a21e79c 100644 --- a/Redis/Redis_vs140.vcxproj.filters +++ b/Redis/Redis_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {ecd36673-7746-4725-8d7c-21936f60a2a6} + {44f52e4a-db1a-4f79-ae54-8b75e4163917} - {df25fd21-fd54-4853-80d3-80be8e5b26ba} + {8423e460-dafe-48c5-bd99-9a1d08cb9be8} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/Redis_vs150.vcxproj b/Redis/Redis_vs150.vcxproj index 4f32fa9aa..567a93f99 100644 --- a/Redis/Redis_vs150.vcxproj +++ b/Redis/Redis_vs150.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v141 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoRedisd PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,10 +265,10 @@ true true true - + ..\lib\PocoRedismd.pdb Level3 - + Default @@ -276,28 +276,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Redis/Redis_vs150.vcxproj.filters b/Redis/Redis_vs150.vcxproj.filters index 8a9b28b28..66ab82aee 100644 --- a/Redis/Redis_vs150.vcxproj.filters +++ b/Redis/Redis_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {ecd36673-7746-4725-8d7c-21936f60a2a6} + {c4811399-7521-409a-a06c-4c5626acb9b1} - {df25fd21-fd54-4853-80d3-80be8e5b26ba} + {1df7b5eb-b3f9-4067-8bfe-745c97f8fe4c} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/Redis_vs90.vcproj b/Redis/Redis_vs90.vcproj index 71475ce7b..e94143dfc 100644 --- a/Redis/Redis_vs90.vcproj +++ b/Redis/Redis_vs90.vcproj @@ -427,6 +427,8 @@ RelativePath=".\include\Poco\Redis\PoolableConnectionFactory.h"/> + - diff --git a/Redis/Redis_x64_vs100.vcxproj.filters b/Redis/Redis_x64_vs100.vcxproj.filters index fd0b93140..b0ea241f9 100644 --- a/Redis/Redis_x64_vs100.vcxproj.filters +++ b/Redis/Redis_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {a38ebf2a-7201-459f-9529-982e658330a2} + {7f0d99f5-2fe4-419d-8f7d-dc48dc0c2446} - {47576743-6de7-4ab2-a8e8-b4006575ca04} + {d4d04d27-72a3-4488-a8b0-b29f2d09dd80} diff --git a/Redis/Redis_x64_vs110.vcxproj.filters b/Redis/Redis_x64_vs110.vcxproj.filters index 16bf8d72c..6ef8f0524 100644 --- a/Redis/Redis_x64_vs110.vcxproj.filters +++ b/Redis/Redis_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {22086ac6-28cb-4ea1-8467-10c1b47d8389} + {955e3c47-0978-40c7-a857-f8e75f96551b} - {1b9893f7-c778-4baf-b849-ffedeca495b3} + {74b726f4-5a4d-4866-94f5-82f8655aee7a} diff --git a/Redis/Redis_x64_vs120.vcxproj b/Redis/Redis_x64_vs120.vcxproj index d9fdc9668..3c4245317 100644 --- a/Redis/Redis_x64_vs120.vcxproj +++ b/Redis/Redis_x64_vs120.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v120 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoRedis64d PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib64\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib64\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,9 +265,9 @@ true true true - + Level3 - + Default @@ -275,28 +275,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Redis/Redis_x64_vs120.vcxproj.filters b/Redis/Redis_x64_vs120.vcxproj.filters index 243929f23..8531e715b 100644 --- a/Redis/Redis_x64_vs120.vcxproj.filters +++ b/Redis/Redis_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {ccc8ed4d-5024-46de-9a7b-f8f3ccd67864} + {c75a04c4-d096-402f-b732-14eb23070c5f} - {de5467c5-c688-4d45-b854-f6bdecc06624} + {811986ae-819b-4804-b563-bf0ffd32553b} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/Redis_x64_vs140.sln b/Redis/Redis_x64_vs140.sln index 40d4f61f0..91f3ee6d8 100644 --- a/Redis/Redis_x64_vs140.sln +++ b/Redis/Redis_x64_vs140.sln @@ -1,4 +1,4 @@ -Microsoft Visual Studio Solution File, Format Version 14.00 +Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2015 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Redis", "Redis_x64_vs140.vcxproj", "{12E39EE2-7049-312D-B390-7568D727CA25}" EndProject diff --git a/Redis/Redis_x64_vs140.vcxproj b/Redis/Redis_x64_vs140.vcxproj index 7f1ba5983..d99b431e1 100644 --- a/Redis/Redis_x64_vs140.vcxproj +++ b/Redis/Redis_x64_vs140.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v140 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoRedis64d PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib64\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib64\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,9 +265,9 @@ true true true - + Level3 - + Default @@ -275,28 +275,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Redis/Redis_x64_vs140.vcxproj.filters b/Redis/Redis_x64_vs140.vcxproj.filters index 1c86966e9..d0f99cc05 100644 --- a/Redis/Redis_x64_vs140.vcxproj.filters +++ b/Redis/Redis_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {29acefbf-e487-412a-a81a-d25789c3a843} + {5fbbd88f-ad37-43a2-9ac2-8965e8f7d855} - {e85f7a69-9ab4-433b-9dad-130b5df5932a} + {bd3476ff-ce88-4f53-8704-60dd3ec8c9e7} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/Redis_x64_vs150.vcxproj b/Redis/Redis_x64_vs150.vcxproj index d2bfc24a1..8bfcd5fbd 100644 --- a/Redis/Redis_x64_vs150.vcxproj +++ b/Redis/Redis_x64_vs150.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,7 +32,7 @@ Redis Win32Proj - + StaticLibrary MultiByte @@ -63,29 +63,29 @@ MultiByte v141 - - + + - + - + - + - + - + - + - + - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoRedis64d PocoRedismdd PocoRedismtd @@ -132,7 +132,7 @@ true true true - + Level3 ProgramDatabase Default @@ -163,9 +163,9 @@ true true true - + Level3 - + Default @@ -193,7 +193,7 @@ true true true - + ..\lib64\PocoRedismtd.pdb Level3 ProgramDatabase @@ -218,9 +218,9 @@ true true true - + Level3 - + Default @@ -240,7 +240,7 @@ true true true - + ..\lib64\PocoRedismdd.pdb Level3 ProgramDatabase @@ -265,9 +265,9 @@ true true true - + Level3 - + Default @@ -275,28 +275,29 @@ - - - - - - - - - + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + diff --git a/Redis/Redis_x64_vs150.vcxproj.filters b/Redis/Redis_x64_vs150.vcxproj.filters index 1c86966e9..df95555eb 100644 --- a/Redis/Redis_x64_vs150.vcxproj.filters +++ b/Redis/Redis_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {29acefbf-e487-412a-a81a-d25789c3a843} + {4e62195a-b9b9-4930-a809-3ac6b3dc721c} - {e85f7a69-9ab4-433b-9dad-130b5df5932a} + {384ede37-13a0-48a3-824c-011c84bbff08} @@ -36,6 +36,9 @@ Source Files + + Header Files + diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj b/Redis/testsuite/TestSuite_vs100.vcxproj index a3c3888ca..b899921f3 100644 --- a/Redis/testsuite/TestSuite_vs100.vcxproj +++ b/Redis/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_vs100.vcxproj.filters index c19fdf15b..64b71a583 100644 --- a/Redis/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {583725ce-a2c2-48c5-9695-20c1a06c702f} + {d6284716-2016-49ba-8bfd-b28a101077cf} - {1e726a51-d4c8-433f-88f3-0b4b386d4733} + {34076047-ce5c-4386-ae42-18ef89f07cee} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj b/Redis/testsuite/TestSuite_vs110.vcxproj index 26c8c56c5..20cabb1fc 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -314,7 +314,7 @@ - + diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_vs110.vcxproj.filters index 53646ce50..a826c0c88 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {be93cd23-cdd6-4338-b111-b87ccf3552f6} + {61aeb5bc-8562-4519-8684-e240a52e3466} - {6c7e4cd7-f974-462c-a22d-dc02f39ad8fa} + {b264f480-8c54-4ea7-9e3c-7abadb1ef7d1} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj b/Redis/testsuite/TestSuite_vs120.vcxproj index 52b21630c..1c0571f92 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_vs120.vcxproj.filters index ebf3a1ec1..4276fca87 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {b72cb984-bcf7-44b0-a120-47976ffaacbc} + {606458e4-d55e-475a-b9c6-480bbed80068} - {c879255c-36e6-45b9-aea5-db1105765a40} + {c669cafa-cb85-42e7-941b-6ffab50a5a2e} diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj b/Redis/testsuite/TestSuite_vs140.vcxproj index 52d6e42a2..59df363ed 100644 --- a/Redis/testsuite/TestSuite_vs140.vcxproj +++ b/Redis/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_vs140.vcxproj.filters index 586ac2694..448016cf9 100644 --- a/Redis/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {5ac3782d-91cc-4f9f-b955-59474e1c3771} + {0108e2eb-0827-4bae-8ad2-65c012e2f196} - {3c0f545e-efc1-47f8-97bf-539708a777b5} + {c1277a40-384b-4857-a91a-ccf02b1130be} diff --git a/Redis/testsuite/TestSuite_vs150.vcxproj b/Redis/testsuite/TestSuite_vs150.vcxproj index 848fab836..8896a3f6a 100644 --- a/Redis/testsuite/TestSuite_vs150.vcxproj +++ b/Redis/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_vs150.vcxproj.filters b/Redis/testsuite/TestSuite_vs150.vcxproj.filters index 09393a9fb..ad694f21e 100644 --- a/Redis/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {3348f966-e309-477b-bfdf-023fd40c63b3} + {ad56db14-dd9e-4a6a-9cea-eefcedca0129} - {2f87cf65-7889-4b4e-aec7-e8a7906426cd} + {eb2c4e47-8e4d-4b08-95be-3c46479fd1c0} diff --git a/Redis/testsuite/TestSuite_vs90.vcproj b/Redis/testsuite/TestSuite_vs90.vcproj index 712ea9dc1..672ae0470 100644 --- a/Redis/testsuite/TestSuite_vs90.vcproj +++ b/Redis/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj b/Redis/testsuite/TestSuite_x64_vs100.vcxproj index c83466df0..e19f9c127 100644 --- a/Redis/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters index c8033d20c..a0f43abe5 100644 --- a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {2e9f3cbe-c1dc-4991-9ad9-28e290874eee} + {a4af758c-8fb3-48d7-98f8-6b149650af0f} - {ad54e729-4d47-458b-a6aa-d945167639c8} + {2f339c05-3a8d-48e9-b395-0b663e554ed0} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj b/Redis/testsuite/TestSuite_x64_vs110.vcxproj index e8005ad4d..65ab4cf25 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,13 @@ Default - WinTestRunnerd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +179,11 @@ Default - WinTestRunner.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +208,14 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +240,12 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +270,13 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +301,11 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -314,7 +314,7 @@ - + diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters index c3a91e300..b438500c9 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {81a2f43b-12a6-4232-90b2-80691c0fae4b} + {5257043c-58c5-4ea2-b45e-a8ecc08dd370} - {d1a28baf-b001-4c3e-9936-e195d51bc5d7} + {01bec204-e7e1-4b3a-89ab-7bbf86a0e73c} @@ -15,7 +15,7 @@ Source Files - + Source Files diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj b/Redis/testsuite/TestSuite_x64_vs120.vcxproj index 7ce57e2ae..a5e27125d 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters index 3130368dc..41586d70a 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {414abb21-3f38-4b12-9e58-046a1f914bf4} + {cea25085-dd95-4810-b6b7-45618e72f3db} - {bae857ab-d56c-4ebe-aa0c-b662cda96e66} + {51414225-6e3d-496f-9291-61e7d97427af} diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj b/Redis/testsuite/TestSuite_x64_vs140.vcxproj index 069f57014..d86a6f2c5 100644 --- a/Redis/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters index f546768f8..527cb7d0e 100644 --- a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {cd1d286b-45d7-40fe-a49c-eefc00d88b29} + {f49d2c7e-14e8-408d-a941-d61e966698bc} - {e082b98a-97a0-40ec-8490-25a0e11af4fd} + {01bd3d98-e481-4afd-8b7f-209aae8a96ab} diff --git a/Redis/testsuite/TestSuite_x64_vs150.vcxproj b/Redis/testsuite/TestSuite_x64_vs150.vcxproj index 3b59822a8..f19c1b338 100644 --- a/Redis/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters index 46c19766a..103079f40 100644 --- a/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {cd7fcecc-4fa2-4b98-98dd-031e82ca2c6d} + {09724be2-5f6d-4c65-a16f-1df3f67c359d} - {521f46c2-319c-4720-86d3-85578037208b} + {031a59b1-6652-40ce-8713-d7cf28985ca2} diff --git a/Redis/testsuite/TestSuite_x64_vs90.vcproj b/Redis/testsuite/TestSuite_x64_vs90.vcproj index 1b6b7c339..945bf9b8e 100644 --- a/Redis/testsuite/TestSuite_x64_vs90.vcproj +++ b/Redis/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Net\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Net\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/SevenZip/SevenZip_CE_vs90.vcproj b/SevenZip/SevenZip_CE_vs90.vcproj index 19c94c790..aaeacf54a 100644 --- a/SevenZip/SevenZip_CE_vs90.vcproj +++ b/SevenZip/SevenZip_CE_vs90.vcproj @@ -56,7 +56,7 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - Util - {6FF56CDB-787A-4714-A28C-919003F9FA6C} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoUtild - PocoUtilmdd - PocoUtilmtd - PocoUtil - PocoUtilmd - PocoUtilmt - - - ..\bin\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoUtild.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoUtild.pdb - - - ..\lib\$(Platform)\PocoUtild.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoUtil.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoUtil.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoUtilmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoUtilmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmd.lib - - - @@ -290,6 +34,29 @@ + + Util + {6FF56CDB-787A-4714-A28C-919003F9FA6C} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoUtild + PocoUtilmdd + PocoUtilmtd + PocoUtil + PocoUtilmd + PocoUtilmt + + @@ -323,14 +90,7 @@ - - true - true - true - true - true - true - + diff --git a/Util/Util_WEC2013_vs110.vcxproj.filters b/Util/Util_WEC2013_vs110.vcxproj.filters index f80618347..3fdbfe2b6 100644 --- a/Util/Util_WEC2013_vs110.vcxproj.filters +++ b/Util/Util_WEC2013_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {d75458a3-29ce-4149-a2cb-6fd40d9f6f74} + {fac414a4-35fd-476a-9273-535afabcd5ec} - {312f9873-9d3a-4b43-9a0e-97dea94c8024} + {ced563d3-47c6-4cb4-8843-c61f9a5995d8} - {b48e42a1-c677-4738-bf0e-91127b134571} + {5b8cd19c-1b63-442c-b9cf-b664e65db7c8} - {fc425bd2-97c9-4118-b40c-e31ce3f1998a} + {52c78bf3-91e5-44ae-9473-63d89ce08b79} - {e9beefc0-2e8f-4751-bc04-51462c968bda} + {733886ef-c91f-49d1-b5b9-bc31b1c174cc} - {1d6870eb-cce8-41e1-b7a1-41ee121fe960} + {70a5ae5e-0525-4438-b7fa-a6d3428312d4} - {f36175d3-626c-4d2f-a683-70506adeefe9} + {0d66743c-c7d9-43fe-ae7d-3aed2b66ce1e} - {7c78bc08-cdc3-481e-9252-68d38b2071c9} + {aca62d80-99e7-483d-9545-2fa7fca60970} - {04a45e1e-b478-424a-aab0-d92632e7d919} + {62cb8333-63f6-48d0-b4c0-4b81d16cad50} - {7283c2b5-5c34-41ce-b23f-7b3fb6604f8c} + {235edd0a-22f3-4914-8148-7f5ff9c9248c} - {9ded7abb-a4ef-4552-adf6-0e23268e9202} + {14fa2d19-23cf-4e3d-ae49-031b479d0454} - {dac1f0d9-1050-42b8-836d-22a0b4649cba} + {f4918e78-3bf0-488d-aa6f-a8ba7daa426c} - {f6a48a75-c4ff-4594-b791-200efb9f0981} + {cba919b7-8d56-4975-912b-f4a78757b7d7} - {222ca238-1470-48d9-a113-83398ef5be85} + {e678101a-2f42-4144-b1f2-d1baa1d94a7d} - {6d0a6d5c-0866-43e6-80bc-8f63ebc78d5d} + {b9ae4857-2b99-4d0c-9b7e-c46888807691} - {395c31a7-5b95-497e-b5a6-79f6812f5f4a} + {1c7ba7b2-a88d-43e3-b5dd-ab49808ca000} - {57e73b30-bee2-4058-82eb-0799880bfe1a} + {cdbfa108-5d8d-48a8-b3ac-d8570fa56ffd} - {37bc0a13-7688-413a-b6d8-493f50050ec3} + {ee88b0e9-cd7f-41a8-9938-132a5bd302ae} diff --git a/Util/Util_WEC2013_vs120.vcxproj b/Util/Util_WEC2013_vs120.vcxproj index b71004b1a..5e79fe58f 100644 --- a/Util/Util_WEC2013_vs120.vcxproj +++ b/Util/Util_WEC2013_vs120.vcxproj @@ -1,262 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - Util - {6FF56CDB-787A-4714-A28C-919003F9FA6C} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoUtild - PocoUtilmdd - PocoUtilmtd - PocoUtil - PocoUtilmd - PocoUtilmt - - - ..\bin\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Util\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoUtild.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoUtild.pdb - - - ..\lib\$(Platform)\PocoUtild.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Util_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoUtil.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoUtil.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoUtilmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmt.lib - - - - - Disabled - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoUtilmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;..\XML\include;..\JSON\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoUtilmd.lib - - - @@ -290,6 +34,29 @@ + + Util + {6FF56CDB-787A-4714-A28C-919003F9FA6C} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoUtild + PocoUtilmdd + PocoUtilmtd + PocoUtil + PocoUtilmd + PocoUtilmt + + @@ -323,14 +90,7 @@ - - true - true - true - true - true - true - + diff --git a/Util/Util_WEC2013_vs120.vcxproj.filters b/Util/Util_WEC2013_vs120.vcxproj.filters index dbc16296c..e17361163 100644 --- a/Util/Util_WEC2013_vs120.vcxproj.filters +++ b/Util/Util_WEC2013_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {74ce9a28-4f52-44cf-b380-71714fc4603a} + {18187faa-7823-4f58-8086-18fa15b54319} - {c7fee743-8aa5-41aa-a870-feb6ff84f4f6} + {61feeda3-4886-4496-bc05-df931def5a5b} - {ee05a4c6-1dce-4d8c-bc9e-f8f0235e101c} + {967c93d8-b023-4013-a593-91df3fb6826f} - {f958ca67-f2d9-4e7f-922b-f9b60ff70b9e} + {efe971f2-f65d-41da-9b4d-74631426d1db} - {f5076adf-2c24-4b79-a420-681bb5169356} + {4faa19c1-68f5-4c59-970a-bf3d289e09e6} - {ca4f7d6c-d76f-444c-8557-2de120e4c374} + {263f0496-bd7a-4ea9-b605-510ac994cde5} - {670015cb-d851-4b53-aac7-30556c82946c} + {ee9d0615-62dd-4ff5-a638-0f3f2ff13e36} - {fb54d165-3871-46bc-9fec-fd3f79b78772} + {957853e5-bbd3-49de-9b7d-901bdbbcaa5a} - {b7bd428b-063d-46f8-81c6-3270822ccd96} + {7d6cde4f-0710-4e67-a1d3-2f4658a7eef9} - {82c1e51a-e4e3-4d68-a9e3-88388b900ae5} + {fa39de8c-6601-42ef-9108-e6432813ff11} - {c1d99bd1-50bd-4c3c-ae85-86d58c80d39b} + {9c5df186-d542-4525-af98-edf260b39418} - {47b7d5aa-596f-4734-9f50-79a2316a5b00} + {c852213f-b3c9-4cf9-b96f-a825d00d131c} - {3885c8a4-7be4-4ebb-b777-b44c4ef3df10} + {20004264-1c63-482b-ad07-2617ad763eac} - {125be3b0-d91d-42ef-a552-3d88eafc7555} + {de2cb63e-2331-464f-a639-e32d0eba80d1} - {b4db4e4f-57a3-4bae-a462-aa37a5b438c8} + {49a0439c-d961-4586-9434-c6e87a45f6cb} - {6194f784-b305-4d8a-a99c-7af7634538f2} + {97312381-c8e2-47ea-806b-a8a4d578d405} - {9f8110da-d33a-4525-bb36-2241aa2cbd15} + {950c314c-935b-463a-8a94-29d0158c3ee4} - {900b1762-657a-48a0-bfa7-48ea53f0ad74} + {c6766904-8106-4aea-b204-e06b7651db60} diff --git a/Util/Util_vs100.vcxproj.filters b/Util/Util_vs100.vcxproj.filters index b927c3e5f..e12bbaeaf 100644 --- a/Util/Util_vs100.vcxproj.filters +++ b/Util/Util_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {7648f359-5fa6-4fa4-a2a9-c87107b0e566} + {9661e43a-b3ca-4d8d-8461-291e8509e38a} - {efbc842a-6207-4b78-88a3-96e2ff053462} + {c39fe98f-c8ac-409b-b382-d3831397c6e2} - {2ce64efb-66a6-48d8-bd38-d0c2c97b77f4} + {6709fcd9-12bd-47fe-9cbe-20f33fa496d1} - {fc2f1853-4f0e-4229-b701-41647a529cad} + {cc89fa8c-a77e-42d2-bf0f-2e845b4df149} - {df0f04ae-5d80-4780-b6f6-c1eb8835067d} + {4a2fc783-e4a2-4ff6-8f0c-6a506656faaf} - {9c95cf99-be0c-48bc-8286-d0d94cf1e6ff} + {27ca55c6-4839-411c-8a11-c7bae4248dbc} - {2c1c1c63-6651-44aa-af64-64234739213b} + {112ed58f-cb70-4fbe-b73a-9955fa066384} - {f613ea7c-27c8-4fa3-ac38-37daa738fc73} + {c21f368e-a27e-4d86-a28a-0a7c18f6a4a6} - {3bd251d8-ef83-411e-9fa9-3e3cb832af4c} + {226e2174-a131-4c3d-ad70-94dca4eea6c0} - {69d121a0-7188-4406-a80a-66ff4b66dac1} + {8670ae11-5b87-4d8c-b70b-92cf33674f9d} - {4ee3b7ab-aa2c-4b52-a639-8adfeff4a592} + {9f9f3b12-825a-4bbd-b1cd-70e8915d757e} - {2736c80b-2b3a-4251-8b23-bcc783b40bce} + {857d9f65-4579-4e9f-ade2-191425bf2f04} - {5433adbc-ef91-4cd2-90e4-fb51ac549b6a} + {d34c7e39-a8b6-48b2-8ad4-383c6aabce9d} - {5e8f9140-880c-4a3e-9100-e9c1681249a4} + {e67a634d-c0e4-4aa2-bc22-2137f5d00f9d} - {1bd67029-3865-4402-b9b6-98848bd207ea} + {35a15693-4eac-40a0-b865-eaf333f329c2} - {6e261ad4-9b17-45dc-a169-12c5e66c123d} + {763c576d-d92a-41b6-8b2c-febde1a0ae34} - {976135e5-ba97-4ab9-a640-e3335b5f7a82} + {5216805a-851d-4791-8195-20cf23ebe7f1} - {01907fb1-5a38-4211-a9da-b48ca90e1b66} + {03961563-12a8-4f1d-ab02-a259660816c9} diff --git a/Util/Util_vs110.vcxproj b/Util/Util_vs110.vcxproj index 18c6cf552..1d9c114ab 100644 --- a/Util/Util_vs110.vcxproj +++ b/Util/Util_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoUtild PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_vs110.vcxproj.filters b/Util/Util_vs110.vcxproj.filters index c2f57620f..b616782a7 100644 --- a/Util/Util_vs110.vcxproj.filters +++ b/Util/Util_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {9781fde0-50c2-49a4-98db-061e144c050c} + {e4fc22be-4c3e-4cd5-91ac-36f3148473c1} - {acd5175c-2d19-4e90-89bc-d485f211e1e7} + {737c51b7-217e-486a-b891-5c6375b025bf} - {cfce9e37-896b-4300-b363-3a01ec634bd6} + {0b3709b9-dee0-414d-a3de-ff417ec1843b} - {41b11d82-7025-48c3-8aeb-7d251ded5331} + {7c2fc2fa-844e-492d-8ee8-761ad18488a8} - {82a44c0c-30b5-4b08-8dba-82a2d50717d3} + {a9bcebd4-2ada-4216-8e79-da36b537cab6} - {382d77f6-ce27-4825-972e-a9e24904faf7} + {89ef3bec-1db2-4fcf-bb14-eed2c580b18d} - {c22970d5-86db-4f53-823f-8a632391574d} + {8efb3c1c-d58e-47e8-ad07-d7ee734e49d2} - {dc2d3f66-8923-4198-b77f-2fe37099d005} + {f2614c20-8429-4840-bdc1-39286d0d2352} - {cfbb0844-a8a4-4a9c-8938-7415c37c025d} + {306d351d-f443-44fb-8962-29cc39e0b591} - {7f4fe2b1-09ea-4f4c-b2db-f8eb78209a75} + {cbd4b9d0-9593-412b-aa4f-edccaa530fa4} - {ade4163b-f2b9-444f-9d37-a0abb86064b2} + {7c41c81b-9ba5-44d2-ad16-7ab21ff7df66} - {000e3882-352a-47f9-897d-b8e16de09d4e} + {8696e6be-c9c3-4499-a891-4e3b6599c133} - {8463e7e2-9bdd-42d2-ad6c-9895b38e39c0} + {5464bb0f-0dd9-4ec9-96a1-cc3fdcdb238b} - {6cbc5687-0cef-4a29-9bf9-9b5c7012200b} + {ef487063-daf0-432f-973c-cd17df45688e} - {85c0b24e-71ad-4687-8435-5bee46ce2e5f} + {064dfd05-08dc-42e9-8098-6b1c4de74d29} - {5c789fcd-86f7-46e1-8b23-84d1b81e2112} + {7e3b8428-f341-49d0-928f-d89be59b8b01} - {42cdd3f4-f632-4c81-b974-9d9782f5a00e} + {05a7c8c6-7452-46a9-b1da-f53c394dc868} - {67df95d5-f3ae-48eb-91d5-122ec8a6b24c} + {658cc724-0bfa-4133-b1b5-bdcbbddbb61d} diff --git a/Util/Util_vs120.vcxproj.filters b/Util/Util_vs120.vcxproj.filters index acfb1aadf..1779f6356 100644 --- a/Util/Util_vs120.vcxproj.filters +++ b/Util/Util_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {c2925e63-633e-4761-834b-3d7a964ff069} + {74792b5b-80be-4ffd-9ea6-7c0a42050d9f} - {582d0750-7e0c-496c-bf91-f9629e618df8} + {6ad079d9-74cd-4cb1-8e2e-a1e53f884888} - {b03eb44a-0dcb-4737-8285-137939487a5e} + {c7bb5a47-ae9a-4ab5-8c68-f438acec99ec} - {ecdf8059-95a9-475f-9df3-1292439a351e} + {b2e5ced7-c417-47a0-a5f9-60af24f64872} - {d634f5de-3375-44b4-a341-e5bfeb4cece6} + {8494492a-dcfb-4c35-a7c4-3fce74b8f673} - {6ababf51-51c6-4171-9180-5c65e1378380} + {d7e01937-0d7e-4a84-a075-1d319796c3e1} - {fd875fd4-410d-4175-9ea3-daed4baaccfa} + {a4b50747-ba78-472a-8469-8afc406ad292} - {b176f503-c7e7-4476-ad6d-270cc26a1f5f} + {56b4d931-1076-4b62-b945-53d431019427} - {7364e84e-b769-4c48-9b39-9435b8570f95} + {477b23cf-c024-436f-8cec-9d3f0359598f} - {17223628-3cc7-44bb-858d-672e7dd081b9} + {1cc5decf-092c-4c88-9805-5e9560c7fea9} - {752c3531-bc18-4fe4-af74-664156be8bc1} + {93e63a6e-2301-4c19-bd04-1688bca1a72e} - {26c40c20-2600-4b20-bb41-15007f83a0ee} + {76681a28-b663-413a-a093-3300f65b27a8} - {55019e1a-c07e-41a5-8785-af5ee581f636} + {03a06149-4ac8-40c9-a3d8-85ecfbf4d427} - {0004c7f9-277b-4235-9470-b84432a60ddb} + {3297b1f8-38b5-4205-8aef-808cb2f87325} - {460994db-d65f-4061-9fb0-dc50157be4c6} + {8edd3d27-93f0-4899-b2b2-5fcfa63a9778} - {709a251a-73cc-434f-aabe-c896ff0e1d5d} + {2a531f86-e273-4742-b2e7-b10d3843e733} - {eed860d0-a153-4308-affb-d82b584432df} + {80602cc8-826e-4752-b7d8-3ca3bc56a0c0} - {b13d1678-3afb-4039-8c6a-cae9608b89c5} + {c22c3758-d190-47a6-aff6-2215afbe1b4d} diff --git a/Util/Util_vs140.vcxproj b/Util/Util_vs140.vcxproj index f26cbf891..58698e0c8 100644 --- a/Util/Util_vs140.vcxproj +++ b/Util/Util_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoUtild PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_vs140.vcxproj.filters b/Util/Util_vs140.vcxproj.filters index ef3b9b682..b9ff89609 100644 --- a/Util/Util_vs140.vcxproj.filters +++ b/Util/Util_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {6a3ca919-87dc-4ab4-ac98-5110e50482e8} + {85cd007d-db8b-46ab-95bc-49dd48c99e0a} - {caa3bcda-f6af-4fd0-bf73-300c6ab43e85} + {59d427d8-5fdc-4bd7-813c-7e5d9bb87399} - {ea48930a-3179-492a-a80f-9c20d7cb30c9} + {388f81c0-6610-4ec3-9d6c-0495a8d5bc9b} - {2fe20820-0bd5-4a8a-b3d8-69286c6081c2} + {e178cf93-3656-4c80-8cc2-d825961e8ac7} - {443225ee-6344-44db-a3cb-3ff99853612e} + {01683869-b03c-4231-926c-c0af26abc4ae} - {77e6bc04-da71-4765-8839-715d16380d41} + {3e4618f1-c4b6-4fd5-a072-53b3afe3bb96} - {a10c8672-a7e5-4765-8c95-b88fbc5d44e8} + {035f5e30-8e7b-4b99-9511-ed2342780519} - {cc093bb9-2efb-42a5-a2b4-78e901bec923} + {8d5384ce-0bc9-4485-abcc-10c76a1f671d} - {8d01e9d9-2895-4263-8e87-36fe5ca5fa61} + {bcbc3dd2-5d5c-449f-961b-3b3fac98b13b} - {c9e18220-d6a6-4684-a1ad-0e3521ad45cf} + {50271a87-ff12-4034-bade-67aec418824f} - {48617cff-ed86-4552-98de-50d4ffd8443e} + {bc96a551-3d1e-4052-ab52-6bf98e6d18da} - {b3f1a0bb-610b-4ddd-9cd8-142f08827ff5} + {b6b0f07b-8cea-4143-b899-0de1427cb37b} - {0511c5bc-8668-4b2b-b603-a23635d770b0} + {5059f955-49df-40bb-8f6b-4f3c8cac6642} - {cfd04e55-8b77-4c40-b687-c1c71c21ad33} + {717cdcd2-2136-460c-8b20-d21e501b8ca6} - {8b49b87c-9d14-4165-aa9f-2a83a73d340c} + {68ea5a0c-92ac-4ed0-b259-b1b473a9a36e} - {0840cb2b-b252-4553-841e-ef50eed5e32c} + {90476503-63c0-4488-aab6-b4ca1b0e4cd2} - {7c991a8f-3a87-4bd2-a481-89e7ebda50d8} + {600ffe18-713b-4ca3-9636-d5166bbcd204} - {47ab0047-adcd-4914-82d4-a0f3fbc31bfc} + {dcb28c26-9df3-4827-a4c0-770d8a98ba05} diff --git a/Util/Util_vs150.vcxproj b/Util/Util_vs150.vcxproj index 846f03774..ec8357427 100644 --- a/Util/Util_vs150.vcxproj +++ b/Util/Util_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoUtild PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_vs150.vcxproj.filters b/Util/Util_vs150.vcxproj.filters index ef3b9b682..e323bdcbf 100644 --- a/Util/Util_vs150.vcxproj.filters +++ b/Util/Util_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {6a3ca919-87dc-4ab4-ac98-5110e50482e8} + {e882df7a-b4bc-4af2-b55b-481b9593f3e8} - {caa3bcda-f6af-4fd0-bf73-300c6ab43e85} + {c027f63c-1747-4b7d-a68b-3802d8c0ffaf} - {ea48930a-3179-492a-a80f-9c20d7cb30c9} + {4fb5610f-5b0e-4c77-9459-f762b77c32a3} - {2fe20820-0bd5-4a8a-b3d8-69286c6081c2} + {c3a06799-2b63-475d-a102-a5e5357eb433} - {443225ee-6344-44db-a3cb-3ff99853612e} + {18ac4042-ac7e-407d-87a1-2231c92ceed2} - {77e6bc04-da71-4765-8839-715d16380d41} + {2d23a6ab-08af-4e04-9756-47890d477276} - {a10c8672-a7e5-4765-8c95-b88fbc5d44e8} + {31ff1843-d998-47a6-bbeb-ceeb1e6315a0} - {cc093bb9-2efb-42a5-a2b4-78e901bec923} + {08f0731a-d891-4ecd-b648-2e4d24b79e26} - {8d01e9d9-2895-4263-8e87-36fe5ca5fa61} + {4a1997c7-348d-4981-8000-3b880c2808b4} - {c9e18220-d6a6-4684-a1ad-0e3521ad45cf} + {594f77a8-c373-4ccb-99ae-5aa2beb0d71f} - {48617cff-ed86-4552-98de-50d4ffd8443e} + {b6e35f19-a15d-45f0-9524-5963088dc0c9} - {b3f1a0bb-610b-4ddd-9cd8-142f08827ff5} + {0eb8e855-d1f3-4982-bbb4-d1d53d06a410} - {0511c5bc-8668-4b2b-b603-a23635d770b0} + {5fb78f23-aa07-43a6-841d-b2b8bc5c754f} - {cfd04e55-8b77-4c40-b687-c1c71c21ad33} + {a838f661-9ea4-4eec-b625-e8f2ff9a8027} - {8b49b87c-9d14-4165-aa9f-2a83a73d340c} + {257ac9fa-00e9-4760-a473-3b8585b3a964} - {0840cb2b-b252-4553-841e-ef50eed5e32c} + {7d71b6e4-053f-490e-9388-84c5975f4286} - {7c991a8f-3a87-4bd2-a481-89e7ebda50d8} + {b0b76425-60b4-4b89-8acc-0a35369ffbd7} - {47ab0047-adcd-4914-82d4-a0f3fbc31bfc} + {3ad90d4d-f822-46d0-8d52-3c207fbd8ace} diff --git a/Util/Util_x64_vs100.vcxproj.filters b/Util/Util_x64_vs100.vcxproj.filters index 07dc8fbd0..11eaeb504 100644 --- a/Util/Util_x64_vs100.vcxproj.filters +++ b/Util/Util_x64_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {cba2c122-2de8-4e1c-a2d5-a35210ce503f} + {a31f0885-63d3-4120-98a6-82e4a820a4f0} - {0fdc3bfc-b4c4-4fd8-a095-e07243534bba} + {40fd97ca-8527-4103-a463-1308d8b77e38} - {1c4ae41b-73a5-4315-b919-9d63dd423f89} + {ab545767-bb5e-44d6-866b-47109d5587da} - {7e55793d-aadf-41d3-8585-0c8ff398ffc9} + {aeaafa5a-2224-499c-bb7b-01488a4b398e} - {1cdf0abb-89b6-4918-84c9-4d2f975102ac} + {51b83d14-e715-44fa-9632-929653e8ace0} - {aad162de-c7d1-4b25-8c6c-c138b98e0f1a} + {21ac4aa5-12e4-4610-8680-9a9363d9b4ed} - {1aa2b8c8-795b-4506-8c67-23298944a128} + {b28917f7-0ac5-4f08-b420-bc8e93e5b22a} - {1596dabc-66bf-4c7e-bf28-1c72b6b8b63e} + {1fd2b561-0e72-4c61-ad41-6bc10e80fa55} - {6b062507-7dcc-4da2-96a4-366a2451cf71} + {6a0bc0c8-658a-49cc-bcb4-6081780ee825} - {1d6b96cb-2832-4e23-8110-bdd33d7dfd14} + {18a5d39d-32a4-436b-ad63-151a39121b87} - {b407bd73-8510-4e5b-8054-7fe16b30a9da} + {0f403bca-7666-41fd-a997-0a1c4ade641c} - {33fc7375-d45f-41af-ba2b-4ed19805cfed} + {e42ee3b9-94b2-4129-ad00-2859ae393b19} - {9c37239e-f703-4d2e-a0c6-c40c00731cea} + {49e0b21d-fd36-4856-ac93-751c1f424794} - {707c69e8-2d0c-4935-9446-734f1722e60b} + {4a419cdf-1f6d-427f-ac58-0bd9d56387a5} - {eb8eb838-1de1-4e5b-97fd-d4501b361948} + {5c14087b-59e0-4f95-95d6-a0e3baeecea3} - {00a3085e-beaa-4aca-964b-dbb6ebd17c9f} + {e0eb33a8-1f17-49d1-8be5-8474f0b9556d} - {4558eb2d-3ae5-4b5f-bf13-d83740f472b0} + {6cf04869-6261-44ce-8622-2fd94291f9ab} - {1d218f0d-2b36-48c7-ad9f-787b125acb79} + {c6e73896-ea6d-4eae-86ba-8ba31e47f09a} diff --git a/Util/Util_x64_vs110.vcxproj b/Util/Util_x64_vs110.vcxproj index b10753bae..2bb8d1076 100644 --- a/Util/Util_x64_vs110.vcxproj +++ b/Util/Util_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoUtil64d PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_x64_vs110.vcxproj.filters b/Util/Util_x64_vs110.vcxproj.filters index 6d845e0f6..03c37dbc9 100644 --- a/Util/Util_x64_vs110.vcxproj.filters +++ b/Util/Util_x64_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {10d783a5-21e8-4e13-8112-1480f0e91040} + {856075ed-ae32-499a-ae87-83cdf39fdcf7} - {53b7b63b-656d-41c7-b041-89defb948a9c} + {e1dfa7eb-7c97-4e6d-b945-30ce48d2e640} - {39e23174-9aba-43e6-bc3d-e9e85406837c} + {80b372f6-9dd0-414c-b54b-d1af818c104a} - {8b99756e-bd78-41e4-87ea-fede6819ef36} + {cf797ca4-d037-4344-ba55-5c08e515e0f5} - {05507fc0-e439-42e6-8f39-6a17965aaa87} + {7358d8e1-7f24-4ad7-8314-831c253780fe} - {056c8393-2e85-44a7-9014-d1fc545fecc9} + {d514bbd0-3aa5-4876-9182-af215954be90} - {b195280a-48ab-4f4b-907c-bd6cee5bb98c} + {2748a489-1649-43a6-a8d9-35c62bd5770c} - {fa2c0bbc-554e-46e9-baa7-5ca2f8a17d40} + {34cd1792-db52-4993-883d-4dbdd81bbce3} - {ac5125b4-1b80-40c5-bc36-51684ff95284} + {107fdcd7-de65-4378-bc25-273825764d2e} - {80e57083-7d24-47b1-8442-5bd50f339d8a} + {8e38f748-f561-423a-95ae-8f8a46023ec0} - {e3438053-9797-46a6-8a4a-6bfb8e70efea} + {83c6f68a-27a2-4383-873a-7d93e67d5ebe} - {e95e3aa1-5e06-414b-85cf-901399331797} + {1595069c-8bcf-4bcd-b511-20415fd9166e} - {efaf5d31-2950-4c9c-bc3c-72c5793bc317} + {927a82e7-6fc2-4658-b1f7-bc1e821114d3} - {1e49be51-aa5a-4120-a425-c8da9543e702} + {313d9300-d769-4700-8b07-631f2138a418} - {f38ca7a1-e865-4368-97e8-097a0f619984} + {22355f37-bf92-46c8-8832-976a744d82dc} - {38cd7502-ef53-490b-84d8-9656dfcf0ed8} + {670e749d-8738-4509-8d44-48191e35716a} - {714e7ac6-0b70-4b7f-b084-5e42a42c3663} + {2bda2b64-d739-44c3-8735-8d3f02a24263} - {f487a09b-2a8b-4091-b460-e5eeb8948a72} + {a04f85b6-c179-4df5-8f44-c2046595d555} diff --git a/Util/Util_x64_vs120.vcxproj.filters b/Util/Util_x64_vs120.vcxproj.filters index f6b420577..910ddddd3 100644 --- a/Util/Util_x64_vs120.vcxproj.filters +++ b/Util/Util_x64_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {6fe495d6-6694-4e04-b29f-0f6a4468d51a} + {48b79864-41c5-45c4-9d9d-b2e3a431ce7e} - {e8fdfb49-ef03-45a2-aaad-98af7a2b7d90} + {1b4b3fa5-6d9c-4bf1-87b3-32c8d48ca3c6} - {443d71cd-5b65-438b-b64e-af05c4084f14} + {73da0c12-ea21-4270-bb2a-882869158048} - {dd018b98-a984-404b-aad2-c2c3194ae35d} + {c33a712a-ac45-45ae-bff8-36177d8d2c1f} - {be49342f-9e0f-4152-a20f-e761102cbad8} + {91ecc277-8364-4497-a992-7d2649586e1e} - {f6a098eb-c03a-4202-bab7-d3154a5b2044} + {7f529cea-ff44-4358-a7d8-096bfca37cea} - {3b198407-25af-4583-8554-83f38fc7aabf} + {3f97cc81-7127-4ce4-bfeb-63f25cb9a48d} - {c4c57263-f8ff-4afe-8ef2-6284b85974f9} + {16e93e05-8c3f-4fc7-87ae-39a983f9eb04} - {b0e7d4ed-0178-4f7d-b992-bb3874722d9d} + {5ab021e1-8ed3-46ae-9728-8da6df0a7a34} - {9cc51694-315e-4d20-b467-6a93bdbc7100} + {f0928556-3b0f-40f4-b32f-c37e4701fbbd} - {8273648f-e432-4224-982e-bcd5ee94beec} + {6fd76e33-536b-4bbf-9d94-e0895e882b44} - {8284299d-f9a0-4b1c-abe6-6797769dca65} + {bd7df05e-dc9a-427e-8519-e9a675818ab0} - {d80019a5-58cf-4b74-87a9-207901f5ff50} + {8216aecf-b29e-4429-af13-ad9789f303da} - {01cd2232-f62c-463e-b6af-271a8dd50adf} + {d9f7fe80-28a5-44b6-889a-932dcea15022} - {5b01c67f-7b84-4c43-bbee-478061c31dc0} + {e6afeeeb-184d-41dc-b7a9-e71db044f07c} - {4410863a-7dab-498b-84e2-12860c663f1b} + {5e5edd41-45ec-4d9e-a539-f01876f3d119} - {487eb310-c2ba-444c-b200-42191a9d75cf} + {7789e8cd-e648-4f3d-8b58-7073e5808538} - {49d5c28b-8175-49f3-a631-839d50baebd4} + {262f2183-72bb-4dd6-8de7-6b83b5f4b1d9} diff --git a/Util/Util_x64_vs140.vcxproj b/Util/Util_x64_vs140.vcxproj index 014ca7537..2b4a69fcd 100644 --- a/Util/Util_x64_vs140.vcxproj +++ b/Util/Util_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoUtil64d PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_x64_vs140.vcxproj.filters b/Util/Util_x64_vs140.vcxproj.filters index f405fca48..a0c9cc2cb 100644 --- a/Util/Util_x64_vs140.vcxproj.filters +++ b/Util/Util_x64_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {5f7d79cf-bcdd-4b9d-8169-d96a955db888} + {6509a9e1-aacd-4d20-b011-6044f2e5bb9d} - {aa9a23f6-96ee-497a-b821-b00a5d2a7974} + {70a88050-6fda-4d0a-bbb8-223947a62d8c} - {04a9b332-df2a-4420-a8dc-228276427389} + {56f5b3a9-5652-4996-a9f9-2b5996bd87ae} - {0df6ebf9-27ff-4338-9cc9-cc4f238474da} + {7f25dcea-2777-4da8-88a7-291078b1c29e} - {e06a44cf-41b1-40f2-a2fe-5f04c687cd1f} + {d3a814c5-a52f-4dc6-ace0-f70f706def78} - {842fe15a-4dca-4eec-854b-d0384812b4ac} + {0745eb1e-defa-41c7-9fe5-050950fadfbd} - {9eaf1491-62ec-4d41-9d73-93acc1cabc22} + {908893de-710b-4230-8f9b-ee113aecf0dd} - {6d343a44-ecd1-4f09-aaa1-b42a8b420bc3} + {e1211aa9-28c9-4b0f-adec-eaa6993c0b83} - {25dd3a6e-3318-4e5e-b778-9b8fc34a5ed8} + {95b2c3b4-9b6b-4902-ae44-a4a3070dea45} - {cb1c097f-5ea4-4df2-b869-426a728da143} + {0411f9c9-7385-427c-8915-4d73d2878b66} - {6a2cd6ff-e059-49ec-a4e8-c7c130336c7a} + {209de9cf-9803-43e7-b498-8e3e889004f9} - {c2b330ac-e2fe-4470-a972-6f48646e6099} + {24c020bc-fc13-4094-a927-0ab67cfcf96f} - {24989fef-7968-4e19-a463-a0a4d34844a8} + {c8eeca25-a1ea-4288-8b6d-4e42105ea31e} - {c4d87919-e4f8-4b3b-9601-5d0229d25959} + {b7a68c2a-7e19-405d-a7db-0ce54404b65b} - {cb2000d7-3bbd-4a8e-8617-4974441c81be} + {ee79efb8-503f-4159-a2e8-5d007cecfadc} - {60502559-2d3f-453a-ab0b-61f19d869f82} + {451850ed-1030-4e9d-a8af-8187523460d8} - {5b884387-30fb-40e1-82a9-2a1b2f03c035} + {9cbbd807-345f-4413-85c9-581045aab7e5} - {b9ee12c3-b464-47a1-a96d-76ab8edf1da7} + {1641d9ee-a12b-4760-a1ae-87567a651ced} diff --git a/Util/Util_x64_vs150.vcxproj b/Util/Util_x64_vs150.vcxproj index 3df265899..7b3871852 100644 --- a/Util/Util_x64_vs150.vcxproj +++ b/Util/Util_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoUtil64d PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_x64_vs150.vcxproj.filters b/Util/Util_x64_vs150.vcxproj.filters index f405fca48..08e05d2ae 100644 --- a/Util/Util_x64_vs150.vcxproj.filters +++ b/Util/Util_x64_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {5f7d79cf-bcdd-4b9d-8169-d96a955db888} + {e361447e-5694-497b-8168-cc130bd20bc4} - {aa9a23f6-96ee-497a-b821-b00a5d2a7974} + {dbbe8ff9-6e7e-432c-b169-ab279276130f} - {04a9b332-df2a-4420-a8dc-228276427389} + {f736a23b-f529-45ba-90a8-b34b0d311e21} - {0df6ebf9-27ff-4338-9cc9-cc4f238474da} + {74f9d0eb-1584-4a2e-8309-d2d9eae1d04b} - {e06a44cf-41b1-40f2-a2fe-5f04c687cd1f} + {efd3f3a4-95ec-4451-8a50-c7d03d3e6fba} - {842fe15a-4dca-4eec-854b-d0384812b4ac} + {8558bd26-0ebf-4240-9cc1-eb00eac7a983} - {9eaf1491-62ec-4d41-9d73-93acc1cabc22} + {6379077b-07bc-47d1-96f8-b5669cc81462} - {6d343a44-ecd1-4f09-aaa1-b42a8b420bc3} + {0c7cec93-a4f8-4f78-a98d-d9842b68ca38} - {25dd3a6e-3318-4e5e-b778-9b8fc34a5ed8} + {824f6c7e-00f0-45ad-a772-dca0271eb0da} - {cb1c097f-5ea4-4df2-b869-426a728da143} + {a722255d-f2e7-4455-9e64-699a30b9d299} - {6a2cd6ff-e059-49ec-a4e8-c7c130336c7a} + {5cacdf0f-1f05-4550-a81c-d332e20fe4af} - {c2b330ac-e2fe-4470-a972-6f48646e6099} + {acf576d4-b833-461f-88c3-4064d364321b} - {24989fef-7968-4e19-a463-a0a4d34844a8} + {3aa97979-d703-4db6-8d5e-70e805da68a4} - {c4d87919-e4f8-4b3b-9601-5d0229d25959} + {665decb5-9033-4c77-8ce5-9d6a6c4fe8d8} - {cb2000d7-3bbd-4a8e-8617-4974441c81be} + {04b088d5-61eb-407b-877e-51a65cb66924} - {60502559-2d3f-453a-ab0b-61f19d869f82} + {2b7147b9-aeb4-443a-8888-c6ddf1d69f2f} - {5b884387-30fb-40e1-82a9-2a1b2f03c035} + {bebf559a-762a-46d2-bb44-59a8dcfba626} - {b9ee12c3-b464-47a1-a96d-76ab8edf1da7} + {6f9eb2e5-aa58-453c-89b8-8efb32efe710} diff --git a/Util/samples/Units/Units_CE_vs90.vcproj b/Util/samples/Units/Units_CE_vs90.vcproj index ef93ac8c1..24e3c0aed 100644 --- a/Util/samples/Units/Units_CE_vs90.vcproj +++ b/Util/samples/Units/Units_CE_vs90.vcproj @@ -57,7 +57,7 @@ + RelativePath=".\src\Driver.cpp"/> - + diff --git a/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 72a41bafe..acf35dce0 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {81786adf-1f60-49e4-a010-c710a6e37469} + {ea2075aa-7928-4776-ab5b-744683116074} - {c9c083bf-bd79-4817-afa3-36af20c12b65} + {0c491805-ba18-4a8d-bea4-680c7695026c} - {c20b368b-772e-4e09-80a2-e49704fc2010} + {967e6f79-686d-40ca-9070-53cfc308a6d9} - {43ffbaa7-a73d-4590-a355-d83b8a6eb736} + {ec7a1b70-8f27-455d-ac0e-06508e304977} - {04024b1e-7b49-43b8-9b34-b2ae8fde3a16} + {5fb35ca0-f4b6-46bb-8887-198b1cbd0fbb} - {544bf5e2-82a7-4482-9558-76e829bbbc4e} + {0281dd95-f165-426a-ac08-758dee0fff83} - {a543b857-40c2-4a40-99d0-1e0dbe01797e} + {9d886fd8-6673-4cc0-8da8-40bb1c6e4c78} - {dc0f4dfd-f258-4460-9a5d-13a833488f13} + {79f21502-eb1b-4a17-a4be-44e757089ae6} - {600aadc0-b38d-4642-9da2-2138e4f16673} + {ad0cbb4d-a811-4bba-b26c-74466232b004} - {0f3e3a18-8a81-4ef9-94af-a25af1c8717b} + {e506fb2c-c8a5-4b4e-af7d-24aecfd02134} - {3f79b609-7174-43f3-89f2-1e763fce164a} + {fb47b7f6-829c-4ece-b32f-1400bb071230} - {563c75f0-0bc7-451c-83df-c203f13c145f} + {4834659f-bd65-47c5-b763-c269cf032491} - {6351eee7-c21b-495a-9d9d-1b6a0fcbc2f9} + {fa2d9062-772d-4b8d-a057-98d8890fc7f3} - {2e815f6a-67af-4614-a95e-7ba06ab2362b} + {5cfc0d3f-57e1-4622-b1a0-3cb237717662} - {762d4f45-41da-46ef-a17e-a2ad2d86a8b9} + {7258079a-1cfc-4e90-bb57-7c61a5720610} - {f67f4c5d-2908-4328-b4e8-8e1a62199b6f} + {56d14bdf-05a9-4d39-bbe4-852e0cf1e638} - {86e39e8b-f22c-4087-84c7-ca479ab60201} + {d4f329e1-1aaa-4473-a8cd-a1ca4ff27ae7} - {31f083d0-0896-413d-a740-827ebffab5c3} + {89768c1e-1cb3-4c1f-adcc-08cf2a194e8f} - {76bd2ca1-9317-4f50-ac26-a1e81f70b4c8} + {2b11d970-5249-4f78-8b43-247287239a76} - {7c7bf482-c70e-484c-89e3-7c9ff6df8a7a} + {eb3c14e1-198b-4406-be5b-84091445c4fb} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj index 5e51c67da..00b1d3008 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -55,6 +55,7 @@ + @@ -72,7 +73,6 @@ - diff --git a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index bb7dad4d7..1dfc93fed 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {2d7d1413-64f0-4691-b4dc-5f63946eecb9} + {f3fb0411-b175-4b9f-8c45-a56ea86bb4ff} - {e3414431-0dfe-4294-873f-dd13fcaa9683} + {80a420e8-978b-48aa-b33c-29303cf59ce0} - {616c18aa-a282-48e8-8bcd-34a31e2bc2de} + {3280354f-cb54-4af9-93f3-0a0be7e8dcdb} - {e5ef77f3-50ae-4c74-af0b-7e1eb7133d43} + {079148f3-cd78-4645-9e7e-4020b7db6c60} - {3384b815-ac0d-41a2-946e-c1f2324ab4c2} + {0ecd46cd-06e1-4673-b219-eb040654c6f4} - {43f040b5-eb9c-47a3-a182-cded6399232b} + {eb1b31bc-a4f8-4275-bcea-b30a4ec97fd3} - {2f613e01-c0ab-4ef5-9491-2b0641d825fd} + {0ce33caa-3837-40fd-9075-a1928da8ffb4} - {223dbc25-7cd0-43f9-a607-2430c6d2a6c6} + {ad5313e8-ef58-455a-9688-0550d3fab823} - {af190de3-a649-4e91-bafd-f2aeada704ff} + {275d8969-0c70-4eab-90a7-365720d0c3e4} - {f9130b2b-1cbd-4a0f-86cc-36d40c6c939b} + {832a4050-097a-47c4-823c-f52858c30ded} - {48e7d0c4-dc0a-4d7f-b16b-9ff521aa42d5} + {00ee4058-6740-42e9-a9fd-c60294806213} - {0f0ef044-3098-4e17-b74e-03b1e5201ea0} + {8df95af5-2072-4200-b385-3e262fb7e7fa} - {cbb981fd-15a3-4476-b4d4-eaac3f39f723} + {0a79da72-ae6a-413e-86f2-6391c7e0a577} - {81cb7a9c-9967-48c2-ada7-76cc87e8a956} + {073dcea9-249f-4d76-94af-c0b299c2545a} - {f2d67da6-7e0c-42f0-9e66-2b4f423b1e41} + {3e97fabe-7d3d-4176-9c43-5ab8452b49de} - {ae71022d-1eaf-4b2b-9985-162920ea1472} + {d0f074f4-903a-437f-a39b-fd205a35e2ff} - {c51f5ffa-22b4-4cc5-b999-c4ba09058f7c} + {8ee08f45-abbd-440f-9513-f84856471f3f} - {bd7e357b-1b8a-4118-90a8-bfe1a7f32d41} + {68ee0e98-c367-4d0d-b36c-75585c1d5dd6} - {24472e68-58aa-4c33-b8e0-5eef0a97c00f} + {a10fec60-fca9-4001-ac43-6a74fd27d3f6} - {2e964c21-4c56-4baa-924b-394e85448223} + {ae69819d-087c-4ac6-8ab5-54776fc7cbd4} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_vs100.vcxproj b/Util/testsuite/TestSuite_vs100.vcxproj index 22488aa8d..829a175b3 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj +++ b/Util/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -340,7 +340,7 @@ - + diff --git a/Util/testsuite/TestSuite_vs100.vcxproj.filters b/Util/testsuite/TestSuite_vs100.vcxproj.filters index 427f3ba28..9f1409fa4 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {dc52bbcd-d538-4a5d-b2a4-bde77eaf2b08} + {c93d617f-e05f-414d-b166-311169fe6e32} - {ccee4fc0-917e-48ce-bc64-2b0407a3a9a7} + {1bbea3b6-3169-449f-b453-e9b9da7c02a1} - {16b63f35-01f8-4802-ba7d-08d6f8902e88} + {68a6721e-5815-439a-b8d2-9929450bf3bd} - {72b140b6-ae4f-4ad0-9e0b-dbc1dcd3dfcf} + {3ac210c3-970e-4891-8085-30e17ec8c48d} - {a1724ac4-e34b-454a-a25e-54c79bc8ac09} + {61834fbe-0c80-4392-bfc1-39b1e8d530a9} - {3f74df9f-5f4e-454f-84ed-37cf9c1cddc5} + {023f40c0-5255-4e84-b6cb-483cdb422ae8} - {a61d879a-4a52-4caa-a0fb-afa8f90d4b61} + {a358c808-69be-4756-85bc-11265484b7b0} - {b165769e-e91d-4a75-9374-5d0febeb8f2b} + {422bacc6-2e8b-428b-be31-fe70f1d422d8} - {eaf4e58f-d139-4135-abaf-f7b70a927789} + {7a270784-7732-47fe-9961-9784625e088e} - {893be962-8305-4cdd-8b37-3990c987d190} + {752c9223-802d-4790-8400-6c73b0780d62} - {0a9c358c-846d-408a-b24b-47b9d82c04e2} + {1e855c42-7c11-4d6c-910c-3b00afd04551} - {ad65a3e7-e2bb-4aeb-8bc6-847fef70be2c} + {d0ccdc3a-670f-4026-bc81-b92500a73f38} - {c1940094-df08-4b79-99fb-c0449887a33c} + {47c729ae-7219-44e8-b8b1-c814dea90b9a} - {227c0052-49d8-46e4-9263-375fb22d9320} + {23cb337d-f98d-4f7f-b64f-525ab0cf2556} - {af1b2b7d-0ceb-46b6-9c54-f003851ec47d} + {11d11d6c-9da5-4c52-af98-a1622f913e2c} - {fd7627c0-6ad9-49ae-801e-052bf91038e6} + {6e358071-2992-4e45-a04a-8af1c54e7bad} - {eb27540a-ef4f-484f-85b0-c83a93562db1} + {97391c74-b922-46c9-ba23-5381ae8c1fcd} - {fafddcad-8e6e-4ac0-85fd-12ef0f63b936} + {2f8655cc-f917-49ac-b428-fdeea4cd7e1d} - {ed1921d3-e8c1-4aec-99f8-af53e473a3a7} + {0591d0b2-dae3-4ec5-a5d0-500dd51a7d51} - {ce1c4773-d17e-4f3a-a042-054c61504172} + {211e3c88-37ca-4096-bf71-baac7c947902} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_vs110.vcxproj b/Util/testsuite/TestSuite_vs110.vcxproj index 7f315ec94..97a5ffcca 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj +++ b/Util/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -340,7 +334,7 @@ - + diff --git a/Util/testsuite/TestSuite_vs110.vcxproj.filters b/Util/testsuite/TestSuite_vs110.vcxproj.filters index 786bb7050..b4a101d4c 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {21fb368e-7c6f-44ac-ae6e-ed94b294f92f} + {e4a80f13-49c3-4bfd-b075-1d88fd645d0a} - {27f655cb-aa4d-43d5-89eb-156106345874} + {1b5daae0-9bcb-4a23-9326-afe736bca556} - {14f50ce9-bd98-4f66-9f74-7a644795c6eb} + {45ca820e-30b4-4367-8cf9-eb1549d2e99c} - {67869b3e-11f5-43f5-bd1f-35a0777a4bf9} + {1083532b-698b-4b87-bb02-cd1b7d47f273} - {0ba5fa60-1c66-4b19-b890-08ba4ba1c850} + {e010150a-df3a-4084-ae94-d7a5b63e3c8f} - {4526f817-8836-499e-a6d5-b4f9328adc2f} + {792babe9-6189-4402-b730-458407a207fb} - {5b081259-0635-483a-a488-ba51ce6c1177} + {56307e02-1740-406c-9e7a-48ceb77c4670} - {6048656d-5a86-48a2-9012-26fef7b230ba} + {cc039a3d-738d-4eec-9d33-fca4323987f6} - {99ba3576-d5ff-42d5-b3ef-ba873c4e4b42} + {1bbfed92-5409-4bc4-81bd-3ae94d7c4534} - {db5911e2-18d5-487f-8091-920a097c3721} + {5c213bfd-fba9-48de-ae65-78cf22a75435} - {2ac3aef3-80d1-499f-b844-2ea9e28b5fc3} + {a327b3da-f837-4bcd-b265-40a5bab1fa17} - {900a34a3-9b19-409c-b130-aaa528a12a43} + {c735cb2a-3f70-4336-89ad-7c881005fe64} - {8a2dffa5-e211-45d3-9971-952bdfb5db37} + {32b91793-e36c-4181-bd00-db08acdf348a} - {25d45449-525e-4ec5-bee9-53d79b7b2049} + {cd2f1964-b646-4684-b6de-a14f8f140f19} - {72147544-6ce9-42c9-84cc-88296ce96a0c} + {63a81bb2-0e65-4a1c-a9df-e560e156e8d2} - {43fff5f0-d142-4133-a9b3-ab4d1aa5c32c} + {d16d7ed1-2e5a-41e0-a162-64134ce09257} - {958f7e94-52cf-4d34-a7da-7f521e2461a0} + {afa5e740-52b3-4921-b662-46b283b29902} - {bd969f5d-28c6-4e9b-b5f7-863164d6b97f} + {385f0d91-f3ea-4232-a271-f5b3e31765d5} - {a32295ec-700d-4b2f-93b0-ca758dc088f4} + {d77a9ec2-1b8c-468b-9698-ccbd288cbd0c} - {9566db79-78c9-449f-87bf-3f8ef33a395c} + {b0dd303c-14ed-4f19-9814-d8047031ae7e} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_vs120.vcxproj b/Util/testsuite/TestSuite_vs120.vcxproj index 96a1c87f2..7d28f4062 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj +++ b/Util/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs120.vcxproj.filters b/Util/testsuite/TestSuite_vs120.vcxproj.filters index e27f075ef..322c9c3eb 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {66b62e46-2a97-458d-a2ee-0f051403a5e5} + {b04f9a8c-54b4-4cd2-8984-44f8a06e3a0b} - {4e497f17-94ac-4512-a5e4-b9a0d5fac1f4} + {f2167631-fbda-4552-b18e-9039ef9d93a4} - {5fd0c1cb-48d4-4edd-97f8-4d7512349a6d} + {638d4b5b-ff9f-44ec-985b-f2e14811b6dc} - {c79f34a2-a3a4-4805-afa5-1baa7a3fa392} + {aff96f4f-f218-4f46-919a-61825782e2f1} - {656d4c61-0598-40d6-ab48-99b39cf38ac9} + {c0891029-79f0-45da-8085-e5839693559b} - {f6905d08-5999-48ef-b795-e2955515a496} + {0ef7cb14-fe9d-4f1a-abf7-105e31410ee6} - {6c43b768-81ae-4281-8898-4d4b11720858} + {4065628e-ba85-4558-b156-313f5873570d} - {7db2602c-8cd6-44f1-a13f-541efb08aac6} + {a38b0bf0-dd35-47e3-a35b-3421ec88c116} - {061800d7-828a-4e37-9c65-45c358d57b2d} + {3762e073-19a0-4b30-89c9-33a43b7c3060} - {9bb820ac-786d-48fb-8c3d-5acf2c696408} + {e3ca5f93-7ecc-4a73-8adc-d69cdd824bca} - {e74c50df-97b3-475f-8f3c-01c75bb70464} + {1adf2e49-d6ca-40ea-af18-f42f4bcf8fcb} - {4f2b1a0d-c400-4a7d-802d-b7cf7c51fedc} + {d6a0c07f-10ff-45d5-8ff3-5f9b7a33d20e} - {82bcd25e-1f23-422d-ae13-720e8495375f} + {10cbb82a-3849-49d0-b61d-45e57da1dd90} - {32768b58-f972-4363-8962-342f37878284} + {7efa8a1f-bd9e-497d-8b6c-2348779c2569} - {ec23cad6-d88c-45d6-930b-5d69a000d7f3} + {e126efb5-731e-4e45-bc8a-f7b8ee24f9eb} - {e29b2661-11ec-42da-9f0a-71b38aed3a7b} + {90c661fe-d748-47c2-9dc1-ad613eb96812} - {1152485d-30c8-4b4b-9f7e-2f5a0c9d8661} + {550fca91-031c-4502-9ade-64fc531ef3ad} - {c427ab2b-436b-4f81-88e6-b87f5f0331fd} + {e0c45bc2-8bec-4ec9-bb79-a91fc12d5fa9} - {072fef14-8fc9-4d43-9a00-6f24a65f2616} + {2ca34814-80a8-478b-abdd-9c2501514192} - {efd23fda-b7b4-487d-91db-a9d4161acfc9} + {0ddc9b2d-8663-47fc-9003-ab3ccace2d67} diff --git a/Util/testsuite/TestSuite_vs140.vcxproj b/Util/testsuite/TestSuite_vs140.vcxproj index 890e8e84c..9c7c9b448 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj +++ b/Util/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs140.vcxproj.filters b/Util/testsuite/TestSuite_vs140.vcxproj.filters index 80c11550e..54a035ddb 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {f30296e7-c89b-4a50-877c-3fcb0b561412} + {ce6ea790-2aba-4ae7-8219-c8546911a257} - {17ceec89-c699-4df0-85a1-eaaf0b55da62} + {9a1a62bf-ab25-422e-bc5e-31a3783e6aa1} - {399b8e88-6da2-44cf-8155-7ff1bf2697d0} + {7b3f1e24-eef8-409d-902a-a6b407664f64} - {9aade098-dc77-41c3-9b50-1dc715c77e18} + {d64aff76-0f21-48db-b8d6-59bb0fdb81e2} - {6aa24610-b4a3-47c8-ba24-29c6172709d2} + {0d874774-b05d-421b-b9fc-3d5b8f226ab9} - {c78cdc92-b1ca-43f7-9d07-454da45d593d} + {fc4662fb-bbd5-48da-b5a1-58713ed5aec8} - {862c7407-43f6-4b65-ab55-45c2960293bd} + {76926124-c266-456c-a794-beb512e1e097} - {b604e9a6-9001-4b14-bb91-5072bfa7e9a7} + {3fa42b86-9e4a-4309-bcc8-461b467b4775} - {26a538fc-a3a1-466b-9a70-4731b25a1d78} + {51418042-7c27-4ea8-b90f-27e572f6b3ee} - {15f8a9e7-3b44-4161-917e-728727154c01} + {38479396-f425-42a0-abbe-b6f9ce156512} - {9aaa2fa5-e4f9-49d9-9a3d-3fe1e9a82869} + {69d54b1d-01d8-4be8-b2c6-3c71f4b97d67} - {1c7d1c5f-5d5c-4eb9-8db5-a7ed8d3cb092} + {2fbd69f5-5fb0-4ce5-9375-c510ef831526} - {0ae52152-f02c-49b7-a65d-ba03c3f6e0c0} + {c999c1fa-96be-4aec-b13b-d46e127788e5} - {216306e1-9d3b-4e26-a18b-32d358b6169d} + {ea4a1a2a-f610-489f-b8f6-47441a6fb687} - {640b4c98-f6e3-41fa-bb25-bbf99e00d47c} + {013c44ae-f1b9-428f-b446-108bb1aa030f} - {3adb26f7-7018-4aa2-983f-90ad4cdfc8d0} + {949e4fb4-7b96-40e1-b9e0-ac0b495d797d} - {5c61bc58-ee42-4fb4-ab91-278b870ee286} + {f3cae720-5e55-494b-a2f9-39b62d36ff3a} - {96a5d77a-d000-4e51-83dd-ac6d3b84069b} + {d09116b5-62b0-45a2-9485-23cfff6b2edf} - {17f88f24-6253-42b9-b7a5-883864d5d8ed} + {87e2274f-4c6e-40f4-88b7-dbbdbb0b2330} - {a217d02c-bb50-4cae-bafa-f4768596381e} + {bdb9e0f7-bc9c-4b60-bf3b-aa354c3d06e7} diff --git a/Util/testsuite/TestSuite_vs150.vcxproj b/Util/testsuite/TestSuite_vs150.vcxproj index 8a9bd4791..3600ed2af 100644 --- a/Util/testsuite/TestSuite_vs150.vcxproj +++ b/Util/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs150.vcxproj.filters b/Util/testsuite/TestSuite_vs150.vcxproj.filters index 214afe525..970727cc2 100644 --- a/Util/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {f1dfd023-7c09-4562-943c-207937586e85} + {df13a283-6f4c-44ec-93b3-86bb11e7004d} - {bee3cc4f-c310-45d7-8460-a96476b3e9af} + {8e8d8ce9-ae98-4f9a-bb99-8c17b76753d5} - {522d1a98-3288-43ad-8437-d0759413cda2} + {c9dcb8f4-549b-4ff1-81e8-39df23c952f8} - {9cd6e352-d2f8-4c12-8006-135c45f7de35} + {7befa23b-b8df-4500-b9cf-05f19d40d307} - {27c24542-b081-4ecb-898f-d545166d9c93} + {4b37d50a-3593-4c5b-9aaa-e1f16af127ae} - {ec15547c-63a7-4b11-bf15-eee873f6b87f} + {ba826da4-29b4-4d5a-8cb4-6abfe1111195} - {16126554-d72e-435c-9d78-b60c6a986158} + {30b44201-b245-4c1d-b9cf-d9abd1a18d07} - {6b8556a3-72e5-4dc4-af5b-31184b9f5087} + {4a59f9f5-7354-462c-a1d1-ad6f47b45074} - {2f094aaf-d3ee-4936-be65-d49c3692dcb8} + {64edf687-6822-4ae2-adcb-8c7c6038f54e} - {14ec75b1-0ea9-41fc-a11d-b10c387321ee} + {255d2bf4-439f-402f-8c87-4eff4c9db112} - {636facf3-613b-419c-ba81-bb0b05958056} + {ac2dffbc-66ae-47a4-a40b-5ce8f1ebaab2} - {dac8ca14-21e9-45c1-8a5d-567b29a561e5} + {d88d1fd5-da56-4a18-8178-d44c95889e66} - {5b8cc0c3-9412-4423-af4c-e28e929d90f6} + {0d447b3d-5a18-4895-b838-9db263a2103a} - {1e066411-7f45-4694-a28e-9197d356c36c} + {ad35b279-f1c8-43b3-90c3-97ffbdae2c63} - {ea9a7d64-3e38-4b76-bb05-4c26302f7dbb} + {b80d407a-991c-4551-91f8-7671213ade25} - {8095f861-4429-4b73-ad18-e04fb9ca44f4} + {927a0d33-89f7-4dac-b2d5-06203b05144b} - {7f6a6f4b-1ee2-4001-956b-c3b17af10f44} + {c6376869-b1f8-4bd5-a30e-6d66def411e4} - {a9252e94-4c55-45e8-b07c-8f65843b56d4} + {cbba7619-5561-40a2-900a-1865d18b9a56} - {c738cb98-575d-4fe7-bfa5-f16d8a4d5409} + {a03ab6c2-aa66-48f1-a4ea-972615e107ee} - {1592bc5c-8cfe-4dc9-bd4f-f78fa6ce6f94} + {e0dc55ce-0fb7-4745-a276-0a9130ba77a3} diff --git a/Util/testsuite/TestSuite_vs90.vcproj b/Util/testsuite/TestSuite_vs90.vcproj index 6cd8c38ec..41f391c4f 100644 --- a/Util/testsuite/TestSuite_vs90.vcproj +++ b/Util/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -340,7 +340,7 @@ - + diff --git a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters index 6eed1dd5b..7dc30012c 100644 --- a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {27a27df7-2593-4d46-afbd-fcff08433384} + {4dad6dcd-9ca8-4704-b122-a96f86f54684} - {123f5f40-9c3f-4ea0-a9c6-ab3d42615f49} + {2a3a9d86-8572-41db-98cd-b68b0d25861e} - {e4c73b6c-186f-4f33-abc3-f364df408e05} + {f768964b-424a-4b84-b99e-d4e3ef064a0b} - {0ee1fd76-7b5d-4c2a-9aca-dfa5e1d990bd} + {0784346a-2e77-48b8-b3a5-0258c1963564} - {54419b9b-48fd-488d-85e0-689f84bcb1bd} + {141dbe1d-86c2-4f33-9e32-7d37e5203707} - {31dfc9a5-6008-4932-8fa7-5c731ab7c0e0} + {dfc98102-253e-4804-bbc8-bb36239a1113} - {440407fa-5d31-4214-86e1-b9bd4c8fc438} + {ebd15199-e856-407a-8673-4ab8bfc6dac1} - {f8090f3c-6d8f-46ee-9a12-9679c3a65ab0} + {69e06d8b-f7da-4cd5-a39a-5e2bd019645c} - {39fd0c1e-7e78-4e31-95b7-466a1d2493f7} + {fffbc27b-3963-4145-88d7-7f5f040af5e7} - {375c4949-19ff-433a-b47e-744981240921} + {d3bfbf6d-a9ee-4c54-b83e-1faeff7fe319} - {c0388092-0033-451d-bc7b-69df64aed033} + {5918413d-d2b4-4a74-bd3e-2fb107b5520c} - {1e287894-b891-4a58-9243-03da31db7747} + {b6dde138-b3d9-4fb4-b091-9a7f536d8837} - {5b2e1f48-e995-42a2-8a5e-bc1c9bf43a8e} + {5fde061f-8e22-4a17-ad66-0e590136cb6c} - {903839e5-fa87-46d8-89d1-baa75bccf569} + {42258f83-6290-4212-ad55-90b528a1951d} - {b587af71-b3f4-40ee-9a2c-8580d2c8e68e} + {735182ad-159d-4d5a-aefe-7506ccbe930f} - {0bf9e703-08a4-43b8-bb34-7684f5a784f4} + {7736ad53-7beb-4747-9f95-7b0d93c4a5ae} - {c229f442-a0a3-43f9-b86a-caa4e20c99f1} + {56ed167b-7e16-4d4c-9c86-898a631a63fa} - {bb2da8a0-438a-4f98-86af-0f691b085f56} + {c58efc16-459a-4a9f-ae3d-5e5ee3441520} - {cc0b1985-2944-4dd0-989f-83bf4bf2a9fc} + {b5a17c1b-f623-47b5-8c48-8f28acea47b8} - {415d5eca-de66-448a-b6dc-781636d4f5f7} + {8bb63b27-1bbb-49cd-9aff-8c9f1dce168f} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj b/Util/testsuite/TestSuite_x64_vs110.vcxproj index 83f50fc1c..562b2fd70 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -340,7 +334,7 @@ - + diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters index 78e2e6f4d..d9dede277 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {c1fdcf32-e739-49bb-9651-ae0f20d2e78b} + {aa0efef9-ea97-455e-b7ec-611582f3ee84} - {825a79f3-d0d5-4293-a1aa-4cd0692aa507} + {cb0daf8c-519f-4ff7-9d98-8b11ab66ec44} - {d1fd8daa-da36-462d-8dcc-699c48a6ae0a} + {9d57e6aa-33b0-422b-b660-fd239c3bd2d6} - {a065d752-4dd0-4d9a-9c48-be168c302708} + {5b70a316-31fa-4226-b83c-12d4aacb3ec0} - {e2c6d03d-1657-44d3-8a25-6029743b16f8} + {d5d1e447-0d02-4c03-a537-d0b74f509e57} - {fe2c7251-a9ce-4e91-be97-4d9be65f1702} + {ca98be48-8870-43ea-aa72-d42330857596} - {883ee642-6f47-48d2-8254-cbc4bfda2642} + {026c16c3-3e17-4919-97a8-818fd409ffbe} - {ac43c3bc-ab5c-42e3-94ac-002c9749a6f3} + {41f304cd-d937-49cd-8510-e299ebf60316} - {b0f9b93c-f30f-4a2f-ac42-7ba50e0a3bad} + {0e33313c-3f50-460c-acbd-db0bf376df63} - {c70f29af-6f89-470e-854a-221a34525960} + {314217cf-db05-4628-a7cc-8361a227c577} - {bad15fc6-002e-404c-bf5d-3c70705e6ff8} + {3cdaa8d1-2d79-4332-8185-3193a82dc31d} - {c8559755-bf86-4252-ba8e-3c99487554c3} + {c33bc92d-07d3-4433-a130-96932fb4eca4} - {d66d7390-071a-47cc-9dc6-0f43f251fcfc} + {0c3c3b7f-54e4-4ddd-8c53-566db4435ebc} - {3460a8fd-2231-4f2e-8c4d-65014b242962} + {b0da002d-ad67-4f64-8d51-0ee5b98534fe} - {0043aa61-4fbc-4509-9afc-e99be8eeb7bd} + {ca4250c5-4662-4102-80c3-658774d4ee11} - {435320e2-8812-42c2-9a72-66b8a133b7d4} + {75b629d3-d70f-4a9f-af0f-0aa73a61c7bd} - {c663aec5-dfcb-4d3c-9d00-946994967796} + {6d0b1c2a-9c8e-40a3-ba9b-eef58635b6c3} - {3a92fc93-efb2-44e2-9871-76eb94f41f76} + {55255743-7cd9-454f-a31c-f86fc5587141} - {498e4662-12ff-4cbf-a090-3b9ef6a440fb} + {6027c120-18f6-4a3b-8119-a93cfc11f675} - {2eef57c6-3ff8-4338-9271-91efbec3e06c} + {118f6d99-c9da-422f-94df-deb49303fbee} @@ -143,7 +143,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj b/Util/testsuite/TestSuite_x64_vs120.vcxproj index 618075121..c50bcb85d 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters index 265d0f7b6..5b92e5b7e 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {70b0e94f-dd9b-49c2-afc6-ebd40548ec38} + {46ff3180-50c6-46df-9924-f13925633cfb} - {c79c41a6-b615-4ce7-91f6-e37bd538cbb0} + {7549a074-15d4-48aa-8983-243627960f30} - {5d866b05-4fb6-417b-b80a-a42ad99a69bd} + {c5226fac-b851-4a73-ac07-e96c990ef092} - {5794c788-686f-41c0-b2e4-e79bb6d12c5f} + {284e807c-4aa1-445e-a9c0-abe33b30d637} - {f815100f-6a5e-4ab0-bd11-e4a41fd1ae4b} + {33ab8043-3859-4524-8ec3-222999a2a378} - {0b673e03-3d91-40cd-9bdf-aebadd766633} + {171c3d27-3c06-4275-b813-9e968a03cb8f} - {84e61ad9-46f1-4de9-a0de-ca28413638aa} + {c56e289a-9b9b-4d26-86f1-0cdee34ab6c8} - {4920bce4-55bc-4433-8790-22373cdedd8c} + {d85d83df-15e3-45d6-a9ad-cbc81f0b3239} - {4739218a-e798-4893-b9f4-ebec18ee7d7b} + {0786e96a-2673-4196-b7f7-575f383d314e} - {b43d53a0-9df8-4765-9d67-3e51ed0414db} + {77720da0-ce32-4521-8227-733b9c04d345} - {cc7b347f-4437-49c5-88d8-ef365d712103} + {4e4ec007-a080-48a7-a0f1-2e13105b8ccf} - {266038e6-a3c3-4b0b-8802-40566a874045} + {fc24761e-033e-4ba2-b3e4-4bba071e8f6c} - {9de8a42b-d715-494c-b2f1-cfbc0ccc0240} + {5d3b5ad4-dd6d-4019-bf4b-24606e921ad7} - {dee01ce5-9775-43dd-84d2-2bd367e3c967} + {a2eac77d-a18d-4ae5-a7d1-c91ca3dfa752} - {676e2e6e-8f03-4209-b0fb-7f8c7e8b2f19} + {bf21dcde-125e-4e71-a8dd-743d1736a31a} - {91c209c3-4970-423c-b539-2bd9cad32375} + {a951a051-89bd-42c9-aa73-fd144404eeec} - {4a809791-dcff-443b-a658-a796a9bf659b} + {d2746975-b67a-43dd-bb91-1d680e540ea9} - {5ecfd0ad-71c7-4dab-9b92-9e39007e072a} + {b9e32874-b2f6-4cb9-a5cc-72986589a590} - {5fdcd6ff-2fb7-4895-864b-9eed6840c245} + {52707bfb-7c4c-4cd7-a897-992fe6c82245} - {dd7611ea-3506-48cc-a6ad-3e7f4d9dd94b} + {c05e4dd6-4e1f-4dcf-8569-7ff887859883} diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj b/Util/testsuite/TestSuite_x64_vs140.vcxproj index 217ca8963..f5ce08c74 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters index 1da2ef012..e952ddd25 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {b7f0b2d6-ac65-4e32-98a3-6d5abea76a32} + {46987708-8d83-4734-a35c-c20b8e1cbcec} - {fcf84bfb-3c6a-43d0-8846-7a9568f977d0} + {2bda8713-f213-4e2f-9a1e-1479ec692751} - {66a8035b-8bb9-45f8-b9fa-2ba80397b4e2} + {757a2cf5-4668-4a88-94a6-3187f4202845} - {a03683bf-22a3-411d-a788-4952c4704272} + {d552502a-1200-4584-88d8-db621cc41ee0} - {cc108049-2ee4-44ba-93d7-789b5ea33dbc} + {8cee5512-0ae4-4c9f-98a9-20ad5486bcbc} - {0de1b58a-fa7b-40ee-ac56-aea7bea2c5b4} + {d4fec6bc-50aa-4309-9268-4cf5648094f3} - {d20f01d0-4d45-4587-a7d4-4f38e88a26bb} + {0eefb853-bf45-4fa8-95ba-dcc5bde9db6e} - {47530568-1b19-4602-b61a-562f8b8c0358} + {5e2c815d-b8d8-4496-8d7b-737f2f2cfec8} - {96d24053-645d-4854-be44-3f719863cf00} + {50162e0c-f22a-4a31-bba3-b27e6c44c830} - {3c914e1c-7d16-4574-b69d-f583797e7262} + {9c4f0992-c66d-4909-b75d-b413785a13ae} - {fbee8f57-676f-4fbc-9368-142ea80c95ea} + {c2a3d82e-4544-4df8-b2e8-5699889da22d} - {5fa9ca5a-e960-41ab-8641-28e2204c0809} + {b5af4013-ccee-49fe-b203-910f44a6c515} - {c8301303-6f96-416b-8d3f-a83455fc53c4} + {5a322bca-d024-4142-90a9-d8a2008ed37b} - {071aa147-6037-41a1-901a-0a99b4d0a08f} + {a017ccf4-a0fb-4b75-996e-51a71c7d0010} - {5819b1ed-eafa-4d87-99fe-3f8f3d1234e3} + {b39a243d-cd3c-463e-898f-95d13ea72ad0} - {ed087116-8f2b-4aa2-80eb-e32541771c9c} + {2cbaabc7-3240-4d47-9c31-8d4cd9ccbc4f} - {3556228d-dc87-4d01-b630-78f15915ce42} + {8974e440-80a0-490c-b5a0-1c03f2c85670} - {da5f9798-a8d4-427c-8599-c5c8ce185e49} + {9f2ffcfa-fcd9-4a8b-a566-69f7924898eb} - {73b3f8a7-9f0b-4e49-a864-c359b632bd6f} + {8d5cf423-c76a-4e07-a94e-e74e566de9a2} - {cbeb20fc-0f25-48e5-80bc-5cd43a96ac9c} + {e9cda46c-4eb5-4721-9505-9cf75ffb46b5} diff --git a/Util/testsuite/TestSuite_x64_vs150.vcxproj b/Util/testsuite/TestSuite_x64_vs150.vcxproj index 6bef4a602..c7c121a1b 100644 --- a/Util/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters index a267cb988..2c2d4a166 100644 --- a/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {87120eef-ea19-40a5-9936-6f5d2e1c7d57} + {cc4095ba-9fd4-4f3d-9dd5-890866eddfcc} - {0a946d43-c022-4066-a7aa-27c6b4ccb7c5} + {1f2548c0-c8d9-460a-aba0-2bdb14785085} - {5bf54e5d-8d30-4f00-aef3-26cce83225d2} + {164ea6e8-cdbb-4236-8150-3e1310322c18} - {7bef4657-2556-49a7-ac0d-57502a82ae00} + {00f1fe76-15c4-46f5-8c7c-8e20f730d9a5} - {5a79c9ef-4edd-4f34-b853-b779e0525d5b} + {2821bc6f-7352-4951-834c-6c616f00acc4} - {66e968f5-cf66-4368-98b1-b4e5d01a4542} + {11e98d36-ac3c-40db-ac40-3000076b9ce8} - {1fa9b9e2-8678-4cdf-9757-97c6da160710} + {e400451a-7479-40d8-9769-9f2919559c3d} - {adc228e0-6a04-4cb5-8e80-c700babaf2ac} + {bbec9fc0-ae48-48f3-a682-4d7d45967bfb} - {c8ef5e04-8596-4e6b-8d7c-a0917d05eff1} + {a72058ff-2f5e-42ea-8cda-52ca8f81a1cb} - {f485d5d3-cd16-4a53-9b7b-ef47d33f10d0} + {f242e89b-1a88-45f3-b897-09f0d66fd2a9} - {088415db-3bc7-43df-9cf6-d625b7109745} + {549d294d-954c-42f8-8f7a-c5f42f8bccaa} - {b949ec02-a0e0-4e5b-9066-4024a234b3c3} + {3ea6adea-d319-4452-82d6-ba7b14be97ef} - {2d7cd513-95c0-4050-a404-6f407835717e} + {2986186c-9b1e-43db-8c50-e9846b0106c1} - {9e4fc75b-1da9-4422-b523-6a9cc7632148} + {aef720ce-bd25-4626-bedf-5373f6b6bb2b} - {38a73303-1098-4357-9e4c-a8ebfba0d36b} + {bc7768e7-3999-46be-9509-7d1db980f477} - {7867560b-e4af-40f2-976c-4e41d5250568} + {17a664da-6fb6-4bbd-b383-8a5094b53f5e} - {db947026-d683-42ff-ae8a-d3f03db4a270} + {490a694e-9e5e-499a-b390-fc5b47a2845d} - {77e3dee8-43c2-4dd9-9ef2-cbbcac28edb9} + {0b41f763-69ac-4146-bead-b1d172a1301e} - {65a8b7fd-9298-473a-9437-16751998df27} + {ab90f7c4-f562-4cbd-a050-7369f59d913f} - {8c235871-3c50-45ef-9dde-3f7e9f493124} + {90281c89-6af2-4839-8adb-5769aba3e0b7} diff --git a/Util/testsuite/TestSuite_x64_vs90.vcproj b/Util/testsuite/TestSuite_x64_vs90.vcproj index d3e4607cf..a31be4414 100644 --- a/Util/testsuite/TestSuite_x64_vs90.vcproj +++ b/Util/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\XML\include;..\..\JSON\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - XML - {9E211743-85FE-4977-82F3-4F04B40C912D} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoXMLd - PocoXMLmdd - PocoXMLmtd - PocoXML - PocoXMLmd - PocoXMLmt - - - ..\bin\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoXMLd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoXMLd.pdb - - - ..\lib\$(Platform)\PocoXMLd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoXML.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoXML.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoXMLmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoXMLmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmd.lib - - - @@ -346,6 +90,29 @@ + + XML + {9E211743-85FE-4977-82F3-4F04B40C912D} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoXMLd + PocoXMLmdd + PocoXMLmtd + PocoXML + PocoXMLmd + PocoXMLmt + + @@ -356,14 +123,7 @@ - - true - true - true - true - true - true - + @@ -428,32 +188,11 @@ - - true - true - true - true - true - true - - - true - true - true - true - true - true - + + - - true - true - true - true - true - true - + diff --git a/XML/XML_WEC2013_vs110.vcxproj.filters b/XML/XML_WEC2013_vs110.vcxproj.filters index d2ea6d3b0..2eee8b197 100644 --- a/XML/XML_WEC2013_vs110.vcxproj.filters +++ b/XML/XML_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {e4570bb8-b68e-4346-a11e-c0dffba7fe1e} + {4d565343-77c1-46ee-853a-7001d5fead77} - {e4287882-894e-4f38-b48c-a725c60f9c4a} + {2f6b9452-320a-47ee-987e-24268a7aa2c6} - {19dea724-7645-4951-aee4-e1c5b9dee5c6} + {09b44c3d-1d7d-402a-9d60-686bf242e47e} - {c727f76a-9259-45ad-a5d6-b431a282e1bc} + {0f2d84c3-72f8-4503-804f-5a9679c48a72} - {e9122713-8de9-4dd2-b084-2dabb8158d5d} + {888b6177-55a7-45f9-9ee3-d21639638efc} - {d88f81d5-0c62-4440-8b27-969931e9d142} + {5302ae5a-d871-4a43-8e9d-f0aca4aa63d5} - {1195757e-c239-469c-9a2e-5aa982915262} + {a0a876e1-9565-4e60-8bbd-8e8df03a9db8} - {4b4acff6-a77e-4ced-bd5c-c430d3b42c16} + {2b8dc0d5-5776-40c7-b381-b108fda608f3} - {b84bfc28-dcf1-48c6-84e2-50cba2f765df} + {948fef3c-7401-44c9-9f41-c1e61d75a3a5} - {1b946de7-18e4-4729-9239-61905cc20c12} + {36c8b65d-d082-469f-bcd5-58e30b3b6468} - {cff456cd-c6e3-49a5-b353-de17fc63f92e} + {e488a6bc-8462-47da-af8d-75953228323e} - {42fdd8dc-39e9-4aac-841f-2e033a959b12} + {a3ace479-f902-4447-9dcc-e0e08925aeec} diff --git a/XML/XML_WEC2013_vs120.vcxproj b/XML/XML_WEC2013_vs120.vcxproj index 3259c985e..2d626451e 100644 --- a/XML/XML_WEC2013_vs120.vcxproj +++ b/XML/XML_WEC2013_vs120.vcxproj @@ -1,262 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - XML - {9E211743-85FE-4977-82F3-4F04B40C912D} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoXMLd - PocoXMLmdd - PocoXMLmtd - PocoXML - PocoXMLmd - PocoXMLmt - - - ..\bin\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\XML\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoXMLd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoXMLd.pdb - - - ..\lib\$(Platform)\PocoXMLd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;XML_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - - - ..\bin\$(Platform)\PocoXML.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoXML.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoXMLmtd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoXMLmdd.pdb - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;XML_STATIC;XML_NS;XML_DTD;HAVE_EXPAT_CONFIG_H;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - - - ..\lib\$(Platform)\PocoXMLmd.lib - - - @@ -346,6 +90,29 @@ + + XML + {9E211743-85FE-4977-82F3-4F04B40C912D} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoXMLd + PocoXMLmdd + PocoXMLmtd + PocoXML + PocoXMLmd + PocoXMLmt + + @@ -418,42 +185,14 @@ - - true - true - true - true - true - true - + - - true - true - true - true - true - true - - - true - true - true - true - true - true - + + - - true - true - true - true - true - true - + diff --git a/XML/XML_WEC2013_vs120.vcxproj.filters b/XML/XML_WEC2013_vs120.vcxproj.filters index 4a4e577eb..8195dee07 100644 --- a/XML/XML_WEC2013_vs120.vcxproj.filters +++ b/XML/XML_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {6aefed2a-9745-4082-ab55-b2c5e670fd8c} + {915746ad-84a6-4ef8-a0e3-87e765ab86e0} - {6847eba3-8d63-49cc-af44-ac497e763528} + {732da8eb-b3d4-4a06-8f14-90dccb7861b0} - {e50c0268-f053-4d0d-b509-df1a44458ecd} + {4d53194e-7e05-46f4-8a71-355edb0eb4f4} - {d3fcdd30-14f3-4fe9-9888-9fb36a33d50a} + {1795dd49-409d-44d5-956a-b05eedef37f5} - {e03ba244-ba89-4d70-a0cf-f5a8824c5683} + {9abea635-5a54-4ef5-93cd-c58979cffe80} - {dfa91249-a8c0-4691-b47a-33ed4feb29e3} + {f755da5d-d2c3-44d1-87b0-dd0619acd17a} - {bfe479d8-e81d-4736-9a7f-e1ea695e68ef} + {c9fa4ddb-8b69-4431-8a68-b645adcdf85f} - {2a2d6265-99aa-461a-9233-3cb2d2fb95f8} + {e63dd7cb-f8e1-4fc6-b461-c4778469eb79} - {9c173a58-c81f-41d2-ab9f-6ba5610f1335} + {395c9563-07e1-409c-9ae7-61ce108529f4} - {2f627881-fc28-4df2-aaa2-8e94de41dffb} + {8992eaf2-8927-4387-9afc-d3aacc394430} - {9e3cf5a4-ecb0-4d77-b29f-30a0f7e3f1b1} + {00766f96-1f58-487f-87cf-34213bce1924} - {331fbb21-6916-4762-9541-161d1ad52234} + {a1fd8f32-68e4-4d3f-982f-5060279d867a} diff --git a/XML/XML_vs100.vcxproj.filters b/XML/XML_vs100.vcxproj.filters index 118d879a1..431c0a13f 100644 --- a/XML/XML_vs100.vcxproj.filters +++ b/XML/XML_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {2f9375ac-ac5d-46c8-8f02-404d9fe37182} + {56a5ac1a-5815-42f3-9e84-2321b487fd25} - {278b8a6d-78ad-408d-b03a-33755f6dec0b} + {db00a5ea-08ca-4b9e-9264-a851bb06a438} - {d0169a98-760f-4e79-bbc4-5ff050e07421} + {3f8c9c82-2bea-492b-ba61-5f6bd0c025c8} - {1a823da8-4e6e-4bbb-8f2a-a2fd43c98ee1} + {67a8e216-bc5d-4dbc-9b8b-c13809764e3c} - {a2b7880c-81a5-4a47-b87d-f4ac5b027139} + {f70dcc18-394c-46d7-8edf-98c98af8998f} - {e7339bf3-f043-4336-9fbe-d5ff045e3396} + {a15168e4-9d4f-48cc-a163-4544ebe04b7c} - {f54388b6-93e0-4928-8fdd-6125741867d0} + {0c990ceb-cff1-4c0a-889a-a2b963fee361} - {760590ac-de3c-4734-80eb-28400cbc33dc} + {f9f9d446-53f3-4525-894d-3e23fbee73a0} - {72a2d038-f5fe-4f3d-96c7-99194a8e44ab} + {e7c675d4-ff0c-4fda-9b2c-1f0bfd606070} - {b5ec9f3f-ea42-4e0e-ba29-e078254ebd54} + {2b9edf1e-3857-479f-b215-53c44455e228} - {d6407c4a-f7cb-4bf6-895d-a160b0127eba} + {83bb8bbb-0427-4e38-a2f2-f7d8f543b2f9} - {281a452b-fd8a-41ea-b4eb-de23492c9965} + {4a36d12b-91dd-4ca0-8136-179376c031cf} diff --git a/XML/XML_vs110.vcxproj b/XML/XML_vs110.vcxproj index ebcbf686e..3db57828f 100644 --- a/XML/XML_vs110.vcxproj +++ b/XML/XML_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoXMLd PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_vs110.vcxproj.filters b/XML/XML_vs110.vcxproj.filters index 6e1642dfd..01e30d226 100644 --- a/XML/XML_vs110.vcxproj.filters +++ b/XML/XML_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {bfb19e3d-02ed-42e1-8f03-71fc5f8fa193} + {b4106a07-0f3a-4b57-bf1e-d78f27f24a30} - {df42da9c-f45f-4932-a85e-1f8e05957bd8} + {e9ae31dd-387e-45b5-ab13-1b1db87438b3} - {b89c4f6f-91af-46ab-b4f0-6ee1c6418851} + {48ef15a8-b51b-4b78-8705-d52777540b5d} - {8ae5c2e9-b867-44a7-af62-acf94ddcd02a} + {91fd59fa-0ea7-4913-80d4-6c7a7b9b64e3} - {f856164e-244c-498f-82d8-b0b333c91463} + {081aa3c7-0e7e-4133-aefb-37316f1ee40c} - {67185503-1c80-41e5-9e1a-fa6c4555b557} + {c1de8594-ff5f-4294-8d2f-6111a8befc9b} - {f3d51bc7-61f5-437b-a45d-dc2939862b9a} + {30a29536-6091-44f0-b35e-12f30b640f25} - {e20b4488-e1ce-4272-a3b6-e7cc06aaf129} + {e6d57d4c-f67b-41ba-8f10-c9b9d909cdda} - {1a15c0f9-4439-4ec3-9bca-1f2b94172fa0} + {932f5441-0a48-4d78-9823-0ba844c8d22c} - {5f0aab87-0e58-4984-aceb-f6fb94afce95} + {29a82b02-a765-4afd-b315-4063b87d8209} - {d0bcdec0-0f3a-4d28-8924-ce8ef30c08dd} + {43626e26-c6d8-4560-bf65-1db65b522383} - {cb9d7068-8aca-497a-9b8d-5a397464eb29} + {73408183-13a2-4f2a-9057-82b060de752b} diff --git a/XML/XML_vs120.vcxproj.filters b/XML/XML_vs120.vcxproj.filters index 87a74210d..2f715d75c 100644 --- a/XML/XML_vs120.vcxproj.filters +++ b/XML/XML_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {8fe26c01-67a8-486b-8423-3f39035c646e} + {1da1fa47-6f5b-443f-93f9-1f5e408bc6b9} - {14c47c63-e927-481a-bb32-0e927d6fa526} + {94f24e0d-ee66-4d6b-9ba9-f17f95eaab11} - {66a18ad0-2a71-4888-889e-196af74f182a} + {603194d3-5a0b-4a79-810e-22b5e73d01f8} - {c1d3196e-0c9f-4fd6-83f7-90bf0df9238c} + {2f7a7bcd-2cd2-480f-b9f8-463ed301bde6} - {b3f6d701-52a8-4ab4-9d22-25145eca3026} + {c1c42f26-888b-4571-aceb-39f69abc3e48} - {db8eaa07-ba5f-458a-aab2-6bb521c7b955} + {b69125c3-b528-4b87-bfc5-c16adb80f1a2} - {a6edb247-a44e-4a5d-ad2c-f6e3d9cbce86} + {32e89539-d3ec-4c29-8d5d-85f468858dc6} - {bd57685b-7480-44f6-a765-a4428554ee05} + {88623b28-5d18-4c02-ae2c-bd94be43db03} - {bcac02ed-5977-4282-8c96-91dbc662caf2} + {575991ed-ac50-472b-b970-876ce4c292b3} - {3e1ff3c2-70c8-4d79-8795-610f328970a2} + {32258539-c4b8-4064-98c5-ef595e215298} - {e8dac05f-ac1c-447b-9bf2-321115cdfe4a} + {5f96272d-f975-4b90-97b9-58ebd32fe48c} - {cce7469c-a6e5-4121-82a4-aaa2b73b8896} + {21fa3b0e-9bd4-44f7-8011-1cfdee28c354} diff --git a/XML/XML_vs140.vcxproj b/XML/XML_vs140.vcxproj index 324f312e4..eb26c0ca4 100644 --- a/XML/XML_vs140.vcxproj +++ b/XML/XML_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoXMLd PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_vs140.vcxproj.filters b/XML/XML_vs140.vcxproj.filters index c2fbe2474..93d9cbe9f 100644 --- a/XML/XML_vs140.vcxproj.filters +++ b/XML/XML_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {4819fa07-e56b-4bea-bc4b-e95e0d53f02a} + {3f444d6e-485c-444f-be0e-eb78aaca79d3} - {38a77f2a-5532-4734-be2b-14353fa6b930} + {6dfa5333-b095-4aa4-a963-25c5b4604173} - {eba8ed23-9976-4f3d-b70a-34d362b20d92} + {6a039ec7-97d6-4562-ba8b-0f13614b386a} - {d42b334d-e341-4a24-827a-f30e5494a69d} + {26c6a6e9-6602-4894-ae6b-e2c3012df454} - {6e8fc0f9-73c6-462a-b501-8fd16cb56728} + {b50dda0e-a63b-45f1-bc5a-8772c2b8967f} - {a8ecaa21-00e6-44eb-8515-012c9e319d64} + {01695b5d-1273-4f79-af8d-0bd55700673b} - {b341cc94-d2d2-4880-b6f8-cb84cda67c52} + {a1b0e29a-bd7a-41f9-8ed4-7ef3b3da4e89} - {1e3f361d-e85c-4aee-bfb9-2fde43e4099c} + {a016c5e9-c56e-4ee4-b65c-c5c749b3579b} - {07cb5afc-fa0d-4a8b-9540-d80b1a1bb59f} + {741408e4-9978-4921-9f58-20ee08f53df1} - {b679a53b-6f8c-4c7d-9307-494057b0f4a5} + {3db75c8a-1d43-40a0-bee2-8e718a3ccc14} - {9eeafaaa-76dc-4f23-87ea-361fb9f3f68c} + {05ed60d9-ed1e-4a39-9177-5cd983880a0b} - {2ef780e5-cad5-4156-a3c2-c9e09fb92cba} + {a9c9ed85-de22-4f7b-a6c9-53e5de9de881} diff --git a/XML/XML_vs150.vcxproj b/XML/XML_vs150.vcxproj index 8f1fd752b..91ec25e4d 100644 --- a/XML/XML_vs150.vcxproj +++ b/XML/XML_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.4 + <_ProjectFileVersion>15.0.27625.0 PocoXMLd PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_vs150.vcxproj.filters b/XML/XML_vs150.vcxproj.filters index feeec5097..a638b042f 100644 --- a/XML/XML_vs150.vcxproj.filters +++ b/XML/XML_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {c9025f28-827d-4345-b758-1f5c60f34356} + {3d5cda11-b5b6-4fff-86e3-878f000668f5} - {a3959ec8-0270-4f4f-87ee-4afde9bf0c18} + {2c7a367b-fc72-4ef2-9e4a-6e53a9065bf6} - {b6d006db-22ad-456a-85fc-36b5481bef39} + {fee80166-1b42-4f21-98ba-e97d4b284272} - {12ea0d04-c128-4fcf-bec9-ea75ffaf3e85} + {442a7f54-6df7-45de-8ffd-02a07a5fe93b} - {643e1d14-781e-4d92-97a5-7774e5aa68d2} + {a0a8904e-a6af-4e5e-9493-26cc27f9ce02} - {4f13392e-d9cc-44a1-a5a4-a9d4be17896f} + {ba6c43a5-d770-42af-8143-f817fd1afff2} - {6dca3fe4-47e0-4f57-92c8-db2085a59118} + {2dd67d4a-d815-4d07-9b88-c330c2915d49} - {362658cc-3f24-4d22-844d-784f15198275} + {d8d0c2a7-c367-44b1-bbcd-ec0d2dd3b608} - {518f65da-c0ad-4566-9039-10c895b95e26} + {27defdef-772c-4d25-9932-35271932edbf} - {2c5fd0da-ed36-4f5c-a257-5f3fa455588d} + {09aca560-94ed-477c-be04-3ae0d7c41594} - {b9b3cc0c-518e-4fca-9739-b0a3f3a0aca3} + {2e0406d3-1ac9-4e8a-a294-7aa3bb660d18} - {f30033fe-7c63-4c2a-b916-f100b77488d2} + {f4f5f7b9-2690-4676-9139-cdec759e076a} diff --git a/XML/XML_x64_vs100.vcxproj.filters b/XML/XML_x64_vs100.vcxproj.filters index 9fa2537eb..929982b68 100644 --- a/XML/XML_x64_vs100.vcxproj.filters +++ b/XML/XML_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {ab7f12e1-a31b-4e74-97d0-33f78f854ad5} + {86dbc419-a600-47ce-8250-da4e6749d785} - {6d896e6d-8b44-4e6f-bea1-73a56927a34a} + {bb06364a-0521-46a2-9d8b-0ab7ac45d3c6} - {3ef31fcb-153c-410b-83b2-3b324a4937ce} + {bd8017ef-249d-4a2e-a871-74bce818aba1} - {47c6c2f4-3034-497e-9f48-6fa6cb57349a} + {1614b41f-a875-4f0b-ba2c-784f5b13cc4d} - {a331c389-19c0-4ecb-af5a-ae8ab3677b8a} + {0ca7be8a-b4ee-49bb-849c-16b8fe7ea55f} - {33b0fe69-0f03-4d94-9ede-fc5e703758be} + {2cbcd7a6-6455-49fc-97a1-0ff40cbbcc4e} - {55ec750c-1cd6-4ff1-866f-8f80ec035815} + {8fc6ade2-7e22-44d8-975b-8d190ae8a46c} - {19cd91db-7765-4b61-a424-f0bd3084fda0} + {2ca7beef-d206-441a-96ad-6048dc76bbc3} - {413bca8e-6b26-41aa-8232-0c0df7ed3abd} + {34bfd341-015b-4ee9-9184-a34e25de848c} - {028f066c-c014-4eb7-bf37-686367c18b99} + {4ffa35aa-8861-4bc2-a5ab-a21dae1cf73d} - {f0564233-cbf3-451c-a730-53ef397dab72} + {6bd1b4d4-25f5-4a71-bad7-12ee0c44766c} - {b9a69ae0-21ed-428b-be69-175ada845029} + {6172b179-af57-483b-a47f-420bbade2033} diff --git a/XML/XML_x64_vs110.vcxproj b/XML/XML_x64_vs110.vcxproj index 0982f6671..18e231033 100644 --- a/XML/XML_x64_vs110.vcxproj +++ b/XML/XML_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoXML64d PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_x64_vs110.vcxproj.filters b/XML/XML_x64_vs110.vcxproj.filters index 796712f8d..e41fde54f 100644 --- a/XML/XML_x64_vs110.vcxproj.filters +++ b/XML/XML_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {1717470c-e612-47ab-bdd2-e81148bdd6e2} + {3729b0c5-fa79-422a-8777-5747abe114f7} - {f9047833-1102-416e-ac2d-0cb9b09aba96} + {b19557bf-57fa-4fbd-ad04-381367e39047} - {28421cab-ddf1-46c1-9343-727b601b1606} + {0a916444-5c53-4984-b354-ca2f98e6cc88} - {2990dc05-eb0d-4c8b-957f-cda5b24a2bf1} + {c765bc6d-7bf5-45e5-bf29-bebeaac66141} - {9eb58c7d-ee7d-451b-a1c3-113a902a3f22} + {4b12041c-284c-4a66-9b78-7462d450326d} - {19861599-d0d0-4d91-bd10-5a232d532436} + {8e5b3227-fa82-4871-8c8c-96bb1a714c8f} - {01529976-4295-40c6-97fe-7c619d7d13dd} + {404a45be-7f67-472a-8ac5-03ff44877f7e} - {372ac6ef-966e-4fc9-9d49-7a235a2a81ef} + {3d6b2561-5427-47d1-864a-77d36bc2fab3} - {b8b9a355-48f2-4bf5-8662-5cebcb6d5315} + {30a51aa7-0923-4699-bc7c-d7512efec3b6} - {2fd5ddcc-ca18-4d5a-9f92-a58dbfc9d04d} + {c1644103-5243-43a5-8be3-200da9b7453c} - {7608c2a2-3d91-47c2-851d-14601b8eba8a} + {61817202-8011-4a7b-8172-dd02a955ca60} - {290b7ccb-166f-44d6-a997-4b0059acdf76} + {8e1a0cc2-b7f9-49de-ab6f-105c57707b39} diff --git a/XML/XML_x64_vs120.vcxproj.filters b/XML/XML_x64_vs120.vcxproj.filters index c1a02c7ff..b704835b5 100644 --- a/XML/XML_x64_vs120.vcxproj.filters +++ b/XML/XML_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {7ed6e8e3-e2e2-4ce6-b997-f92832456301} + {d04c5399-8f3d-4ff8-9354-eb67ad31dc1f} - {5d204d26-36c4-4516-9f3f-0e570cc3478a} + {f8f1e92d-609b-40ff-93c1-15721ef4150a} - {d8153f7c-24d8-4f1b-a3f7-fdc5b4d4d74f} + {0b63733d-7f55-40d1-93f8-62a36fd7fa0c} - {8a64804b-1d8f-48c6-ad33-aa2c5376ec18} + {5d89989d-015e-449d-bc04-cb96b5ffa5d9} - {a23826cc-bea5-49fd-a470-de5ca10ca323} + {58b60c25-ea74-4290-bbaa-e6fdff739722} - {7217fbab-dc85-41f7-ac79-c6abcff91725} + {c49c4750-7e38-4835-97cb-a4e703063fc7} - {7739b606-27f0-4fb7-9bdc-88cea295920f} + {00ddc28f-4407-4ae6-b33b-ef11a0046178} - {a44bbd39-c794-46ea-a349-24b8d1cfb38f} + {77c48821-503f-47e0-8838-beabcdec8a84} - {a530cd9a-63b5-482d-82f2-91aca62ecd8f} + {c310b1d9-9b9c-47aa-a2ee-173f39d1ed46} - {31a0f1b4-cb6f-49c6-8d4e-9dfbb3eaca6c} + {c75d3fda-1a4b-4189-807d-6c5df09829c1} - {d0455bfa-b5ce-4c18-969c-b1e4ae076f1d} + {1c7300b3-753e-499d-a08b-8619b425e003} - {b16e28a7-8bb4-4995-aa7a-8d6c4627b841} + {2d564e68-0e0c-4edd-8ceb-fb57af69ea94} diff --git a/XML/XML_x64_vs140.vcxproj b/XML/XML_x64_vs140.vcxproj index 55707979c..d49809460 100644 --- a/XML/XML_x64_vs140.vcxproj +++ b/XML/XML_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>14.0.25431.1 PocoXML64d PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_x64_vs140.vcxproj.filters b/XML/XML_x64_vs140.vcxproj.filters index f1cf05f54..2dae9d13f 100644 --- a/XML/XML_x64_vs140.vcxproj.filters +++ b/XML/XML_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {0da73345-ff01-4379-bf5d-ee1896215895} + {75640bfd-a0b7-42a0-88eb-e0eb9cb0d99e} - {ea3b0717-ea26-48fd-8ff8-00d2d43a7f22} + {30dcd988-176c-4ae2-a2fb-673919ed5c2b} - {04c606d2-cba1-496a-a823-6ccdc39be196} + {6ac47627-44ce-476b-b869-3eb0688e3fe8} - {333e4d1c-0e2d-4ac4-a03a-f1dcb53ac9f8} + {b2e8b8c9-a425-4f28-a0dc-8881204aaab4} - {a3df0c72-1a7e-4a35-933c-6cc030b9e7b9} + {ca92454e-827f-4d9c-a72b-2ae9df5d3729} - {308e4dca-d794-4103-aa65-a180e4fd3858} + {6813f7ce-38d0-4335-a138-0b3cf598f1e1} - {4cb4ad8d-eb38-4e71-a6b2-289935d687cf} + {3ed67900-4224-49c2-8ace-12b89470a82d} - {9eb29d92-c023-4e7d-8473-3329fb3ecb28} + {423397b1-7ad0-47e6-afa8-345e640472b2} - {d5b192cf-8a8c-4d2b-8481-10c19a59e8cc} + {311927c7-76f5-4277-8771-437dc4ca7aaf} - {7b322a54-490e-4c10-841c-5806a3834362} + {99b24cdc-9125-4d26-8064-e2f80afebae9} - {81c76d2c-240c-471e-8951-e56bae181e2c} + {59cc834c-526b-48ab-8bc6-6dd82a6bc6ca} - {ddf6f9f4-a816-4cb7-a42e-e40eac7596c2} + {34c8b7a6-0ec1-4c99-8958-f57e3e1aa1b4} diff --git a/XML/XML_x64_vs150.vcxproj b/XML/XML_x64_vs150.vcxproj index 7653402a0..ba0f23fd6 100644 --- a/XML/XML_x64_vs150.vcxproj +++ b/XML/XML_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.4 + <_ProjectFileVersion>15.0.27625.0 PocoXML64d PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_x64_vs150.vcxproj.filters b/XML/XML_x64_vs150.vcxproj.filters index 009140871..983b2cc89 100644 --- a/XML/XML_x64_vs150.vcxproj.filters +++ b/XML/XML_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {89ed59fa-4544-4e8d-b110-27342fee9e0c} + {c319a165-a39d-4bcc-b894-d3a057a9aaff} - {c8a8436e-d4bc-480d-980f-bd348f584fc6} + {78ca0e33-d3a8-4208-9376-f6ee3dcc460d} - {f1b81a74-068e-479e-b4ac-99add8e6e0d6} + {4cf5d949-558b-4ca5-a25a-7590caaf716b} - {44325acd-9b34-462e-af48-23cd55d9f45c} + {fb8a450e-6083-4543-9a4a-d8dc6d42664c} - {669a14ba-f708-4e27-9447-8b144b5c4cce} + {de89359c-3c8b-4eaa-b4c1-848a1c85bb05} - {7118d7bd-251d-438f-b12e-0d2c3b52f915} + {0e1c0ca9-9b80-4a7f-889d-8655cb85e02a} - {d00059c9-a8b5-4bf3-9536-fe39f37b2a22} + {36620d7b-5280-45d7-b46d-ce2a974ae64c} - {a8ab30c2-1014-4c18-9285-5f398bc295c9} + {c0e03842-b0cc-4d81-b1c1-ee9c7f1bee53} - {e0a37c44-edae-421c-b982-26f843ee208d} + {fed2fdcd-55a0-48e3-b581-a28da333cc0d} - {bed909af-f2ad-40ff-948f-ecc134ba3261} + {52638cbd-9c33-4f17-b4e0-0470707a649e} - {c0e1c900-eaf1-40aa-828e-1b51f93b77f8} + {e05c237d-2d45-4810-8a32-2f9165b73daa} - {03c1aa20-eb16-40fc-9998-89658615f0ce} + {c867e459-3fe4-4976-b058-6824ca74168f} diff --git a/XML/testsuite/TestSuite_CE_vs90.vcproj b/XML/testsuite/TestSuite_CE_vs90.vcproj index 0d6ae34e4..b5d8286f2 100644 --- a/XML/testsuite/TestSuite_CE_vs90.vcproj +++ b/XML/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj index be136ccf0..a56a4fa8c 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -68,7 +68,7 @@ - + diff --git a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index e67cfc33b..f7ad4dfa7 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {96d4c7c0-ce8c-4ac5-908e-b7e616b66b3b} + {f4f2e5c2-16a2-4f34-a149-4267c9826690} - {77678b15-4430-4bfe-8aac-7740dca8660a} + {51875e49-7dab-4b7a-b518-d53b9900eec5} - {8a32c8fa-0d6c-4d60-9189-30b34ffcc95d} + {00994284-e062-4eae-a273-b1a6f24a8f18} - {dbdc3b93-b4c1-499c-ac5d-edee38cc7cf5} + {8877a574-a121-4504-8dbf-af69929ad522} - {2d52ed44-b877-4f4d-a792-3612c9d6aad5} + {937e10b9-6ad9-41a3-a042-356004ec9a4e} - {e4fd18ed-384e-422d-8571-af452a994685} + {a80194e8-fadc-42c8-a010-0d7961059a1b} - {3c9ea83a-2074-45d5-a55b-d68970d7772e} + {326ff3c2-ce03-4124-b9c2-e63fbc213897} - {2e07488b-07c7-4fa1-87a4-f2a13fb198de} + {93a33e65-c237-489d-a329-04929b4c95ab} - {fad31840-abb1-4658-a44d-40b768f2da39} + {35e1e93e-f9b9-4e89-866b-b1979bd7c2a7} - {f26d5b10-4d9b-467a-8c06-e26dfb497f42} + {d3ed1125-14b1-451b-9365-cd28fee75bab} - {315f9fd8-5293-4c5b-aa02-41d30f2ea3fd} + {9d3256b0-b7b3-42b2-ab55-9bbcda0801fd} - {52d9aaa7-8379-4168-9436-4e4e49e85a91} + {94c8ada1-448b-448b-a5bb-6bef2866f024} - {b06f5681-ff29-46f8-a671-e648a0409ca5} + {85b3d538-2230-4570-8e02-ff6508e74a41} - {04ba49e9-a98e-4e73-a392-c75484fc166f} + {ee1b65fe-d3d0-4259-be5c-23059d1306b5} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj index 1524e4ef4..e0075abb5 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -52,6 +52,7 @@ + @@ -65,7 +66,6 @@ - diff --git a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index ea6bd4bd9..3a8762e0b 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {e8f4c8f1-710a-499b-b3cf-14364061e501} + {10f70e5d-8206-4900-959f-88cfdd9c147f} - {94848e30-dbdc-4292-8bc7-22633f775171} + {21168f37-5525-4efa-adbb-a94c7ccfb91c} - {a61da78b-355b-43a5-9611-f90bc78e436b} + {f64ddb2e-6cc2-4c29-b58b-377686cf70ad} - {a89a63ed-bf26-46e7-9c22-ee288266b14e} + {003e9d55-01c0-4029-8712-c31d061e2c6e} - {83b91a1f-fbd0-4d92-abe3-e727690d08df} + {5de89585-2439-4432-a88f-d5765a6f6286} - {5bbec3fa-943f-44f7-a82c-62f8fc862126} + {e1550cd5-8b7c-4f33-bf95-fe1fbbe95ff1} - {4ea37f66-dee5-46d1-b59f-be779084d804} + {a4349ee0-81c5-43b2-92d3-6ec2fcbccd6a} - {14a25b4b-6480-4c13-b2a3-7cc19a6696fa} + {02726647-a719-49b9-8893-09fe314a3f08} - {3c2ef534-193f-4f6e-8211-cb4196dad9c9} + {3a4bc9e6-9afe-4b31-a11e-02ae79c1de1a} - {6d40f28d-091d-42c9-a04f-2286351e402e} + {dc132ddb-8300-4523-b9b6-963f6046700e} - {d2098386-08e7-4855-b8a5-ddd0c8f7db67} + {44ff4563-6d86-442d-96f1-519a9afeb95a} - {00f7f3a2-68c6-409b-84bd-96ad9bea7c50} + {bdf755aa-6de6-4e22-bd1a-8b8b296e7e07} - {ff7f8f7d-adbc-46c0-98df-287d09b083b7} + {53fac873-037c-4b63-ae12-976dad28e2c4} - {657c0d2f-1cd6-4bd5-9048-e1f6164f4a9a} + {2403946c-6b95-4b89-9662-7a76d4367756} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_vs100.vcxproj b/XML/testsuite/TestSuite_vs100.vcxproj index 14d967ef6..9c0b6bd1a 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj +++ b/XML/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -356,7 +356,7 @@ - + diff --git a/XML/testsuite/TestSuite_vs100.vcxproj.filters b/XML/testsuite/TestSuite_vs100.vcxproj.filters index 4ca9a806c..04df24b05 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {94dfd7da-c7cc-4a4c-b95a-529fec2814a8} + {6c7ddb57-1ee2-49c7-8e6f-59572196af90} - {ada937e1-a355-4e8a-8e2d-b7e2e83f2148} + {e0b4803c-09f4-468f-8edb-8d2de1d1dd15} - {32b39518-7706-4e77-aa1c-13f9e06c9a90} + {ab9c5135-0223-45a8-992c-fe1bfb526f96} - {01018a77-4f04-4bef-8093-612c943d5986} + {383d17e8-7fd4-4c18-bdaf-272ea10d0b14} - {9362d9ce-4583-44ab-b971-ad43453d588c} + {7b91e599-059c-4b81-ae4e-e448ac03b466} - {2ecce083-0fa5-4b20-a7cd-6307821d2b03} + {5fcffb45-f851-4374-9bdb-eb72e0640061} - {1acdf720-0e4c-4117-870a-cad9f30f0a8d} + {c75c50b4-d4f5-4d19-be7c-265582857ca1} - {e7ff3a2b-d42f-4217-8ea4-bb2d6d192cf4} + {3c26774f-50d6-4720-9204-4948aa0b672d} - {4e2c5db6-eaef-4f40-b71b-3e252ec87613} + {f11bf943-4788-4e0c-afe1-c82608dd3e5a} - {8031fd45-1771-4470-bc15-c18874faf4bb} + {d2a97dc2-609a-4235-86f8-d00819fe32f4} - {a1a8106c-81de-4671-8d6c-6fad36f0f7d5} + {16456933-9b0d-41ff-9b5d-a39d96256099} - {3b6e25c7-8803-43af-bea1-5fdab52fa10b} + {5d163c51-56e7-4700-8340-a4bf531c81c7} - {124eb5cd-6dfb-4fd7-8cb6-f58d6507073f} + {f0705423-94be-45dd-b717-ae943d71a020} - {7e6b25ec-9579-47dc-bb2d-ff7ed74da089} + {12eea7e4-255d-4e5d-9cf4-3304f51c2d6e} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_vs110.vcxproj b/XML/testsuite/TestSuite_vs110.vcxproj index 4fb01e4dd..f1254b4ed 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj +++ b/XML/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -356,7 +350,7 @@ - + diff --git a/XML/testsuite/TestSuite_vs110.vcxproj.filters b/XML/testsuite/TestSuite_vs110.vcxproj.filters index 4f4842696..62071fb96 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {0df09d3e-3a34-4a65-865f-7d2bfc3af05b} + {3db721c1-b11d-4ab6-b290-20978e9686da} - {51e220ea-78c9-4ef8-8ed4-053c34fb5892} + {237bda54-d74c-4ce2-bb80-d0c1d84d260b} - {86783529-9f89-4a4d-b62b-022e38209127} + {4c4919b4-2ef1-4d8f-acac-91ff2b905e94} - {d51c6b90-528c-4c60-b30b-1bbabfd2e1c5} + {65924c1c-f0fb-47da-965e-775bdbd04b68} - {9480282d-53a9-438f-aa29-ce8316ad8c6c} + {74271298-8154-49b6-a363-f4d10f9e4476} - {da5a8ee3-554a-44a7-8f45-149d2667d779} + {c3299808-10af-4395-90b1-56749630aebd} - {e8f83eee-268f-41eb-9ca4-cd4b72d4f69e} + {e5f0f518-5578-4d60-bc28-c40248448b5e} - {a06adc12-5868-4a23-9b1b-d29961cd7447} + {77733a8b-7108-46c9-902c-033b6579dcf3} - {0d53cc8c-7d84-41e1-9a36-dea97af9860b} + {9de028d0-ffd5-45c0-acb5-b86a3bd9ec3c} - {7ca9b2eb-cfc6-4efe-8cb5-382d0b4cb991} + {775c098d-4819-40f7-abd3-897ae2df90aa} - {14734664-acf4-4327-b67d-5ea531cdbc65} + {385006f5-f737-4144-8f1e-506b7f340b1a} - {bce97d93-982a-4b36-8fa5-dbe85804b323} + {108886d8-df2f-43b5-8624-07d77a18ed9b} - {6260f70d-440f-4750-90bb-81338b736096} + {6635abf3-ae05-4752-b2f6-060eb289a26e} - {24a9b04e-5bf9-4dc1-bf41-8ef29a3cba2d} + {a8de4e8b-d31c-49d0-94d6-f388bf5c0987} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_vs120.vcxproj b/XML/testsuite/TestSuite_vs120.vcxproj index b298248d3..3e68dd154 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj +++ b/XML/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs120.vcxproj.filters b/XML/testsuite/TestSuite_vs120.vcxproj.filters index 6fc5d441b..348089756 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {4cf1437d-8a35-4c17-9747-3f55d66318da} + {476315e8-d469-4efc-b960-67f74555d242} - {a7372a0c-e51f-401c-97bf-c02e571a8345} + {73dfb5e7-cc0e-44f9-8c4c-758fe2eb28f6} - {14a12298-608c-4c21-9291-24bb56c154cd} + {01b6a74f-3c5c-4720-96ee-97009cf222d1} - {224342ff-673d-4879-9678-287c1c559ab1} + {06d5ca29-fbce-4da1-996a-70fd937b247c} - {a7a6bfbb-f8c4-46f4-9e19-9207478103cc} + {44bea22b-8675-402b-891f-909994f88280} - {ea4ad510-a2cc-41a4-9e41-19f412b4ea2e} + {57009f4c-43d2-4bcc-80c3-3e5951aeedcb} - {b92c6f00-2905-4c1f-99c6-a202a5dca993} + {1eb87131-a1e7-4259-8ed3-bda0bb447aca} - {46a47abd-2fa5-4091-a1c9-17e3aa8b39c6} + {36965158-c462-44e3-97df-cc8e8e3ac937} - {25b72f66-91f8-47d2-8bab-b3dc39c0fced} + {305bcba5-44b0-4054-a3b7-9de638b1010b} - {1e9d55c0-28f3-4fd1-bf50-8808a0bd4a06} + {d1f30468-df4b-4730-8edb-47c68c189c2d} - {2cc734b5-e6b6-4477-ab9a-1f659e13a7f2} + {60e9367a-4b09-4cea-9483-06581fddc456} - {0735a3d4-40a3-42a0-9da1-b1615f10dc7a} + {38db0bb7-771d-43f2-a66e-5f8f6d0bec39} - {60b037a5-d7a9-4426-964d-40bbe9551be0} + {045532be-04cd-45e6-b9e0-5709fc025e47} - {340caeb2-1d83-4246-a2ca-fa9400beab16} + {0d1c3da6-c4fb-416f-832b-f70c9c8eac24} diff --git a/XML/testsuite/TestSuite_vs140.vcxproj b/XML/testsuite/TestSuite_vs140.vcxproj index 6fdac1aa1..19026acd1 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj +++ b/XML/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs140.vcxproj.filters b/XML/testsuite/TestSuite_vs140.vcxproj.filters index a7884cc63..578b115f9 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {0e7ea722-a1ac-461d-877c-d526090b4ecb} + {d3934f11-15bf-41e3-935c-7e68abae860a} - {7d9915a8-2cda-490b-8029-9b3604590117} + {b8c94276-a16d-41f3-a21c-f9826a1c7ab3} - {67ee1e7f-5d9d-4d0f-ac5c-254c7d634d46} + {2c505517-52ba-42ae-a831-549e2f585f96} - {b9ad61e4-f07a-4461-8e72-ae966f532a55} + {b80e6a65-db70-426a-b48e-d3f429bd38b3} - {2396b7a4-47f0-4e00-96c0-32586047d252} + {63789afa-d62e-4267-8eac-16794fb41709} - {fec39900-c055-4e7d-ad6a-17fd480eeacf} + {45561e3a-cd18-4ac8-bb04-e2a81f9d0719} - {746a4676-ff94-4581-a268-54a9f41d1695} + {000b998d-7391-4757-9ec6-a44e00c97d61} - {ddfc0116-6480-49ca-ba36-42154e59f9d4} + {3edca753-3111-4026-8b4a-dad2b8fbb593} - {222b52f5-815b-40cf-a07d-ffe7a568fd25} + {8eee592d-549c-4c70-b632-4b886e24d80e} - {1a79f0a9-696d-4ff9-b7c2-f9bfd06b91d0} + {36775170-60f4-47e2-bbc5-bb7d5ee75327} - {88dae4b2-270e-40c5-a30d-c19e8ad6969b} + {bb22cfc4-82bf-4687-a500-6be5579c5afa} - {42cba3a3-d7f0-47df-9671-07f2e8c6b85f} + {e8b831dd-8c4f-4509-a746-c084d9520c0b} - {248225e6-43fd-4d72-8e6a-ee1650929ddd} + {45c2eb4a-21fe-489f-bf9f-401c19b75cd6} - {b7e5f5c8-397f-40e3-8af9-a99b33088287} + {c3cb420d-e745-484e-9b3b-df9ea58fe85b} diff --git a/XML/testsuite/TestSuite_vs150.vcxproj b/XML/testsuite/TestSuite_vs150.vcxproj index 2736669ea..5363e461e 100644 --- a/XML/testsuite/TestSuite_vs150.vcxproj +++ b/XML/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs150.vcxproj.filters b/XML/testsuite/TestSuite_vs150.vcxproj.filters index 3a73847c2..7a7eaa754 100644 --- a/XML/testsuite/TestSuite_vs150.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {8037835d-1d39-4ccf-82d8-7e187bd6b4ec} + {6d069662-a57c-4ac4-915b-3e9fb071f2a0} - {7d9ec53e-94fb-44bd-89d8-9da2dd2820c8} + {ee7f63b6-c9c4-43a1-8711-187a26f51da0} - {69f631f5-8558-4595-80e3-cf497e0e4e02} + {9c811545-d7ef-4e08-a9af-d8eea7af1a7c} - {7479a72f-620d-45e4-9631-f8d23983fe93} + {9c1f9521-0f2e-4f9b-a844-a337bbf70521} - {b8c536da-3cf4-4ae2-a94e-b6421019d007} + {0cfa27aa-39c4-46ed-ba66-af0d4a054657} - {9eea7c02-6846-4455-9d21-fd6a673e51c1} + {134cb5d1-23b6-4e46-a98b-07ff88379b9f} - {8018c02c-baba-4ddf-99a7-ca6bac02e7c4} + {642dbe89-f10f-4e95-9c25-951e622ffb2c} - {e1b87cbd-a413-46fe-8fe7-95334990d649} + {b4e93973-a73f-4061-8563-c8545552e2e6} - {89bba473-aa4e-417c-a1cb-4ffe0e457f2d} + {3dbf5538-f2ca-4e54-a1a1-e4732bec9c63} - {e541b78e-afd5-4a8e-a26c-f319d8330dd1} + {a40464e5-f877-4dfa-85b1-56a5092914f2} - {6925c011-a45c-4a61-aaf5-dc34557f29fe} + {ab820bac-4564-4c8a-88b0-748780893b06} - {f0934479-b603-4b87-afae-865351ecface} + {32f593c9-1e01-4302-81aa-0c18b77a35db} - {710290d8-0d03-44b4-8d81-2051c12b3889} + {cacdbfa3-cdd6-4c7f-b6ef-d2c6a33f13aa} - {cfdd9989-b5e1-41e9-a586-0a3c3ba1168d} + {b7c1d9ff-707f-40fd-8748-aecb49c53e0f} diff --git a/XML/testsuite/TestSuite_vs90.vcproj b/XML/testsuite/TestSuite_vs90.vcproj index 24f845483..767923c11 100644 --- a/XML/testsuite/TestSuite_vs90.vcproj +++ b/XML/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/XML/testsuite/TestSuite_x64_vs100.vcxproj b/XML/testsuite/TestSuite_x64_vs100.vcxproj index 0523a381f..0cc2edc67 100644 --- a/XML/testsuite/TestSuite_x64_vs100.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -356,7 +356,7 @@ - + diff --git a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters index 66bdcc703..270bd81f6 100644 --- a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {10135d48-f41f-4848-93b8-1d83e723b38b} + {a84548b4-9cfe-4193-8caf-e810adfa42d4} - {83df8f14-f6aa-4702-8326-1d6878a76648} + {2a97d651-6e37-42c5-8284-395027d89896} - {a599015d-c65e-47c4-8cd1-427af1b0dc27} + {50cccc9d-da09-41de-800e-3a3e12317b6c} - {96375bbf-2ab0-4923-b159-2f2d53c5815b} + {1c05f248-a089-4153-a578-92353e6c0bf5} - {5f40c38c-5f3d-44bf-b6b5-47ba332e7404} + {edd9b99e-dcf5-4a26-879d-bb0b48c39e96} - {955b4c52-eedd-4757-84fc-58886047fe26} + {25842a8c-3242-4776-8253-4da248df6c2e} - {c0cb3448-2709-4e36-b854-bc56840ed924} + {b4ae974c-99d6-4e2a-a694-c6fabe883f24} - {f1d5dd2f-bb04-4304-8fba-2dc9f590fcf0} + {23093d82-611f-42f1-a4d7-d6ee570a2380} - {8f9553f7-1f17-4127-ad8f-57a9f485af38} + {ed7667ca-e90f-4635-b061-f8b2fa29a883} - {a40fc7c8-fa86-4629-9c96-9f01c647c6f7} + {a27fe8a2-bbfc-4515-bbcd-a4004cbcbe93} - {e6ecdad6-49b8-4817-8cd8-80604c822d6a} + {9d94284f-e598-465e-9100-07b8467aa293} - {c5e465ed-302c-44ba-8c2c-591e7ebab4bc} + {ad6a9bc5-820d-484d-a0ad-c79389e2f204} - {2ff9604f-06f4-4ab1-aa55-3af4706adc4c} + {aa9a859b-3bdf-4cf0-afa3-530f184e8791} - {f834c4c2-b9af-413f-9dfa-871ef365fc57} + {88bd599d-d1e2-46cb-b120-6c975c539b16} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj b/XML/testsuite/TestSuite_x64_vs110.vcxproj index 5a4b796ae..f7d7884c7 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -356,7 +350,7 @@ - + diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters index 97d225377..01f7399c1 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {39fc8046-091c-4c42-a73e-4e678a7274e0} + {f2df1694-3ff1-47a7-b058-a8fe07b00ba6} - {f5c3217c-d893-48ad-9670-a45c1c8126b0} + {998bd4a3-7337-44ff-94bc-544577abb186} - {0a63622c-ee17-4202-9e5d-548fa25b3a11} + {0145688a-0633-4ccf-b996-667c360d4ddd} - {67ac7bc3-0250-438c-9ba4-6e80389fa412} + {b6fa4dc8-d9e6-4998-b255-11ec843a0242} - {414f159e-3f67-431a-bf4c-c9bb792945f6} + {a1cfb0d6-be05-4cdc-9a4d-9df7e9bf116a} - {2c6b01a3-6925-4e71-ac20-2a3ad6d4be7a} + {43740cf0-87fe-40b4-92b7-2b492bc08388} - {17b008e2-87ae-4786-a624-82ce844a3834} + {4714da0f-8b37-4e25-b712-47f4e929d10a} - {86d373b8-ca64-42b2-8c2e-bba970f0992f} + {f565c7d6-1b3b-425f-bf7f-0588570da57c} - {65c66bae-f435-4e97-a67c-1ed4517e86e1} + {3189591d-3d19-451f-9d6e-cac0592e50ee} - {ef422e31-8723-4779-bb71-b24262a5a95a} + {2a5c0416-7279-40b2-b11a-0f69829f86af} - {0ce7af63-978a-47b7-b0f3-e94325611abd} + {4d7d13a6-50fb-42a5-801a-c8d1c2030506} - {8105cda1-5528-412d-b8c7-d7672d61e926} + {93cf2385-46c7-4769-bfca-b70f633218c3} - {e0f519a2-4594-4642-8720-928c3c462950} + {6f5f069d-3979-4e4c-944e-63cd81fda541} - {6d5aedd6-5ba8-4981-8100-9439521e20f0} + {b5326d9d-f372-4562-96b3-5b6a98eaf143} @@ -173,7 +173,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj b/XML/testsuite/TestSuite_x64_vs120.vcxproj index b9c349563..319c32a36 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters index 605daa11a..290db8cec 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {5105b44e-f71b-48ca-9c68-b6875e261ab0} + {3bcab718-57a2-4ec7-bfa9-10af6bc28a0c} - {1ff0c60b-a19a-4545-bbae-621fd7c3b9db} + {2ab6926f-98b1-4f8e-a913-6fe890c0938d} - {c08a463a-e7f1-4e28-bfa4-ea9a2dc30b46} + {98b6fb63-c040-4f03-a6a2-22766809f67e} - {4c76f698-3449-4743-b7da-dedf512aa2ed} + {de9329bd-9b70-473a-8a96-42bc234d08ca} - {49a129e8-019d-420b-a391-95f8ace31654} + {32c20e1b-185d-4530-8ea2-266a2d0450de} - {9bce84e2-024d-4200-9c3e-4e7bdf7d8f1d} + {55f26cf6-f33a-4d7f-bce9-1e7b15df1a80} - {d51ab1ce-f70f-42ce-a65f-7c5b8d0619a2} + {85bbdcd0-97ce-42be-95e7-d5d2d7cba01a} - {d203a7a7-af67-4c1a-95bc-e71ab93e56d9} + {f6355313-5467-41a5-ba26-c9ebddaf5c07} - {8159f991-5f78-432f-b30f-baf8f3438dda} + {4b23497a-bddd-4235-8519-de89f48ce58b} - {76db7066-ffb6-4b98-96f3-cf7d0b4b41c2} + {5fcc4463-c4bd-46a1-8cb2-059d37f3cb26} - {9b1cf1e7-cde6-46a3-8229-b475d36504dc} + {43f54685-a859-4857-997d-5a3fa0fd13b0} - {b50379de-076d-4755-a064-7ddfc3cf5a0b} + {cef7cf53-dd89-4f27-a9d0-9bdc07a102a5} - {6bc3c423-a7dd-4652-98bb-dde153233b46} + {70f67539-5c64-43c0-adb9-06b6e8f4a4c5} - {846bcdb7-01b4-4da3-8f11-a184d3d40860} + {f7634d19-54e5-4afd-8310-36f5475bdf33} diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj b/XML/testsuite/TestSuite_x64_vs140.vcxproj index 73073c807..e9686ba01 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters index 02b775410..073e788e8 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {49ec1f10-108b-47cf-8d01-899fb3bf9268} + {ba64c252-bfd3-40cb-a4a8-9d234b533df7} - {9bb4f357-5c55-46fe-b969-ff00045c301c} + {5d4b6048-c18e-4ff8-bb35-b686d37945b5} - {d2cd0775-4ae0-4846-ad26-e95a0188181f} + {0f79729e-0a9b-42db-960b-1b563ebcf0cd} - {0aea3fa4-4d2f-4b9a-89cf-d77557f49883} + {2201c43c-a510-42d0-84bb-3f6a5c55a885} - {732c51ec-9141-4a9b-9fb6-91c1acf2514e} + {81802215-34d7-4b3b-b9b6-46a551065fff} - {a3a2af25-674b-4677-b50c-0754b45ba32e} + {96f2d460-9689-4281-8877-76217c4efad7} - {ec481651-8bc3-40d4-9ad0-919645bb5b3c} + {d5eb08e1-56c9-4824-8c9a-a7a59c038419} - {51758261-45bf-4e79-a280-0bc0dd2dcc9f} + {da9e0311-3605-4db1-b997-2c66784fb1db} - {b97f925a-c7b0-4e00-a348-98d4b3900537} + {fe2fe5ea-974f-4ab8-8c6f-18c29f5ef9d6} - {b19bfa8f-f7e4-4441-8564-61498ec5209c} + {11f774fe-01fd-4123-a67f-dacc18b56c2c} - {1edae3dd-641b-4924-8829-1faf70d0a32b} + {734ba72b-3f50-4f6d-adf8-5fb161f8849d} - {063c1a4a-04a2-4499-83df-810a278ab1cb} + {3326c325-2fd5-42f9-875c-f8fb7eb2797c} - {6f21fb96-19e4-4762-a71f-0a99aae87b59} + {c331b404-2130-4b64-abdd-314653a4b2d7} - {9b7abafc-65ef-47db-bdbb-3d73a2ad90ff} + {72ca046c-5897-4465-a541-437a33e2d894} diff --git a/XML/testsuite/TestSuite_x64_vs150.vcxproj b/XML/testsuite/TestSuite_x64_vs150.vcxproj index 48056f5b9..77e226b04 100644 --- a/XML/testsuite/TestSuite_x64_vs150.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters index 70967d909..54a0a208d 100644 --- a/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {f3ef02f1-1f84-48ab-b64b-a54076636bc6} + {1ad43907-cc16-4900-aa90-69bfd53873c2} - {62e562b6-ce97-4ac7-9ca9-d65a59465c60} + {d75fd86e-fae3-4a35-b3be-692a37fdfc80} - {e76a4983-c2ac-43d9-bfa9-1e8b3b2d36c2} + {fea8fb88-85d5-4e0a-bb61-5aae0c20876c} - {453a17b0-bb92-4bd8-96eb-5a7ec4518c79} + {c988262f-f597-4066-ad56-89aae4470311} - {9cc06edb-dae5-4859-ba75-05a79a45bd62} + {0dde166a-c65d-49ed-8d9a-f6a283d11263} - {d87b825e-8786-4d94-8b2e-b2759ec873d3} + {55e5c393-40a4-4b66-8145-db5f30a97f8c} - {b264a491-4f57-4419-9509-26bdafa8499a} + {064a2082-62bf-4a0f-bb29-b4418d3e0cf0} - {2c8db1a3-0ac7-4d98-a181-266d3bf67b85} + {56822025-ce3d-4caa-9987-cebc3cb23dbc} - {4dca9ba9-51ef-4164-b11d-1898dd639ea2} + {e0454944-2ac9-48b1-af2d-fc12241c53da} - {7ac987ec-f8b3-4939-9db8-84e5adfea2e5} + {ff729733-ffff-461b-bef6-63d1b1e50fdf} - {b65bd3b0-1975-452d-be06-6903b81b4172} + {32408979-0249-4fbd-8a9a-120a413e9611} - {738ec11b-6e47-4457-a6cf-693d56abdd2d} + {2d9e5b37-dbd0-40b7-b4d7-40e585e044c5} - {8c9d036a-374c-4843-b91a-1321f683807f} + {23b0c324-f478-4cad-b5a7-bd4b397963a0} - {6d053d28-5602-47a3-9541-766051cd7d77} + {de14dfd4-5df5-4a05-91a6-3d9ee9dd6dad} diff --git a/XML/testsuite/TestSuite_x64_vs90.vcproj b/XML/testsuite/TestSuite_x64_vs90.vcproj index ed3832733..c4bff1793 100644 --- a/XML/testsuite/TestSuite_x64_vs90.vcproj +++ b/XML/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Zip/Zip_WEC2013_vs110.vcxproj b/Zip/Zip_WEC2013_vs110.vcxproj index a7f13b2d1..86462a026 100644 --- a/Zip/Zip_WEC2013_vs110.vcxproj +++ b/Zip/Zip_WEC2013_vs110.vcxproj @@ -1,270 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V300 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - release_shared - SDK_AM335X_SK_WEC2013_V300 - - - release_static_md - SDK_AM335X_SK_WEC2013_V300 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V300 - - - - Zip - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V300 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>11.0.61030.0 - PocoZipd - PocoZipmdd - PocoZipmtd - PocoZip - PocoZipmd - PocoZipmt - - - ..\bin\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Zip_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoZipd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoZipd.pdb - - - ..\lib\$(Platform)\PocoZipd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Zip_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoZip.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoZip.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoZipmtd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoZipmdd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmd.lib - - - @@ -289,6 +25,29 @@ + + Zip + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V300 + CE800 + + + + + + + <_ProjectFileVersion>11.0.50727.1 + PocoZipd + PocoZipmdd + PocoZipmtd + PocoZip + PocoZipmd + PocoZipmt + + @@ -314,12 +73,7 @@ - - true - true - true - true - + diff --git a/Zip/Zip_WEC2013_vs110.vcxproj.filters b/Zip/Zip_WEC2013_vs110.vcxproj.filters index 51447b377..e208d79b0 100644 --- a/Zip/Zip_WEC2013_vs110.vcxproj.filters +++ b/Zip/Zip_WEC2013_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {2c6544b7-d872-4e7b-9313-faff3ba45cb6} + {d1a02a6f-c0fc-4f49-bad8-31a482fd7dfc} - {27e17c90-825c-407a-9c3a-0d8f3ffaa728} + {edeaec47-f1aa-4449-abb3-766a5dea2f27} - {cdce7a23-2384-4b68-b1c3-c93e6cd6aa30} + {a597f0c4-5100-43e4-82fe-eceb74d173d5} - {305d02ba-f2a0-4818-86c4-a1d31a79e79b} + {853fce8f-a5ea-43cf-a855-d28b2ff0a85e} - {0e8c71df-e625-4792-8488-665c0836f6be} + {270ccfe4-3b6b-4c9b-86bf-ca1dfe674be7} - {ad6fc33f-bb0e-443d-8b60-068b8d8a33c2} + {04a3eb85-2b73-4d63-9994-8c1c83533d30} diff --git a/Zip/Zip_WEC2013_vs120.vcxproj b/Zip/Zip_WEC2013_vs120.vcxproj index fc440f3d7..d8145266d 100644 --- a/Zip/Zip_WEC2013_vs120.vcxproj +++ b/Zip/Zip_WEC2013_vs120.vcxproj @@ -1,270 +1,6 @@ - - debug_shared - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_md - SDK_AM335X_SK_WEC2013_V310 - - - debug_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - release_shared - SDK_AM335X_SK_WEC2013_V310 - - - release_static_md - SDK_AM335X_SK_WEC2013_V310 - - - release_static_mt - SDK_AM335X_SK_WEC2013_V310 - - - - Zip - {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} - en-US - 11.0 - true - SDK_AM335X_SK_WEC2013_V310 - CE800 - - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - StaticLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - DynamicLibrary - Unicode - CE800 - - - - - - - - - - - - - - - - - - - - - - - - <_ProjectFileVersion>12.0.30501.0 - PocoZipd - PocoZipmdd - PocoZipmtd - PocoZip - PocoZipmd - PocoZipmt - - - ..\bin\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - true - true - - - ..\bin\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - false - true - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - ..\lib\$(Platform)\ - obj\Zip\$(Platform)\$(Configuration)\ - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Zip_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoZipd.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - true - ..\bin\$(Platform)\PocoZipd.pdb - - - ..\lib\$(Platform)\PocoZipd.lib - WindowsCE - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;$(ProjectName)_EXPORTS;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;Zip_EXPORTS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - Level3 - ProgramDatabase - 4244;4267;%(DisableSpecificWarnings) - - - ws2.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\bin\$(Platform)\PocoZip.dll - ..\lib\$(Platform);%(AdditionalLibraryDirectories) - false - - - - ..\lib\$(Platform)\PocoZip.lib - WindowsCE - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebug - true - true - - ..\lib\$(Platform)\PocoZipmtd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmtd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreaded - false - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmt.lib - - - - - Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - _DEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDebugDLL - true - true - - ..\lib\$(Platform)\PocoZipmdd.pdb - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmdd.lib - - - - - MaxSpeed - true - Speed - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - NDEBUG;POCO_STATIC;_CRT_SECURE_NO_DEPRECATE;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) - true - false - MultiThreadedDLL - false - true - - Level3 - ProgramDatabase - Default - 4244;4267;%(DisableSpecificWarnings) - - - ..\lib\$(Platform)\PocoZipmd.lib - - - @@ -289,6 +25,29 @@ + + Zip + {4AC75EAD-BFCF-41E6-AB1F-0DA203CC7C61} + en-US + 11.0 + true + SDK_AM335X_SK_WEC2013_V310 + CE800 + + + + + + + <_ProjectFileVersion>12.0.30501.0 + PocoZipd + PocoZipmdd + PocoZipmtd + PocoZip + PocoZipmd + PocoZipmt + + @@ -314,12 +73,7 @@ - - true - true - true - true - + diff --git a/Zip/Zip_WEC2013_vs120.vcxproj.filters b/Zip/Zip_WEC2013_vs120.vcxproj.filters index c1c619166..53dbc9fa9 100644 --- a/Zip/Zip_WEC2013_vs120.vcxproj.filters +++ b/Zip/Zip_WEC2013_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {b34d52b5-9fe8-4d95-b2c3-a22093ba31f9} + {110ab9b3-80f2-4d49-b075-570521391251} - {792473f2-a8d7-48fa-9d7a-9b5461439019} + {0a0dd290-9872-4bf8-b27c-6a3dafec59da} - {d638af65-cf55-4010-849f-6726f69516bd} + {4e97a51d-838f-4557-a496-541b42fa953d} - {94eee214-8255-4058-af0e-6a173fd01fcb} + {a4beb54b-a5ba-44d9-9091-cf045e4f2d29} - {0e5463eb-98a3-4c7b-9476-898f6144d11b} + {f687b551-9d2a-44e9-8ae7-3e45705bb9c6} - {e46db8a6-b37a-4f43-9aeb-a70ac4a66db4} + {0f3bf383-6683-4b75-941c-c94568dc3f53} diff --git a/Zip/Zip_vs100.vcxproj.filters b/Zip/Zip_vs100.vcxproj.filters index 962f9a9d7..7bd682f51 100644 --- a/Zip/Zip_vs100.vcxproj.filters +++ b/Zip/Zip_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {e94aa689-bc37-4ca6-8adf-89c93b6c6643} + {cb75c7b9-06aa-4ec3-b0ea-711c4c19bd73} - {ee2bbf3f-a7ef-4009-b95a-624fc27d7e7c} + {28b5f1b8-0f0b-4c41-92ac-0cd68f24d619} - {9f62c57f-812e-42df-862b-0e120eae94c7} + {b124a6f4-861c-4daf-850a-c5737a9fc9ea} - {36b4d4e5-67fd-4306-947c-6b0b3bb6bf0e} + {aa7949ea-ba83-4e43-ab5a-f0d8a7ca308e} - {3d39cd61-abcb-4b04-86fe-e31345f3485b} + {33ab294f-cb9f-4640-aae5-fc194862e9e4} - {3b03465c-d250-478e-a6f9-b110dad2c24c} + {407e754c-d84a-4e6c-9299-6751a4df470d} diff --git a/Zip/Zip_vs110.vcxproj b/Zip/Zip_vs110.vcxproj index 4f416641f..53ba741e5 100644 --- a/Zip/Zip_vs110.vcxproj +++ b/Zip/Zip_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoZipd PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_vs110.vcxproj.filters b/Zip/Zip_vs110.vcxproj.filters index 72db9af01..f11fff928 100644 --- a/Zip/Zip_vs110.vcxproj.filters +++ b/Zip/Zip_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {943d031f-1175-400a-96d1-d1c598aa7089} + {84412e8e-e003-4107-b4e2-88756ed65e6f} - {08357dfa-b0e0-4f1e-9e63-8ba46ca2fd60} + {6c3b9282-f45f-498b-9b36-e41c0f1f0d81} - {6d39f78f-21ab-417a-b970-5b7310317ed4} + {c3ffe937-e3c3-43a2-822c-8da6e0f0bb49} - {35383966-02ff-4240-9fdb-ad30a5f1b2ce} + {40d7e842-f892-45a4-84c1-e12cb3fa3cf8} - {f6980317-7cf7-46e6-aad8-89639060abfe} + {065f4c48-1aa7-4f08-8878-0011276579fa} - {0c8c3287-e413-4854-9e62-474117fc3cc3} + {d2283aba-29dd-4645-bea0-2d1972a37031} diff --git a/Zip/Zip_vs120.vcxproj.filters b/Zip/Zip_vs120.vcxproj.filters index ac3aae0a7..ce6bb560e 100644 --- a/Zip/Zip_vs120.vcxproj.filters +++ b/Zip/Zip_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {fc8b7d00-c445-4144-86b2-c4f9af5f7055} + {98afb71b-7f41-40fd-a3d7-f50543f40431} - {5e35c17e-4669-4dad-979e-d8602c5a7b92} + {6fa41631-039c-4a15-b6f2-3f12d80ce6ba} - {24cd7923-bced-42bc-bf35-54da06d88f50} + {4692f643-c721-4899-a05f-868a4064aa6a} - {d1a787ca-ffe1-4a2b-aa01-b50af5d58233} + {26507ab3-9506-4be1-98cb-6b065a125969} - {16560866-89fc-4376-8778-50cb0543c06b} + {18b2045f-af8f-4029-8be7-276f100bae38} - {85ee2d13-1549-4f8e-bffa-a0d5ad98f66f} + {94094d0a-9036-49bc-8f0c-11131fef1245} diff --git a/Zip/Zip_vs140.vcxproj b/Zip/Zip_vs140.vcxproj index 66ca53914..560ab9664 100644 --- a/Zip/Zip_vs140.vcxproj +++ b/Zip/Zip_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoZipd PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_vs140.vcxproj.filters b/Zip/Zip_vs140.vcxproj.filters index b1ec6188c..6cdfa6544 100644 --- a/Zip/Zip_vs140.vcxproj.filters +++ b/Zip/Zip_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {e15c4a02-3978-4128-bf68-e3ec8a779aa9} + {a225fa25-36f8-4a9c-be06-516a501683a5} - {847355cb-eeda-4044-887e-accb64c2b28d} + {02debdcb-c791-493c-92b4-fa6a0000122f} - {fee18054-2296-4d91-af80-8e379f99a4c2} + {d87ffe71-98dd-4eb1-a4ce-1b3e53e307b7} - {73dac17b-f73e-4b32-beff-531fb1ec0de0} + {09fc816a-f797-4b71-a9b5-0b04e9339f54} - {864e466a-4caa-4890-9a30-ce0882b4071a} + {7cb12d60-7f0b-441e-b855-907ddd5f1c18} - {e535f518-43da-466c-acaf-064874107e58} + {eb9492f3-570d-4f46-9514-f0c078af650a} diff --git a/Zip/Zip_vs150.vcxproj b/Zip/Zip_vs150.vcxproj index 674656815..589b4beca 100644 --- a/Zip/Zip_vs150.vcxproj +++ b/Zip/Zip_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoZipd PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_vs150.vcxproj.filters b/Zip/Zip_vs150.vcxproj.filters index b1ec6188c..4876fda78 100644 --- a/Zip/Zip_vs150.vcxproj.filters +++ b/Zip/Zip_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {e15c4a02-3978-4128-bf68-e3ec8a779aa9} + {c87bdc63-c038-4535-98ed-9380dede6293} - {847355cb-eeda-4044-887e-accb64c2b28d} + {80ca5538-ad9f-4ae7-b8e1-9b6b778e7c2e} - {fee18054-2296-4d91-af80-8e379f99a4c2} + {e91fc434-8e7b-4ae6-b159-bbacdd16654d} - {73dac17b-f73e-4b32-beff-531fb1ec0de0} + {8ce2115b-9c25-4cdc-924e-0c9394d99cf1} - {864e466a-4caa-4890-9a30-ce0882b4071a} + {08115d1a-58bd-4bb8-bbb8-df6fa11b689c} - {e535f518-43da-466c-acaf-064874107e58} + {5f84fcb7-fa8f-44b5-a92e-f1424c24aebc} diff --git a/Zip/Zip_x64_vs100.vcxproj.filters b/Zip/Zip_x64_vs100.vcxproj.filters index 7513570b0..7f47e17f4 100644 --- a/Zip/Zip_x64_vs100.vcxproj.filters +++ b/Zip/Zip_x64_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {99887167-bfcc-4610-b27f-eb89861357a2} + {9b6b46a7-8ade-4362-8e00-9c1887e93d96} - {4365f8b0-c908-425a-a885-af2f6fab7232} + {b484de33-6aed-4df1-b72c-deabde1ecf6c} - {95b51a99-eec3-4998-a5c5-0c0ebed23730} + {ca762354-eb49-4e2e-bc4b-200dfaaf805d} - {e80f3200-6e1d-401b-91d9-aa84639c90c1} + {657ce51f-b1dd-41dc-b85f-e0df2a5f4d8f} - {0c9c96fd-e666-45d5-bf90-a7a96948eb53} + {a67ee823-9e64-4ebc-b72d-510b1ba7fc58} - {1b2485d5-44ac-4aa9-a19d-b5eea593f244} + {a12df83a-85f6-4877-8037-a2ea8ab5df84} diff --git a/Zip/Zip_x64_vs110.vcxproj b/Zip/Zip_x64_vs110.vcxproj index 3c4f15d6a..f969006be 100644 --- a/Zip/Zip_x64_vs110.vcxproj +++ b/Zip/Zip_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 PocoZip64d PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_x64_vs110.vcxproj.filters b/Zip/Zip_x64_vs110.vcxproj.filters index 9fc45e574..a4050e9b6 100644 --- a/Zip/Zip_x64_vs110.vcxproj.filters +++ b/Zip/Zip_x64_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {5e358403-c2d2-4d14-9c7d-7906cab2c3b4} + {eadf927b-85fc-43bf-ade0-29dfac275d15} - {478c0b62-3079-428d-b630-963b58dbbd57} + {8b206a17-e623-41c0-9b04-7c06c7c5bd25} - {589a7435-a37e-4e54-9613-eb1c917ac40d} + {9493781c-3bc1-42c2-9915-7f09571b0266} - {08ca1005-b7a9-406e-8625-9a028fe8146c} + {3b4fe865-dc3d-493e-a83b-2a619d4c37d3} - {3365f7d3-fa5d-42b2-8021-ebf435008ff1} + {5de5f36c-f96b-47f0-9ae3-08191be0ed27} - {b2c0aa04-8a57-4cfa-ba1d-df0e404a1bcb} + {7ef168ca-ac01-435c-a8eb-1aeb1ff972ca} diff --git a/Zip/Zip_x64_vs120.vcxproj.filters b/Zip/Zip_x64_vs120.vcxproj.filters index 0db0e0808..0b7275742 100644 --- a/Zip/Zip_x64_vs120.vcxproj.filters +++ b/Zip/Zip_x64_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {ac050b6f-3abe-4821-86a6-cb3d6729cd05} + {7945672f-fec1-478c-b36b-9c07479f3b7b} - {c9af77a4-2548-410e-b6ed-e51137df1fb7} + {042c3175-04f0-4800-b38b-2a880f4446ee} - {e4203fa7-9665-4f79-9bf9-3cb8a4f7f749} + {c4a19024-1a09-4196-af44-2d9c992f1997} - {d1625f55-fd59-4a95-ac29-4c4513861998} + {3f2d939d-0f9d-4cc6-96c6-b786adecaded} - {9fedc1bb-57af-4b9e-aa4e-ed0b9d1dc8bb} + {e9959d67-2692-461c-8d2b-4e157a3872ff} - {454be31f-0f69-453d-8889-3aa03af68bd1} + {e9dfa6f8-32d6-4302-a034-94d7511c5d91} diff --git a/Zip/Zip_x64_vs140.vcxproj b/Zip/Zip_x64_vs140.vcxproj index 635ea2d0a..2e75abbba 100644 --- a/Zip/Zip_x64_vs140.vcxproj +++ b/Zip/Zip_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 PocoZip64d PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_x64_vs140.vcxproj.filters b/Zip/Zip_x64_vs140.vcxproj.filters index 8822ba1ee..6d940f9d4 100644 --- a/Zip/Zip_x64_vs140.vcxproj.filters +++ b/Zip/Zip_x64_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {d36a4659-98ba-485f-91b2-a4115f68f3f5} + {0a722771-b500-4053-9539-8b000011f772} - {85300353-282e-40b8-84de-25e771799d2a} + {20f2800c-039e-4527-bdf0-9f05606c2122} - {af6984b5-3df1-4331-ba41-2e64dc15dc94} + {603c1d75-8f33-4014-9e15-5e344de92191} - {61090b44-c9bf-465f-947f-6148f9980f18} + {d9359645-0ad3-4225-bf9e-44dfa7873021} - {f8074bd7-23d6-4571-898c-928e6b80d7ba} + {f59ea5ce-9ade-4a10-9cf6-b11cd7ef1f57} - {9da1cef9-7afa-4ed6-ba83-3bfc88c702db} + {e0d280f9-894f-42d2-96d1-c5d5bb67a465} diff --git a/Zip/Zip_x64_vs150.vcxproj b/Zip/Zip_x64_vs150.vcxproj index 23ceec60b..2e0551994 100644 --- a/Zip/Zip_x64_vs150.vcxproj +++ b/Zip/Zip_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 PocoZip64d PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_x64_vs150.vcxproj.filters b/Zip/Zip_x64_vs150.vcxproj.filters index 8822ba1ee..a78674bfd 100644 --- a/Zip/Zip_x64_vs150.vcxproj.filters +++ b/Zip/Zip_x64_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {d36a4659-98ba-485f-91b2-a4115f68f3f5} + {3fa02bb9-741c-4058-b7a8-344627605d90} - {85300353-282e-40b8-84de-25e771799d2a} + {2f30e8c2-2b19-4f61-812e-6fe32f235675} - {af6984b5-3df1-4331-ba41-2e64dc15dc94} + {bc4cc460-d50b-4dac-84bb-fa61546fb9ad} - {61090b44-c9bf-465f-947f-6148f9980f18} + {ff2af659-4441-4aec-b856-0eb75e9576ae} - {f8074bd7-23d6-4571-898c-928e6b80d7ba} + {8866df4a-7eeb-4d59-bb20-c0837c900bcb} - {9da1cef9-7afa-4ed6-ba83-3bfc88c702db} + {89ca77c1-3610-46f7-9b5f-b0f629981dad} diff --git a/Zip/testsuite/TestSuite_CE_vs90.vcproj b/Zip/testsuite/TestSuite_CE_vs90.vcproj index 3ae7124c4..422d2e126 100644 --- a/Zip/testsuite/TestSuite_CE_vs90.vcproj +++ b/Zip/testsuite/TestSuite_CE_vs90.vcproj @@ -204,7 +204,7 @@ + RelativePath=".\src\Driver.cpp"/> diff --git a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj index fb62cb07a..62cb2f179 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -34,7 +34,7 @@ - + diff --git a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index d6a09231d..e2c4077d9 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {77c6f3d2-eb29-4b0a-b43f-daa8d0bebd75} + {ae1ed282-17b2-4239-830c-39c3685b2081} - {9df8321c-ff8e-4eec-bc8d-8cdd7f1fcfb2} + {ae3ac6bb-a43e-46f9-8ecf-330ed43d5d9c} - {70bfdc12-1585-4e04-8733-1d83ec06a8c4} + {9eb979c2-98f2-4d7d-9767-0f6f9fbfecc8} - {c7efbe16-8dea-4609-8e31-63c6c07151f8} + {c15925d9-1af6-4d06-ac3f-5363cb999023} - {bdc02b7e-a5cf-4088-bc36-13f5e6ea72d4} + {1c1efa3e-dd84-4f30-9dcd-efa956b7f4cc} - {5489ff72-1dd4-45b4-b73c-fd7a7343d4bf} + {557fd314-2f6e-4356-a835-871c14f9817c} - {70682bd4-699e-4b20-bd0f-eb45c56348f2} + {87f4830c-a036-45df-ac28-61613647221b} - {ec9b8eb6-f122-4adb-98c4-afdfad80c0d1} + {c78a6c63-d285-44e2-9007-b4312cc7f7c2} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj index e0453b1ae..18e90d799 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -31,8 +31,8 @@ + - diff --git a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index b7f8f0147..7b2e9f543 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {0629ff53-3a7f-4eaa-811c-6d2c6f9cf837} + {25cd9a0d-47b2-4bfe-8ee1-a1b24c686152} - {5c5ee6f4-5871-4406-bd1c-b37db6e4f8f8} + {c7051196-7809-43e3-9101-b5cfb506e3cf} - {95d32e57-c534-4c09-b389-56fd4220acc5} + {010977b5-1c3c-461a-be1a-9dec0e090bc9} - {28e53fc3-4760-4beb-b254-7d6bb0207130} + {c915ac3e-a581-4295-84d4-49db60d52bfd} - {c655b84a-ce54-423d-a06e-9389c413e942} + {b5384e66-d441-424e-a107-37f2ff23a455} - {1c4dfb67-d27b-4bb2-b99b-d7697a22e766} + {b8be503b-dc1e-4ece-9242-66d2f915a822} - {d26c7e7f-02c9-4aea-8a34-d18e56bee46d} + {6214cd57-359f-4540-aa57-40faac54ce41} - {1936879b-f99f-4112-8d7c-225de4fe5b4c} + {bae95f62-0bb4-4c04-af28-33a6d29266b1} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj b/Zip/testsuite/TestSuite_vs100.vcxproj index 673b18307..54728f901 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj +++ b/Zip/testsuite/TestSuite_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -322,7 +322,7 @@ - + diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_vs100.vcxproj.filters index 0f2efa6fa..691a15ac9 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {331cbac9-892d-4747-a084-9597843a77cc} + {c5e26f6c-3326-4549-a8e6-985726e2663e} - {5df447b4-6a2f-46e7-a8a6-a97fe5f7cfbe} + {dc2a8990-19a8-425b-a450-827b6f1bbd3c} - {9cc453c1-d602-4356-8a9a-a5e433215df5} + {8eb4139b-8c75-4850-b80a-19e424995f0c} - {158c8a6f-4ed7-43e4-a9fd-483df097633c} + {2f4433cf-3b0e-431f-a6d5-055f7c00a633} - {3edb0dfc-b86d-4c30-83a1-4294580e0956} + {fa808b64-cc1d-47ed-80e1-ff898fc97fc0} - {e26215ca-bd09-4b78-8d6c-a8f53a6ee488} + {763cffa8-f3de-459a-9da4-6baff8a2a682} - {d6840b1c-9f25-4f5b-9a76-b22a90d8c25b} + {d3367620-e136-42c0-b462-bce743930088} - {34950141-0dc9-4b1b-a8d8-2f435efd97fa} + {0b25ad5e-f169-492e-a467-e8d607e4338c} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj b/Zip/testsuite/TestSuite_vs110.vcxproj index 99898a13e..251928fb1 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\TestSuited.pdb - Windows + Console MachineX86 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb - Windows + Console MachineX86 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX86 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true bin\static_md\TestSuited.pdb - Windows + Console MachineX86 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX86 @@ -322,7 +316,7 @@ - + diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_vs110.vcxproj.filters index 372ee9673..472be4e30 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {51946dc2-d5a8-4942-9d40-390454a2de06} + {68bd3012-2c2f-4298-a049-76e44f13b381} - {74fa94f0-97eb-4831-9cf5-3756715e7e11} + {a8bc29f3-4024-47ab-9b34-719745b9ba63} - {18344877-ebc6-4ee7-8b78-3a6ea0bc86b9} + {e4b20a01-2862-4213-80ac-c75c1d4213de} - {2d7b9cac-6de8-4287-bd48-6ae1b9e05b13} + {53c5d8ba-6ca4-45a4-a0e8-08f52a593f7c} - {597f6f3c-fcfd-4500-b2c2-6bd9428700c9} + {46dfb955-70c2-4401-9d00-205baa4ddc85} - {0e02c11d-c8d8-4833-a4f7-8bc3f6ecf33b} + {2038ce0e-1022-4c3a-a72f-613de583dd45} - {5216090a-2c10-481d-91a7-57ab782b2a8c} + {039f196d-2851-470c-9ce7-e3f64778735c} - {a2890c8f-4b25-4b95-ab2b-6ae1656ff568} + {af47f85b-21bf-4346-8bba-fc141fabf149} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj b/Zip/testsuite/TestSuite_vs120.vcxproj index bcb72d427..ab6adef42 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_vs120.vcxproj.filters index dbc5c2a3d..fb1afdbe2 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {c80f0975-02cd-4f43-8de0-569a27311d38} + {94ec0826-f740-41f9-81ee-86028b087f72} - {6d5bd8d6-92e8-4e6d-bc50-388b6352e57f} + {394dbd38-a0fa-4d02-9cea-acbc2691ad65} - {16f706b3-dd09-4363-a016-6a29b1016190} + {86f61256-ccfb-4753-8502-7ad1aca78334} - {e72e339d-e2a9-4ec6-83eb-dfed2978f5df} + {8ffda914-61a0-49f4-b40e-47360e18faa9} - {44a452b1-b6a1-4213-ab17-fdfd8ba16cf1} + {7984c006-f975-4634-acbe-a751cf08c14d} - {ccd5de28-2664-4fbe-bce0-9c592b697f2b} + {480abcb3-c75f-40d9-b1c6-8f811bab0f52} - {4178c7d7-5c31-41e7-93b6-1695676fcb95} + {06703a13-c8dd-4786-8986-4096528077ce} - {0ff192fb-a5aa-413c-ab9f-f828c1cd6b5a} + {8ca1238f-c02f-4571-b2dc-ec888c83a10d} diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj b/Zip/testsuite/TestSuite_vs140.vcxproj index 19a90febb..ca59b824c 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_vs140.vcxproj.filters index e42e3444e..6d64d7fde 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {30a8dd72-9c86-49d1-b278-2527e4366c9d} + {d978fde3-8328-48f1-9f69-92cfc60ad782} - {a2dd8f4d-8e1b-4b36-904e-4fdc302ad080} + {a19a1ba2-4d66-4e2e-bc1f-b652ed402e3c} - {c309c134-a52c-47df-ad2d-9d68ae81930b} + {188d6ed1-9a8e-4f51-8df9-d37e364520a8} - {ff8dc211-9aa7-4a22-b4a0-faf3d5bf5bba} + {895e6705-8cb7-4978-981f-4c79860049d6} - {56ee78d1-b1e3-42e3-a846-78c736e5217c} + {f23a89b0-20a5-48e0-984a-6e777e1a9b7c} - {a44965ce-cde5-44e8-b6ca-dcb9ddfff2d7} + {65a1df6a-e3c2-4ed7-ae2b-149135f639dc} - {4c6414d3-27d3-42e6-971c-16227ffc8305} + {5cd70a0a-a03b-40d7-b325-b5ab3f50447f} - {f5c18bf6-2f44-4dcb-91c6-f4dfb20a011e} + {909ef0d6-cf67-4119-b22d-5a5b6774ee1c} diff --git a/Zip/testsuite/TestSuite_vs150.vcxproj b/Zip/testsuite/TestSuite_vs150.vcxproj index 41c0780f2..a01659c17 100644 --- a/Zip/testsuite/TestSuite_vs150.vcxproj +++ b/Zip/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs150.vcxproj.filters b/Zip/testsuite/TestSuite_vs150.vcxproj.filters index 6aa5ec789..f7b9650b3 100644 --- a/Zip/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {24d029ac-a9a9-4806-8cad-01ed44086412} + {83f8c7d9-4978-496a-838b-4ad063f56ca0} - {0a62114d-253d-4bc0-99f3-2425b04d0f66} + {9287807d-a2c8-4b82-92f2-400ec14b4d6b} - {78983c25-b8b0-47f8-af21-1e8575b6fa1d} + {7aa42506-cd24-4a7d-a01b-9b405380dc58} - {d1846f3f-450d-4e10-a4cb-40437ee17281} + {4ad7621e-8b99-4c8b-a1c7-3e2f77716419} - {555b67f8-fa16-43e5-85f6-4db97075bfa5} + {26c5d9ad-d472-4762-8f5a-24f526d31931} - {c85bca45-0d01-49c3-b0b3-e002f4390fd4} + {06715e96-a82c-4169-8c0f-e83392f9d580} - {9aa442f1-7bd3-4847-8d7b-bb02197c76a9} + {92b9ebca-bc16-4d22-84aa-7fad8c683057} - {176f4cd5-0a5a-4bb6-a6fc-a99100cc2b5a} + {3f618fba-2920-4ef4-b944-c4cbdcd45d94} diff --git a/Zip/testsuite/TestSuite_vs90.vcproj b/Zip/testsuite/TestSuite_vs90.vcproj index 729e41594..e3f7916f9 100644 --- a/Zip/testsuite/TestSuite_vs90.vcproj +++ b/Zip/testsuite/TestSuite_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj\$(ConfigurationName)" IntermediateDirectory="obj\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> diff --git a/Zip/testsuite/TestSuite_x64_vs100.vcxproj b/Zip/testsuite/TestSuite_x64_vs100.vcxproj index 30caadf7d..9bfd63809 100644 --- a/Zip/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,13 +132,13 @@ %(AdditionalOptions) - WinTestRunnerd.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,11 +166,11 @@ %(AdditionalOptions) - WinTestRunner.lib;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,14 +198,14 @@ %(AdditionalOptions) - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,12 +233,12 @@ %(AdditionalOptions) - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,13 +266,13 @@ %(AdditionalOptions) - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 %(AdditionalOptions) @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,11 +300,11 @@ %(AdditionalOptions) - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) + %(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -322,7 +322,7 @@ - + diff --git a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters index dd2d99196..eca8139f3 100644 --- a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {a9399d9e-4ffb-40b2-9fe3-6f10c38e54ab} + {411090ac-87c8-425b-97ca-14662bbe3ee3} - {37e218f1-a14a-4b96-aa14-d08a9639b598} + {e4db1681-95c0-421e-a407-765c7195d5eb} - {6c3081bc-16d9-4af2-8c8c-5482508a9337} + {5dbb5f11-3499-48e3-9ba1-2d19053d8f8d} - {24d1a4be-4749-4cce-9377-271256d723e0} + {e03c7aae-fc2e-4d57-a495-e1b2bc2f07c4} - {50d8408b-0924-451c-91ae-9d807dd4374f} + {72c31131-9c21-4780-87b9-d0491cba5841} - {e1342d2c-a32b-4638-b4dd-8bfcf3b2ee57} + {93dc2a5b-5530-4e3d-8972-aea76ca5d8a2} - {e4397152-d0b2-40b6-b4a5-150bf0cf0896} + {f444428e-fbdd-4915-8f02-101420510d80} - {53d35dce-0494-450a-9452-34478b42bef5} + {da175fb8-6ef8-487c-b6d6-2a7777d18738} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj b/Zip/testsuite/TestSuite_x64_vs110.vcxproj index c651a0ec3..76d6bb560 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,13 +148,12 @@ Default - WinTestRunnerd.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\TestSuited.pdb - Windows + Console MachineX64 @@ -165,7 +164,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -179,11 +178,10 @@ Default - WinTestRunner.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -192,7 +190,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -208,14 +206,13 @@ Default - WinTestRunnermtd.lib;iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb - Windows + Console MachineX64 @@ -226,7 +223,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -240,12 +237,11 @@ Default - WinTestRunnermt.lib;iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) false - Windows + Console true true MachineX64 @@ -254,7 +250,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -270,13 +266,12 @@ Default - WinTestRunnermdd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true bin64\static_md\TestSuited.pdb - Windows + Console MachineX64 @@ -287,7 +282,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -301,11 +296,10 @@ Default - WinTestRunnermd.lib;iphlpapi.lib;winmm.lib;WinTestRunner.res;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false - Windows + Console true true MachineX64 @@ -322,7 +316,7 @@ - + diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters index 1fa15406b..49396f57b 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {4e3bbdbe-368f-4311-99d2-5dc2dbfdb881} + {f870a422-f798-4906-9833-f5d01e072a7d} - {f1d1c049-9414-4dba-94a1-5edbd7bec63a} + {5fc5dc74-9e61-4364-b693-5ff6335c9c8a} - {9e1ccf03-0857-438b-ae50-2db503faf2f7} + {b1b8e262-c617-427d-b4ea-b305166a13d1} - {f03b9ed7-a45d-491d-9ed8-c2436b66f1bf} + {6b9f6d4d-14c6-4810-aa74-fe4cc47a8951} - {65cc6687-a9a3-4914-bc82-77febac5c400} + {228887c2-ecab-4c01-aea3-27993c140b77} - {51e9a058-905f-4e58-b39a-3254f138ad24} + {34c03c8a-3908-4281-9f27-159cf4de89db} - {687327ce-951c-45c6-b56c-13f88595461a} + {151be59f-3a29-42b3-ac74-17044a84f8a3} - {a21e65ea-8045-4427-9099-6d4bf95fc789} + {3bf91ee8-70e4-4e46-b1fa-f7838fdd7281} @@ -53,7 +53,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj b/Zip/testsuite/TestSuite_x64_vs120.vcxproj index b739c6c97..121b7224a 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters index 2f33c2722..b052fdfbc 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {a1bf20d6-5365-4348-b1d4-307cd9db1b95} + {c846a5d1-f70a-4936-b4f9-76ef2a9fdf8a} - {d85385f3-1119-4331-ad35-4877bd9d6a29} + {95701a24-79fa-4895-9576-c32420775283} - {84327839-82af-4e21-a415-b4531721069c} + {39708ce9-b1c6-4a9a-9db0-32b4a426a401} - {7ef473fe-ca6d-4449-9add-749c795b2c91} + {69ab9214-4bde-4c90-b3f9-62d934f0e483} - {185ff58b-0c85-478e-935d-266910d0b327} + {47d343d0-402a-47a7-92d7-0f4187c1d7f4} - {fed3826a-1f34-45e6-a40d-df1177385b41} + {e9c91556-264b-42f3-9f9d-eb459a349ac6} - {9e6009a9-3e66-4f0c-aab4-0d8fcd407714} + {26e1b5c2-a765-4595-88c1-a8d0720eb9eb} - {be788d03-2728-4b5c-90d8-204fd931b927} + {e1cb6f8e-0408-43b8-8cb5-0d3d75f4f4a9} diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj b/Zip/testsuite/TestSuite_x64_vs140.vcxproj index c4ff158ad..37e1e9aa2 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters index 8b9cd4088..caf7aba19 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {a3bd6b21-98d0-4c9b-8a47-d0930721eafb} + {d14bf5a1-d590-4080-93eb-5815a23ea7f1} - {55cd137d-0a26-4f73-86c6-ab4edf925ccd} + {186b94cd-1203-4d92-a5d0-5f3d54b3a81a} - {d808404f-6a4c-4b74-878f-241adc1857f2} + {aa7bed5c-dd51-468d-ab64-967edf5e9c1d} - {ef235db5-e5ba-42f8-ad4e-597e65306f9b} + {cfd01fb9-1aba-4374-8004-8518326e0e11} - {b069fa4e-e1fd-407a-899d-8e3f9ca6cc8d} + {3d2f2595-f144-4f52-bb25-72cc17550764} - {7bb4332f-49f5-4f75-b8bf-f5dc2f398fd4} + {15fabc1e-eca3-4c30-8d52-d29601221b22} - {0a3edf65-e477-450b-b2b1-f16171d1d29a} + {2c643ed9-ac80-412e-a1bb-30cd66e4a766} - {82eda073-3f2b-4156-84ae-92c71e2234c4} + {bf6327d1-f237-4321-97eb-c7318e5191ee} diff --git a/Zip/testsuite/TestSuite_x64_vs150.vcxproj b/Zip/testsuite/TestSuite_x64_vs150.vcxproj index ec28137ef..3068d608b 100644 --- a/Zip/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,7 +142,6 @@ Default - %(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -159,7 +158,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -173,7 +172,6 @@ Default - %(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -186,7 +184,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -202,7 +200,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -219,7 +216,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,7 +230,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -246,7 +242,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -262,7 +258,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -279,7 +274,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -293,7 +288,6 @@ Default - iphlpapi.lib;winmm.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters index d519010f1..0fd2290f5 100644 --- a/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {d98465c1-79c3-46e5-934e-d41635233fd0} + {c6f3a6d6-6517-44ce-a046-e9cc44b645a1} - {fe16d351-1494-4539-a3c1-0436f0e76fba} + {b4c5bebc-1186-4160-86a2-6e03b04e3a29} - {f7e24606-b3bf-4221-8732-85102751cd70} + {80b1306f-6b18-412f-9536-963775714c18} - {442a2893-7c71-40ea-bda0-07f60f3a6d6e} + {f0263a5d-0351-4116-aa9b-fa83065ff3a1} - {0ab1308d-b980-4706-8699-189b3603b969} + {3e2ba1bd-1355-4218-a106-187137d2cfe0} - {990da6aa-4b52-45e6-bcf2-d9460de235c8} + {9dff3010-b037-40c6-8a76-f43ffbbf7594} - {77cf8796-a24e-4b5e-bd95-138155c564d5} + {4d194834-a372-43fb-b4c4-e47c59b2217b} - {80d80cb0-c8ed-42bd-adc3-baef82b797e7} + {b9cb251f-5e8e-48ea-849c-1f8810ed5b0e} diff --git a/Zip/testsuite/TestSuite_x64_vs90.vcproj b/Zip/testsuite/TestSuite_x64_vs90.vcproj index e19c42b72..61bf9e538 100644 --- a/Zip/testsuite/TestSuite_x64_vs90.vcproj +++ b/Zip/testsuite/TestSuite_x64_vs90.vcproj @@ -17,7 +17,7 @@ OutputDirectory="obj64\$(ConfigurationName)" IntermediateDirectory="obj64\$(ConfigurationName)" ConfigurationType="1" - UseOfMFC="2" + UseOfMFC="0" CharacterSet="2"> @@ -32,7 +32,7 @@ @@ -106,7 +106,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;" StringPooling="true" RuntimeLibrary="2" @@ -129,12 +129,12 @@ Name="VCPreLinkEventTool"/> @@ -174,7 +174,7 @@ @@ -249,7 +249,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="0" @@ -272,13 +272,13 @@ Name="VCPreLinkEventTool"/> @@ -318,7 +318,7 @@ @@ -392,7 +392,7 @@ EnableIntrinsicFunctions="true" FavorSizeOrSpeed="1" OmitFramePointers="true" - AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include" + AdditionalIncludeDirectories="..\include;..\..\CppUnit\include;..\..\Foundation\include" PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;WINVER=0x0501;POCO_STATIC;" StringPooling="true" RuntimeLibrary="2" @@ -415,12 +415,12 @@ Name="VCPreLinkEventTool"/> + RelativePath=".\src\Driver.cpp"/> From d603a15b8d43b6b221880000d20c597ee93e8e11 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sun, 10 Jun 2018 20:42:54 +0200 Subject: [PATCH 02/21] Removing WinTestRunner --- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_vs110.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_vs120.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_vs140.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_vs150.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj | 12 ++++++------ Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_VS90.vcproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_vs110.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_vs120.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_vs140.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_vs150.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj | 12 ++++++------ Foundation/Foundation_x64_vs100.vcxproj | 2 ++ 21 files changed, 122 insertions(+), 120 deletions(-) diff --git a/Data/ODBC/testsuite/TestSuite_VS90.vcproj b/Data/ODBC/testsuite/TestSuite_VS90.vcproj index 8dc4d1bca..71569bfe6 100644 --- a/Data/ODBC/testsuite/TestSuite_VS90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj index 8ffddb1ed..34c8365ea 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj index a91edcf4c..6bc0d0697 100644 --- a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj index 97d4a6ea7..c67a5c426 100644 --- a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj index d6353084b..058ed5320 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -165,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -192,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -226,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -254,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -287,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj index c5bb5885e..02e324d63 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj index fff47f9df..b1da249fc 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj index 0dcbc5670..8bd5dcbea 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -159,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -186,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -219,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -246,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -279,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj index dad8c953a..d3e046d8c 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -164,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -190,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -223,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -250,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -282,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index 8ffd0715a..7682dd703 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj index 1829fe513..24f890d35 100644 --- a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj index e243f5771..d1d5558af 100644 --- a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj index 8a8a3604b..991f17a99 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -164,7 +164,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -190,7 +190,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -223,7 +223,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -250,7 +250,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -282,7 +282,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index 0546035d7..ecacd4e2e 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj index 244993422..7078311b2 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj index 1fec83222..a342a0e4a 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -158,7 +158,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -184,7 +184,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -216,7 +216,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -242,7 +242,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -274,7 +274,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj index 0e5a9d054..ea5a4e3c1 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj @@ -32,7 +32,7 @@ ..\lib64\PocoFoundationmtd.lib + MachineX64 @@ -219,6 +220,7 @@ ..\lib64\PocoFoundationmt.lib + MachineX64 From d9f5f2a3f14bfa6ef88012ac4753cfe05d5e2a74 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Mon, 11 Jun 2018 08:15:11 +0200 Subject: [PATCH 03/21] Removing WinTestRunner --- MongoDB/samples/samples_x64_vs90.sln | 44 ++++++++++++++-------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/MongoDB/samples/samples_x64_vs90.sln b/MongoDB/samples/samples_x64_vs90.sln index 8c5aa3312..d5acb2a49 100644 --- a/MongoDB/samples/samples_x64_vs90.sln +++ b/MongoDB/samples/samples_x64_vs90.sln @@ -1,35 +1,35 @@ Microsoft Visual Studio Solution File, Format Version 10.00 # Visual Studio 2008 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLToMongo", "SQLToMongo\SQLToMongo_x64_vs90.vcproj", "{D0381ECF-E750-32DA-8EEF-92D56B172D15}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLToMongo", "SQLToMongo\SQLToMongo_x64_vs90.vcproj", "{638D0833-8E84-3A67-BD00-4611F99E65AF}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution debug_shared|x64 = debug_shared|x64 - release_shared|x64 = release_shared|x64 - debug_static_mt|x64 = debug_static_mt|x64 - release_static_mt|x64 = release_static_mt|x64 debug_static_md|x64 = debug_static_md|x64 + debug_static_mt|x64 = debug_static_mt|x64 + release_shared|x64 = release_shared|x64 release_static_md|x64 = release_static_md|x64 + release_static_mt|x64 = release_static_mt|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Build.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.ActiveCfg = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Build.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|x64.Deploy.0 = release_shared|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Build.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Build.0 = release_static_md|x64 - {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|x64.Build.0 = debug_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|x64.ActiveCfg = release_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|x64.Build.0 = release_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|x64.Deploy.0 = release_shared|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|x64.Build.0 = release_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From b7330492e5eafcefaed92e0b2265771a6707b19f Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 15 Jun 2018 14:28:43 +0200 Subject: [PATCH 04/21] Add MachineX64 on element --- CppParser/CppParser_vs90.vcproj | 4 ++-- CppParser/CppParser_x64_vs90.vcproj | 4 ++-- CppParser/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- CppParser/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- CppUnit/CppUnit_CE_vs90.vcproj | 4 ++-- CppUnit/CppUnit_vs90.vcproj | 4 ++-- CppUnit/CppUnit_x64_vs90.vcproj | 4 ++-- Crypto/testsuite/TestSuite_VS90.vcproj | 8 ++++---- Crypto/testsuite/TestSuite_x64_vs90.vcproj | 8 ++++---- Data/Data_CE_vs90.vcproj | 4 ++-- Data/Data_VS90.vcproj | 4 ++-- Data/Data_x64_vs90.vcproj | 4 ++-- Data/MySQL/MySQL_VS90.vcproj | 4 ++-- Data/MySQL/MySQL_x64_vs90.vcproj | 4 ++-- Data/MySQL/testsuite/TestSuite_VS90.vcproj | 16 ++++++++-------- Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 8 ++++---- Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj | 8 ++++---- Data/PostgreSQL/PostgreSQL_VS90.vcproj | 4 ++-- Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj | 4 ++-- .../testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Data/PostgreSQL/testsuite/TestSuite_VS90.vcproj | 16 ++++++++-------- .../testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Data/SQLite/SQLite_CE_vs90.vcproj | 4 ++-- Data/SQLite/SQLite_VS90.vcproj | 4 ++-- Data/SQLite/SQLite_x64_vs90.vcproj | 4 ++-- Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Data/SQLite/testsuite/TestSuite_VS90.vcproj | 16 ++++++++-------- Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Data/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Data/testsuite/TestSuite_VS90.vcproj | 16 ++++++++-------- Data/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Encodings/Encodings_CE_vs90.vcproj | 4 ++-- Encodings/Encodings_vs90.vcproj | 4 ++-- Encodings/Encodings_x64_vs90.vcproj | 4 ++-- Encodings/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Encodings/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- Encodings/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Foundation/testsuite/TestSuite_vs90.vcproj | 4 ++-- Foundation/testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- JSON/JSON_CE_vs90.vcproj | 4 ++-- JSON/JSON_vs90.vcproj | 4 ++-- JSON/JSON_x64_vs90.vcproj | 4 ++-- JSON/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ JSON/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- JSON/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- MongoDB/MongoDB_vs90.vcproj | 4 ++-- MongoDB/MongoDB_x64_vs90.vcproj | 4 ++-- MongoDB/testsuite/TestSuite_vs90.vcproj | 4 ++-- MongoDB/testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- Net/testsuite/TestSuite_vs90.vcproj | 4 ++-- Net/testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- NetSSL_OpenSSL/testsuite/TestSuite_vs90.vcproj | 4 ++-- .../testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- NetSSL_Win/testsuite/TestSuite_vs90.vcproj | 4 ++-- NetSSL_Win/testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- PDF/PDF_vs90.vcproj | 4 ++-- PDF/PDF_x64_vs90.vcproj | 4 ++-- PDF/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- PDF/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- ProGen/src/ProGen.cpp | 12 ++++++++++++ .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_static_mt.template | 2 +- .../vs100/x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_static_mt.template | 2 +- .../vs110/x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- .../Win32/testsuite/debug_static_mt.template | 2 +- .../Win32/testsuite/release_static_mt.template | 2 +- .../vs90/x64/testsuite/debug_static_mt.template | 2 +- .../x64/testsuite/release_static_mt.template | 2 +- Redis/Redis_vs90.vcproj | 4 ++-- Redis/Redis_x64_vs90.vcproj | 4 ++-- Redis/testsuite/TestSuite_vs90.vcproj | 4 ++-- Redis/testsuite/TestSuite_x64_vs90.vcproj | 4 ++-- Util/Util_CE_vs90.vcproj | 4 ++-- Util/Util_vs90.vcproj | 4 ++-- Util/Util_x64_vs90.vcproj | 4 ++-- Util/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Util/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- Util/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- XML/XML_CE_vs90.vcproj | 4 ++-- XML/XML_vs90.vcproj | 4 ++-- XML/XML_x64_vs90.vcproj | 4 ++-- XML/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ XML/testsuite/TestSuite_vs100.vcxproj | 4 ++-- XML/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- XML/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- Zip/testsuite/TestSuite_CE_vs90.vcproj | 12 ++++++------ Zip/testsuite/TestSuite_vs90.vcproj | 16 ++++++++-------- Zip/testsuite/TestSuite_x64_vs90.vcproj | 16 ++++++++-------- components | 1 - 94 files changed, 356 insertions(+), 345 deletions(-) diff --git a/CppParser/CppParser_vs90.vcproj b/CppParser/CppParser_vs90.vcproj index 3b0f884e1..44bd9baad 100644 --- a/CppParser/CppParser_vs90.vcproj +++ b/CppParser/CppParser_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> appendChild(pTargetName); } } + if (platform == "x64") + { + Poco::AutoPtr pLibs = pProjectDoc->getElementsByTagName("Lib"); + for (unsigned long i = 0; i < pLibs->length(); i++) + { + Poco::XML::Element* pLib = static_cast(pLibs->item(i)); + Poco::AutoPtr pTargetMachine = pProjectDoc->createElement("TargetMachine"); + Poco::AutoPtr pText = pProjectDoc->createTextNode("MachineX64"); + pTargetMachine->appendChild(pText); + pLib->appendChild(pTargetMachine); + } + } } void fix2012Project(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps) diff --git a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template index e2e836e5c..cfc9d1d5d 100644 --- a/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs100/Win32/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template index 5fc0496a5..1c0e428d7 100644 --- a/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template +++ b/ProGen/templates/vs100/Win32/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template index 2c7520b6d..46e17e106 100644 --- a/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs100/x64/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin64\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template index e68b0eb2d..9bd31b72a 100644 --- a/ProGen/templates/vs100/x64/testsuite/release_static_mt.template +++ b/ProGen/templates/vs100/x64/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin64\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template index e2e836e5c..cfc9d1d5d 100644 --- a/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/Win32/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template index 5fc0496a5..1c0e428d7 100644 --- a/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template +++ b/ProGen/templates/vs110/Win32/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template index 2c7520b6d..46e17e106 100644 --- a/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs110/x64/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin64\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template index e68b0eb2d..9bd31b72a 100644 --- a/ProGen/templates/vs110/x64/testsuite/release_static_mt.template +++ b/ProGen/templates/vs110/x64/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin64\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template index fcc713332..002b50bbf 100644 --- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template index 0dd147bf3..cdd93d79f 100644 --- a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template +++ b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template index e4edafbb1..b17d78c82 100644 --- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template +++ b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template @@ -57,7 +57,7 @@ OutputFile="bin64\static_mt\${project.target}d.exe" LinkIncremental="2" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcwd.lib;libcmtd.lib" + IgnoreDefaultLibraryNames="nafxcwd.lib" SuppressStartupBanner="true" GenerateDebugInformation="true" ProgramDatabaseFile="bin64\static_mt\${project.target}d.pdb" diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template index 2457a99a4..a2a5a718b 100644 --- a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template +++ b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template @@ -59,7 +59,7 @@ OutputFile="bin64\static_mt\${project.target}.exe" LinkIncremental="1" AdditionalLibraryDirectories="${project.pocobase}\lib64" - IgnoreDefaultLibraryNames="nafxcw.lib;libcmt.lib" + IgnoreDefaultLibraryNames="nafxcw.lib" GenerateDebugInformation="false" SubSystem="1" OptimizeReferences="2" diff --git a/Redis/Redis_vs90.vcproj b/Redis/Redis_vs90.vcproj index e94143dfc..9dfe61194 100644 --- a/Redis/Redis_vs90.vcproj +++ b/Redis/Redis_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + Iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) @@ -233,7 +233,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + Iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) diff --git a/XML/testsuite/TestSuite_vs90.vcproj b/XML/testsuite/TestSuite_vs90.vcproj index 767923c11..0bc0eccee 100644 --- a/XML/testsuite/TestSuite_vs90.vcproj +++ b/XML/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> Date: Fri, 15 Jun 2018 14:34:16 +0200 Subject: [PATCH 05/21] Add buildallxx.bat --- buildall32.bat | 8 ++++++++ buildall64.bat | 8 ++++++++ 2 files changed, 16 insertions(+) create mode 100644 buildall32.bat create mode 100644 buildall64.bat diff --git a/buildall32.bat b/buildall32.bat new file mode 100644 index 000000000..6f438b037 --- /dev/null +++ b/buildall32.bat @@ -0,0 +1,8 @@ +setlocal EnableDelayedExpansion EnableExtensions +rem rd /q /s lib bin & buildwin 90 rebuild all both Win32 samples tests devenv > log\90.x32.log 2>&1 +rem rd /q /s lib bin & buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1 +rd /q /s lib bin & buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1 +rd /q /s lib bin & buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1 +rd /q /s lib bin & buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1 +rd /q /s lib bin & buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1 +endlocal diff --git a/buildall64.bat b/buildall64.bat new file mode 100644 index 000000000..9082863ca --- /dev/null +++ b/buildall64.bat @@ -0,0 +1,8 @@ +setlocal EnableExtensions EnableDelayedExpansion +rem rd /q /s lib64 bin64 & buildwin 90 rebuild all both x64 samples tests devenv > log\90.x64.log 2>&1 +rd /q /s lib64 bin64 & buildwin 100 rebuild all both x64 samples tests msbuild > log\100.x64.log 2>&1 +rd /q /s lib64 bin64 & buildwin 110 rebuild all both x64 samples tests msbuild > log\110.x64.log 2>&1 +rd /q /s lib64 bin64 & buildwin 120 rebuild all both x64 samples tests msbuild > log\120.x64.log 2>&1 +rd /q /s lib64 bin64 & buildwin 140 rebuild all both x64 samples tests msbuild > log\140.x64.log 2>&1 +rd /q /s lib64 bin64 & buildwin 150 rebuild all both x64 samples tests msbuild > log\150.x64.log 2>&1 +endlocal From fad509f34fe2567877217c5c783d0b8f37c446ed Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 15 Jun 2018 14:42:34 +0200 Subject: [PATCH 06/21] Rename buildall to rebuildall --- buildall32.bat => rebuildall32.bat | 0 buildall64.bat => rebuildall64.bat | 0 2 files changed, 0 insertions(+), 0 deletions(-) rename buildall32.bat => rebuildall32.bat (100%) rename buildall64.bat => rebuildall64.bat (100%) diff --git a/buildall32.bat b/rebuildall32.bat similarity index 100% rename from buildall32.bat rename to rebuildall32.bat diff --git a/buildall64.bat b/rebuildall64.bat similarity index 100% rename from buildall64.bat rename to rebuildall64.bat From 6f9185ae62949d0e5f7368cb3e01552ed54bac3c Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 16 Jun 2018 07:59:22 +0200 Subject: [PATCH 07/21] Move rebuildall* to ProGen --- ProGen/progen.bat | 45 +++++++++++++++++++++++++++++++++++++++++ ProGen/rebuildall32.bat | 8 ++++++++ ProGen/rebuildall64.bat | 8 ++++++++ progen.bat | 39 ----------------------------------- rebuildall32.bat | 8 -------- rebuildall64.bat | 8 -------- 6 files changed, 61 insertions(+), 55 deletions(-) create mode 100644 ProGen/progen.bat create mode 100644 ProGen/rebuildall32.bat create mode 100644 ProGen/rebuildall64.bat delete mode 100644 progen.bat delete mode 100644 rebuildall32.bat delete mode 100644 rebuildall64.bat diff --git a/ProGen/progen.bat b/ProGen/progen.bat new file mode 100644 index 000000000..d3b02c65c --- /dev/null +++ b/ProGen/progen.bat @@ -0,0 +1,45 @@ +ProGen\bin\static_md\progen.exe CppUnit\CppUnit.progen +ProGen\bin\static_md\progen.exe Foundation\Foundation.progen +ProGen\bin\static_md\progen.exe Encodings\Encodings.progen +ProGen\bin\static_md\progen.exe XML\XML.progen +ProGen\bin\static_md\progen.exe JSON\JSON.progen +ProGen\bin\static_md\progen.exe Util\Util.progen +ProGen\bin\static_md\progen.exe Net\Net.progen +ProGen\bin\static_md\progen.exe Crypto\Crypto.progen +ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\NetSSL_OpenSSL.progen +ProGen\bin\static_md\progen.exe NetSSL_Win\NetSSL_Win.progen +ProGen\bin\static_md\progen.exe Data\Data.progen +ProGen\bin\static_md\progen.exe Data\SQLite\SQLite.progen +ProGen\bin\static_md\progen.exe Data\ODBC\ODBC.progen +ProGen\bin\static_md\progen.exe Data\MySQL\MySQL.progen +ProGen\bin\static_md\progen.exe Data\PostgreSQL\PostgreSQL.progen +ProGen\bin\static_md\progen.exe Zip\Zip.progen +ProGen\bin\static_md\progen.exe PageCompiler\PageCompiler.progen +ProGen\bin\static_md\progen.exe PageCompiler\File2Page\File2Page.progen +ProGen\bin\static_md\progen.exe PDF\PDF.progen +ProGen\bin\static_md\progen.exe CppParser\CppParser.progen +ProGen\bin\static_md\progen.exe MongoDB\MongoDB.progen +ProGen\bin\static_md\progen.exe Redis\Redis.progen +ProGen\bin\static_md\progen.exe ProGen\ProGen.progen + + +ProGen\bin\static_md\progen.exe Foundation\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Encodings\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe XML\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe JSON\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Util\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Net\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Crypto\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe NetSSL_Win\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Data\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Data\SQLite\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Data\ODBC\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Data\MySQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Data\PostgreSQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Zip\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe PageCompiler\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe PDF\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe CppParser\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe MongoDB\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe Redis\testsuite\TestSuite.progen diff --git a/ProGen/rebuildall32.bat b/ProGen/rebuildall32.bat new file mode 100644 index 000000000..e59a4fa02 --- /dev/null +++ b/ProGen/rebuildall32.bat @@ -0,0 +1,8 @@ +setlocal EnableDelayedExpansion EnableExtensions +rd /q /s ..\lib ..\bin & call ..\buildwin 90 rebuild all both Win32 samples tests devenv > log\90.x32.log 2>&1 +rd /q /s ..\lib ..\bin & call ..\buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1 +rd /q /s ..\lib ..\bin & call ..\buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1 +rd /q /s ..\lib ..\bin & call ..\buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1 +rd /q /s ..\lib ..\bin & call ..\buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1 +rd /q /s ..\lib ..\bin & call ..\buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1 +endlocal diff --git a/ProGen/rebuildall64.bat b/ProGen/rebuildall64.bat new file mode 100644 index 000000000..fe7aa1a83 --- /dev/null +++ b/ProGen/rebuildall64.bat @@ -0,0 +1,8 @@ +setlocal EnableExtensions EnableDelayedExpansion +rd /q /s ..\lib64 ..\bin64 & call buildwin 90 ..\rebuild all bot..\h x64 samples tests devenv > log\9..\0.x64.log 2>&1 +rd /q /s ..\lib64 ..\bin64 & call buildwin 100 ..\rebuild all bot..\h x64 samples tests msbuild > log\10..\0.x64.log 2>&1 +rd /q /s ..\lib64 ..\bin64 & call buildwin 110 ..\rebuild all bot..\h x64 samples tests msbuild > log\11..\0.x64.log 2>&1 +rd /q /s ..\lib64 ..\bin64 & call buildwin 120 ..\rebuild all bot..\h x64 samples tests msbuild > log\12..\0.x64.log 2>&1 +rd /q /s ..\lib64 ..\bin64 & call buildwin 140 ..\rebuild all bot..\h x64 samples tests msbuild > log\14..\0.x64.log 2>&1 +rd /q /s ..\lib64 ..\bin64 & call buildwin 150 ..\rebuild all bot..\h x64 samples tests msbuild > log\15..\0.x64.log 2>&1 +endlocal diff --git a/progen.bat b/progen.bat deleted file mode 100644 index c26f21721..000000000 --- a/progen.bat +++ /dev/null @@ -1,39 +0,0 @@ -ProGen\bin\progen.exe CppUnit\CppUnit.progen -ProGen\bin\progen.exe Foundation\Foundation.progen -ProGen\bin\progen.exe Encodings\Encodings.progen -ProGen\bin\progen.exe XML\XML.progen -ProGen\bin\progen.exe JSON\JSON.progen -ProGen\bin\progen.exe Util\Util.progen -ProGen\bin\progen.exe Net\Net.progen -ProGen\bin\progen.exe NetSSL_OpenSSL\NetSSL_OpenSSL.progen -ProGen\bin\progen.exe NetSSL_Win\NetSSL_Win.progen -ProGen\bin\progen.exe Data\Data.progen -ProGen\bin\progen.exe Data\SQLite\SQLite.progen -ProGen\bin\progen.exe Data\ODBC\ODBC.progen -ProGen\bin\progen.exe Data\MySQL\MySQL.progen -ProGen\bin\progen.exe Data\PostgreSQL\PostgreSQL.progen -ProGen\bin\progen.exe Zip\Zip.progen -ProGen\bin\progen.exe PDF\PDF.progen -ProGen\bin\progen.exe CppParser\CppParser.progen -ProGen\bin\progen.exe MongoDB\MongoDB.progen -ProGen\bin\progen.exe Redis\Redis.progen - -ProGen\bin\progen.exe CppUnit\testsuite\TestSuite.progen -ProGen\bin\progen.exe Foundation\testsuite\TestSuite.progen -ProGen\bin\progen.exe Encodings\testsuite\TestSuite.progen -ProGen\bin\progen.exe XML\testsuite\TestSuite.progen -ProGen\bin\progen.exe JSON\testsuite\TestSuite.progen -ProGen\bin\progen.exe Util\testsuite\TestSuite.progen -ProGen\bin\progen.exe Net\testsuite\TestSuite.progen -ProGen\bin\progen.exe NetSSL_OpenSSL\testsuite\TestSuite.progen -ProGen\bin\progen.exe NetSSL_Win\testsuite\TestSuite.progen -ProGen\bin\progen.exe Data\testsuite\TestSuite.progen -ProGen\bin\progen.exe Data\SQLite\testsuite\TestSuite.progen -ProGen\bin\progen.exe Data\ODBC\testsuite\TestSuite.progen -ProGen\bin\progen.exe Data\MySQL\testsuite\TestSuite.progen -ProGen\bin\progen.exe Data\PostgreSQL\testsuite\TestSuite.progen -ProGen\bin\progen.exe Zip\testsuite\TestSuite.progen -ProGen\bin\progen.exe PDF\testsuite\TestSuite.progen -ProGen\bin\progen.exe CppParser\testsuite\TestSuite.progen -ProGen\bin\progen.exe MongoDB\testsuite\TestSuite.progen -ProGen\bin\progen.exe Redis\testsuite\TestSuite.progen diff --git a/rebuildall32.bat b/rebuildall32.bat deleted file mode 100644 index 6f438b037..000000000 --- a/rebuildall32.bat +++ /dev/null @@ -1,8 +0,0 @@ -setlocal EnableDelayedExpansion EnableExtensions -rem rd /q /s lib bin & buildwin 90 rebuild all both Win32 samples tests devenv > log\90.x32.log 2>&1 -rem rd /q /s lib bin & buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1 -rd /q /s lib bin & buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1 -rd /q /s lib bin & buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1 -rd /q /s lib bin & buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1 -rd /q /s lib bin & buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1 -endlocal diff --git a/rebuildall64.bat b/rebuildall64.bat deleted file mode 100644 index 9082863ca..000000000 --- a/rebuildall64.bat +++ /dev/null @@ -1,8 +0,0 @@ -setlocal EnableExtensions EnableDelayedExpansion -rem rd /q /s lib64 bin64 & buildwin 90 rebuild all both x64 samples tests devenv > log\90.x64.log 2>&1 -rd /q /s lib64 bin64 & buildwin 100 rebuild all both x64 samples tests msbuild > log\100.x64.log 2>&1 -rd /q /s lib64 bin64 & buildwin 110 rebuild all both x64 samples tests msbuild > log\110.x64.log 2>&1 -rd /q /s lib64 bin64 & buildwin 120 rebuild all both x64 samples tests msbuild > log\120.x64.log 2>&1 -rd /q /s lib64 bin64 & buildwin 140 rebuild all both x64 samples tests msbuild > log\140.x64.log 2>&1 -rd /q /s lib64 bin64 & buildwin 150 rebuild all both x64 samples tests msbuild > log\150.x64.log 2>&1 -endlocal From f4617012a833a6bf868f5d655db7d5a38bd5a85a Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 16 Jun 2018 08:02:29 +0200 Subject: [PATCH 08/21] Ignore VS UpgradeLog.XML --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 00a93664c..fdacfd89a 100644 --- a/.gitignore +++ b/.gitignore @@ -129,6 +129,7 @@ bin64/ lib/ lib64/ pocomsg.h +**/UpgradeLog*.XML # Eclipse generated files # ########################### From e5acfe67ab102b94145842e3068585e2f81d076f Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 16 Jun 2018 19:27:35 +0200 Subject: [PATCH 09/21] Use vswhere.exe to find where is VisualStudio ToolSet --- buildwin.cmd | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/buildwin.cmd b/buildwin.cmd index ac3e28add..245aed5b7 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -1,6 +1,5 @@ @echo off -setlocal enableextensions -setlocal enabledelayedexpansion +setlocal enableextensions enabledelayedexpansion rem rem buildwin.cmd @@ -36,11 +35,12 @@ set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH% rem VS_VERSION {90 | 100 | 110 | 120 | 140 | 150} if "%1"=="" goto usage +set vswhere='build\script\vswhere.exe -property installationPath' +for /f "delims=" %%a in (%vswhere%) do @set VS150COMNTOOLS=%%a +set VS150COMNTOOLS=%VS150COMNTOOLS%\Common7\Tools\ + set VS_VERSION=vs%1 if %VS_VERSION%==vs150 ( - if "%VS150COMNTOOLS%"=="" ( - set VS150COMNTOOLS=C:\Program Files ^(x86^)\Microsoft Visual Studio\2017\Enterprise\Common7\Tools\ - ) set VS_VARSALL=..\..\VC\Auxiliary\Build\vcvarsall.bat ) else ( set VS_VARSALL=..\..\VC\vcvarsall.bat From 3795884521f987112ea93c8244bc837124e31382 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 16 Jun 2018 19:29:21 +0200 Subject: [PATCH 10/21] See https://github.com/Microsoft/vswhere --- build/script/vswhere.exe | Bin 0 -> 428224 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 build/script/vswhere.exe diff --git a/build/script/vswhere.exe b/build/script/vswhere.exe new file mode 100644 index 0000000000000000000000000000000000000000..ecfb3bfb2f5f6cea19c28d56f67c22c94073031f GIT binary patch literal 428224 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%0A8;*;ED;41DS9P#i}u zsPqPLmX&g-7?1w-lrAaP%bmKH38WHT<-AQH*lU6un?(qin}Tj&_l>_$?c$~-9^vC? zL#bUOjc_$!pi(dW4NeJxPfNj0B-?jD1AAGY)5#Ho4Kbi3L7VjO@_1`s;23S?sJ-0h zC}&UgVN`!yeiAOgso#?}2wLkit(BS9x^;#rjp>Q&%FG6^n*p(AVs|LU zai`3c!tk~%)Oy-1mixuJ^-d`plGvEAe$lBn*a~YR5%LC3msfzWH5GrUHFXhs7_xQx zKG8h6h~yPv?OV{5i9+61&}@WY=Bn!>?nMQk*-JUOp1Eqe$_5uw(uiAV^gP-#zS-`= zm)W28sa;tjJ-Kp%jFU+x7R`1~abQ>fUjMTlA%s}Tx{tOmm$qN$e2ScgZV!Cs>^`B3 zz{kE?oLyXLfi0@j=>w6`140p^#&PurZ5a1?>W#pWs2>C=L7UM}3KF~->tT9i86FcQ ztg<5!7Np@y8-$pdIIe0EuKyKPc}P|36703hq$F{v)cZ_;g>|th6MLKbvWt-ozBZNT zQq&ln(#&-pF?tH+eeA1~O($Z(BZEc9#%Fuk_0j!9eDOX8C9EN@$eNCYP83Y8dfXNp zY2A&oY)$3=N>AeK8cwuFy}XVJWX48WUrUT2nU@(Jl}&}3EOskxil7X|M0AmHKIk8uo%5-n)_Qm{y#Yt*Ubf1_9_JZ6P9WQOIS+yc$gyI%-t1EhQ1WBp5bq9K@ zC)<-_prgz7K4nku3nS9~y6#=G-Wl_3_fuip`@F7|HDaxg1$tKPg+fqf$9&S15%Yh; zb}LijCMi+P*=GN=>ciC+Bf*HE=CT}G=|gV?m3s9B4p@Bty#mw(;syIu@3i3IRePic ziDv*ulutp0;|?XTTQQfk5kPMk`db8-f|LC$7>?4b{|X5U3kH>6Hq@NXzYr27dZSZo zp~6ZGpMaV6>R+X5!CBUyq!z*>c9OQfGuYOW&)4d6qTVubM5PW`{@(&!A9ey=^BX1! z?QcSZGGxz6a+L9GYY`^`QYUN%0`&KCNkUlPaKKE6zCpt`2S0%TS0gVBl@iPduNB z)&Hh=RImkbS0y}n(3N>1TcUz#+0kKg&Uh7uukn}1SG!%&5yp76AAJWmTt$TISh{zb zjSjxeX0a*Ae%_;h4JN=(7dBTBZQyEnO(tRp&C5hEw$_~9TJD_T6oR?TmMdVYaTAOQ`6sIo&``#kH`A{RNb&v9w zU~rk5aMeTubG;M{c84 zV4OmUs&!6}$)Pp3e)YvvCs&c;^p*#D%U^oSUwX^m8wAD+HIiEQD1WP-c6!MpaE9pb zzL=`Ml@tT#1s?3Wr}=9=CVyM&@>hjQ;NlWHT;$xu(|iGF;W>jE=(k25#l9 z>Tt%w+R##tKKI2`1DBFwTDpt}yKXXnt;ghVYu!}-{-{oRTqLP=Vn1|d&l9fdb7nva z20Q29@6637_y?R4L&H_M@@0?Eda{3$%6^q>S|^B8g5rrP2-|hC>S6tR>7w~|#jr?` zlSn~VSQqR9aa#3*U|ncOW`#V@u) zkLt6Z8nCZD8rEmC!PXw!IlIv{?w8)3A-($$ae$Qu9&R?1*?1Y>x%)xVV2@zS_|&r5)U4%XDMsssEVO_I1$jaNVw!*!t51=76mJvSF2!3&^{-(j&qPK1^u&)_}U3MJk zdmYg2`qPoJPj*1J>#GcC!ZCvF0=hj+mOv(K&h!iY_KK={p_pyodF-aWCwy zT2B`nrq;3+Kc+bNN_a*#Rw1Hks@mn76SnvnM7q2nj(7=KSiH|=&$%tW_yAPh7}mp} z1IK)`3E^=YVnPu#ZzWxkaYIO?n2M0>a-?j%wB8HbE1PW(E~ojOTm z^?<2*jS#$vX=yP4G5}o#XePb>H&BQQJxQMBe6;1U+o&iJ5f4aChW$tt@AK_PBw3Uy zEd65BANKk{=1(pnUFLHL`mu8hBHP2;A29^CbH$3QXlf>f4E zDwEI1l<3Vuu?)c(YSa`IQ@8U?13+i7rTK;Q$yIDz#U1hdp;-*o)}Q0#S-|)p{dS+EYU}qn?b-8hAL@{`IK; zAZrKBs)rz@g432r%nfD&c zWL&Y}=Qf2LAe&&ghJ=`K7q%v>m^GDhYuQdps8zP=k5_2lVTO?=Ti5)?MEGsh+cyq~ zR$N!x*;wwbdJ;elFUtJ=lZsZThJMQ-q`g=kbXSZ2h6^0d?n!u?P2|m-#U{NU*mWA?r)L~U*Ol50KV$CA+r_PmThNG}^#COrLdBuTse7S_Em z(fTv>(;s6ZuKX@GA$*J9b){}KcwGN^lN>Pmt}A+Ogo}DI;DJuf3#F!jc#H>$0QfZp z6JLau@hIN{F!oQmh7SbWrAH!63U|oo8e$LG)mx39RHB4pTSa_wJx{RB2~t3@|I%^J z{w5)cl(WA!k*;rrI7~nythn8bQ2&DS^Yy_8B@U{CS+|1^rv!)!)(|RduLKay z43U8Bo@vGY*zHVAYuz;@&q3V}vsK{HGJM{8#E6vYCn4rw4Yjh_%u^9x&N-?VO_Gvj z;p8JyxuSv8}Gy8q>3X2MEw>I&~#7K|0khdRpkFGRS3@K5SyDBqk5} zGMXAvR924J(EdJAk^8IGR6pp7;gmH&9{O*BZ>?@;q6nYz)xC~(elamfyY(Ay(|Bwv z>%%t&OxOWG5_2H@rHM?zhQ|RwIKcN&w6Md=}%$PXzg(hNO zf~Id2xB4MtzGx>5aeTycEgZSSMzyadmhBh(W6NsC+9Xxp?4W>>Nlo4P0Vv>%B0Pk9 z%uvAlzXgI8^LwOWv;J+!F`g6`uMHC6FhSIm1Fe}oh=JA_?k9g%CSH#)O9oP@I9W(k zEf>Y?h5JvCamTAWT+vG-o`utJsBk`-`(qeNl%YsGYul1(p6J(>STQu$C+%2c|KPXU zu_qb4nF_f`=55ea+IJ>_QSRE#S`t4#81B53Rf}+tphiFY%l`EX)`a!5_yEMya`Kt@ zj}vF25Y$S|#Q#|7=O@D!arn&34#$NNNjzQBtpojKa(Z&mGF+0<;ds~VIl+CW-2K07Kym) zFshPSzZ4>ZdF^)f_WrdvV8^zL!r&mHKoLX)G>xNQ_KSZ0zp|NBi8kO z4IcW*B&=Jcn~Dc za8(tM@S+n?&vg~G{6wp=&VCdhnk(tM9pzru8KMZ9qem|Jw@Qw4$E6$R5~ z=SI(4#;xuiS3xUUZCG!{ZODy^2|r5kvf*;!)Y2iEG%n*v9ZNiMO$b8aD+{T6Rpna? zr|bpI%(oW!)WYC>t0zV*&HR;U2m^O`UTpfvTJgmN*+rT4@{)+t$kpJxAN(zT3BcwX zt#WsMr6({YRyD2KAN!_owB!o66VEt8Zfvsdax3RyTI%;MkMj^eS3d8`2ac@aiHqd^ zfebcjWzR_^J%M&PxQC@?=zhL5)T|$V5kyU050JVh3U>gm zA-$Q659aWDoOq;M6FuNoy_}aT^{Bf&fj`Gqn^>l0Zu}`2flK>T=Co@iQi-n)44-xu z0Y;Y-V6@spa$amgs(wr24CPa;HFpu?h`kNl+=A+{M#-@W5} zb$^ufk%6PJ7#%na4z1L3tK4+DvyLPs>e!3TE8FHpD)K?}&^l1Wkf8raa$ua3oZkB2z zQ!N71X(dKd zw7$vB(oWYdA*)O57LjZ9`9D2rl$?Yel&3=E&L>39!P3Dfx!bMG<^oQ?kov3$NmW;DcHIHC~*%skiws#I1^Y@&fS#MIliP6lUpvye+}zD zQt#Ln$LWdUHh4x<6oJ$yw7OyO5~l+07JRA-)s;xV-hw>@VI9qGO2U}4Ik#o;X|1Ea z`)lbbOd*-Y_W&MvTTt=1=$BUCj8@`7KZ%9{v0lCig5P_Oe(NEmaq7!-5+Tr|3Y*@_ zme`os=VN2${tVocuMJ9U44-EFy|8CKU`eVb_+gn3>z6qIVE`ee1wYQDeo9 zeVTZcuF4-PV$5AZp!!w$_e96vTt@Z?V zF8jhuE|Sa@QLW~Rs61EfZ15wnbLo4|#ZY6($F0f5P#^q`#;|XvE{=M~2=%ms=q&xo zudRMcmNfm^>ZK_5|K{@J2Ofh$;Rak=J#c4r|JNYo;_4!EarJ3!5~$RFaW%65lAS2` zuH3-l56Zo-F$!*`ABN-qwN|45oOpe84kd&f^)G+utdWS5CN(U6L%s_>#0Os*gox)7 zVVe(YvgS@0xImyBhxRmcD-O3*Tw1J}0(+O8&)F>X2IxE5w|UZ%X%~~t#aG)h;ATOyZw1z2f5_luUgjv8OG@&Ol6|@4>?|qm^84vic^8 z{(F^m=W7&Sbd%b=|1-3nimZ0U@=NTZ+EdV4a8-UD5sdM-`bq*#)uYrk`F!zDGrXi) zl|PoKU2sUf;(Xc!R7o}E1Ty~6w0Iva793G;;9Bt$`${vtASagD)n8IQv@#ES$Scad znM6O{5kHZPj}dOjlGJ^&=1oPd_-C1`isjGwYSxrKj(SpxN;wv9QUf4iB0-GGc9T<; zs1hY{C)|(Rn_1nQIAtK-@fEuN795UGd@c~2B;0d}FvFKoV3=TTv@PN33Dcx#KEK}|=^C^iA8+f4jkA2j`?67^;Q(Z752yBG}Y znOxs)&&vyI&;*B7k#M2vzSx`21r3h(|AbgTiDiIC5eZlZ%OfiBN{=crn&_(qdx;B7 ziv?VMr*J|O2e|ojoG=v!m>h@$to}T&yB@;ffhbxnk{<@Iu#-|>|Q(1Q$N>(dC!{bH6Xa+ z^*@cwe40UWm7GTo&~BFt80Y4z7KnSeSadebPhtt)&KZ-Gn>5fA^{K1#2?Fz2q3zb3 z{6r8p90C^`Wt+a9b;8EAL6`8rK`sg6n9CzOR`eOM{pN~&r!C#SLtPcx4tRuzFcss1 z-Ee{n_IFQ#l6*2OrH*gol}JL#t#|5aHu$gA_^)3W+X z2b^<6Kl%XFawjPq7qvngKu*jD3s!vYR2wL5W?T%Bl7zHe>NTTfh76B)4%=uv_w zmzW^RUe(_8_sphu_)^blwtKW(;dCgh|1n&`$2vhTG>ZZlgFZ-#3Sw36i26SwiCD_jZo(!w`J!4-72#xKA@-J20%#8qZT-_0< zZui9>NR6{z-$`duNaFxcPKodGOE=5Nv4izwA_N$$>27@2xc>2egAOy^uZvB3tDfM% zAwX5Es4~_f0WvBzRz9E2#NE5AQ9$XDCycfB;9Z#K9>4dUHS|&Y&CrTu7!2(t?K1D< z21oy<{>P*JqxGjI=>z>5X{pf?a5+Xs`zq1}ov^Z#H4cly7AQJ|FT%HEx zVh6~1_(B4oa`T8!$w8B0Sg}pmZG4-XE=y6d{r@e@;`*k{< z`2CN}Fo^Is!zk1nNEjH#FR{Nn!`S+LXTqf8n|PLC5ZK5oy}r!>GIU@r7Ni5YaRA7Q zG$6M+KnR2Elx zQZw(w4ixfQdoVhV=vw$zRtvGP@`;jh#^~8C`esg-_~+1Dumgo2#~!D5LjWnB!-8SF z<6tjIf~m69`X!uwWYE}OFnS0VprYO(Myi9+>qJ6xWtrIH={XZ&59XZ~gz6d;j>TitF)vlWdX&1G{L@AQ6M2qM(fi6iBFG*aVfphM0tiA!;?o*eb%V zNHq{$u-ROq)M863Dk}CvTddepU0bvX&?E{~RMc2OX^T3zXrodL8rkQ4=HA_G!bbG- zeZJ4@`2%uy?%bI(XJ*cvIX|Oq-WAiPPq*p&1Mb46RV%haB-Rd%nVYXhE30cE;suH!L+zdN)rUK42Vr^6tMhRo|Iz{wf z3H`hGrwo+Pxpi#qeSxY`@MijOygZMi&mm_RCbFZ9{3(IL(Xe8V!LxAgapzJY=2VB( z4T{o+&? zNz8NnRxU&rAu70$yrZHoZT~=?u&zDRxP+Y6E)sv9U{yK79Gj8Ji^KCBwYL3oOVzE2 z*}=zXZKWaMkr7^r?};}Rw-uu^RAiWLZoT|iT0<8Soj?nive;IvX$c0Ra);m$@TqaB zxUsZqInw*G363IPc1 z4r@s@U^Rmgbgq`@c~20xW9q8!nH7hNjIRJ6+`YO*-yiVOfrkepgc=}mfUHyZPI$+C z;AIDsE>1Iu=Z3?GSxzxN#;=`Xjzc)GBba6JWtyFa#S_s-Zx*ldG6Wz4Ohzxl;<4ar z=a8=9(FnVUxaP-PmMbi|qQm-&JjE0^PIm~;EuDxU@x^*mL{p-_?`bqm3`s9d3un_l zE1czxhHQFpcmvDn#^17>z7+RWF*wFeLqbUJWk#BcF*@GO{FLsC7#&}086Ahce?$nm zLA@*cO>-XG!sGs^Ug0MW|LpW_9`(j=WT$Uqr-x(%=$*bny~i^R7gp$ItpwlDz{JoHu|ziu zriwK>(%c?v^mWX0$zNnMiKRKh%Yn2#!MIEd8olGiBz+*4ob6@G(aMse&UO(F%0n-+ z^mTvZn373!@Hj1OCU_>m4f4O$~OtI+c5~gtog;@OLT|Bu+e= z4847raM+z{GeT2yhjeg^{hnW<02bAn+Jqbky*?Y{rF$bAq*=YdGaJMKi=uf9;hj2^ zj}N(*(yVm?!U|oZ8xy07W{c zA_O+rJ|KF5Hf39!K{^GpzH@7Fi0HV&#r6ur;m@+c$q`iulcr+zr#l&w#HGZte%dIz zVGCcK9(foQdB})7q(vSwBM(`zvAPG{!QixUiWRGy>%3&7B5XnmZsufvBDR_Y>(07M z&bg#TBapzBtE&Ro!bk-pC8>={8xxQU3HzcPKemLdy@k{SKgNYzWHMS_3BA1BC9eJl zB*)(8EQnsh%D*u^#}HQjqX7tznYhytSsp-SNrJtmJa~c5rt|@@K}qf8nMZVRpegSH zoDq37d%=}PF8+`y4NlZ{VIpr^|XAB*l6k+tCMLV~~oB$xfG^yV9~qPn!W2g9hU zU&)k)PAw@@N6=8Py>+Xf@l30JXmzJCFgzh&R(C++n2(5lgP6tS6Cs<3i)KQAb%7_ z>ot5#Ti8a6(q8ig03oXgko>)~H$KI-(OyRyu;MZ?LHX3!fiS2>qHd~>KuCD#bhO`+ z#_Jp$iOittvfQ^`&@8TXhXmj;5rEa8m&LC{JFm2*P7oiDs;sucQKlk>RGEvkAx*6V zCYfCF^X!ChgHc9XqkeghEa8ekhJ>C@A-qVNdI$zad`cvu-Ue2=>)VU(pAGXc23k@V8^)7#|~Pis)S*f;*0HI&t9_{-F$1#gpn zI`~TXz|nGk{P`FB(DorhHglS52UZwgef~Qnnh)*JW^xHl3)3+MPFhW;4f!q;zZStj z&lV_fsfo-b_=R>!-eV3HcW2=IK!%zi;4zU;Nw3#Rud?#gG#ZXhWczoS$ek<`Xi;Py zn-=BCMJL{r|614NaE;Uj*}r)NaG=t?RsO8X0#_)_uM!vv6AG#b-r9*xfg^Mxn4IO$ z3*tvu>k5wxs<}TG8UUUAfGb87MEZPiuH#9FXK-KL$oJS*5D*a-ALK?fLVxV9maGun z;^QO{T)Q5CLdZ%~a=WOND5{4j!odlTY*`v_3G&VWbXixJ#nVX7y27}>OwGr{$6Qw{ zp#^$fy#Qyibz{O-cB@GlibZ>h!HJL`NA1A53?bQnIDFfT5^)cB=~ubs#j0alk}Xh~ zHn(=b+}eSGBDnPKKxtQ%(USAp7hm{4Ni^DKO3;IE74ZzSR!vwZ?Y)Wc5YaZUwwmt zO!cNwFcT7Lc<>mv z1FJyG{zS|`1ueui^(kU&eIjtK*MxUu9haE(fE6Zqm-yxY*m^Zt0J}f{ON&}wjO)?z zY75^k<5SWYb@{LFBE;VKF75*1p$*VnteGw}O1oml(Uf+H91bZseGbxk}!66cWgYJ_Y>BBbVk z^oY>KXPE?Z39f;z60X6(S-?}~@fb;{a{cZ2F`qv1!kAt?OOfs02b{9gwCK9ZB#Wvw%DqVn-&L)?ldnM$pVgHL5 z8UBh#=d+G#aUQvs=h|~6(S&zo?f3NGVXRzy40Z{3tiA$?7N<;RyXHj71u0TRy=T6Y z-_V}&IR6whkT5)(n&)Ed}M3qjno*KiRwV{l~ltWq|Fj@u)ew^okK z+RTbTU6;-UB&=GY-Fj3yqnmTtiHxCXPEWp|OUd&V%@@QCHsp|GLED{|Y`>``Q)dd2 z8u+d22tFNvW|ST@I&N}z(h;FFNFvlp{GO)E?8Qyf?Md6!J-1M$++J)rO9;esB1(Uj#CiI z-6L9yCGHpGN11w(Bi}z+p2HQsY}xR&;w0vxK#hV&7U{ z4=Z%q+*e>Qofx<@*{6C4hjObJX>3)~>EC3kMz^J`ku_C}yh!9m=d+@kW;*8W{}Ikm za0FuvTJ})=uhMH#KkTT{anI3-(G9moH;M%Wro$>NEv zddhTNK7;=?FZlQbp4b3Mwd1M-r_A9;!zowtzk20f^l`$ebMM11s$I2$7LU|aBY1*l z{Dc8+&4Kw$nInt>A?ykO^twmsj@XF@de(pM+{)2=fL@nllYwmQk5;(<>?d z{VB%Q*VU|17pK)XBpN4P5;&1yOZ$OJVAMcq?=z5BmD8L%Vjf;c#7)YSLtAPHp@DNr zhp%yG1k6ZAxo+T>Fd~hKdG!kiI-lumx+Ecx8mi7~cHS*}oRYk~3%TL=KR7i%G%~Mq zp~L@yvo>*VXlP#7!c_kUskKR=&-@=G<#i8#$G?>@Vy>oqb1au#5;&=GVAIt4yo(pj zZuua^`Amy{@5RS;UQYS)cb4wcFljU-fd&cs(Js|WSlOIv9BIU7ihF}E{HZctaS$PV03SuBT+=%2O5aoEs?OXx7yWE)XZv6m@r5-1*ygddH5R` zbOrwx*NR(`Ii8@aJ}BV|8Y>ssqB(dc~Cl~axw?pn5Xpdxf&tQbzjI*m+MNbrw<|E+SOs=-~vH5Zb zjiODt?F$EwX%Qx>S^WiahgnLUaxI*WI81{$*ZdG88u!LmyB-%x zg%N00n-|I74z-EDZ0^6p2XXq zUIGQ^gIqzy{d%on`$1X>j~BWGx)DU3qH%bN;4m;*P^50WlEKQ&k9&gmjOW@(;GhOS zj4}*?MDSwJf?jK$3mcc3Zpmo52QuWaR3N`xzA1`yU3k3UucKok-e)a!uZZ*+}g;xOfC#o7gy*K9;WqNPKmfYV= z%n15v8?(hTyI6gI83?&Kx25|JAHkdPaM(MU%f)cM#iNT9SQ4Xba8q$YW5QGfdxyuo zG!<_D@YhavOM-OZw~=0zd-RD$NA6p`2Scf{4Y5zQves&1<3Etqi@!1HCq^&6bO6l? zkhduXzk$F>`|oBsYZAIl*0nox4BnQ>caDVF5U4TtEAh-$H_I}p)ehV_>NT#e0G*H{7ZM_Qh#^yw22USU{sXbrTp~G?44yWS_y*2ODv*98zKbrr}_`&)fg zG9kP19`k(7X`W(=3VP0biF$_pa$Oo1z0_cmxZsu(iHh)sk{l?fxn?b^zs=oc3Z#fK z`z7+xrUHUckg%refZT7oxZmu9hVH|2M0~pf#QG*E^a~R9mDtFLW3q%+aq@Rp$<^(h zQz(~JCY8@4=Hro`*&iF-er9HJiDgcbBCBo#`m%xv?V5E&Z-Tw4{Z$ z2t+A4%@Jv0y!!TUsLzt<0Wqd??OlMiCP8(&o92&3QiZ&Vz}b|94T=dHH+h9D_>fzzOZyHUXYOObln zSNlJ7w%Su|VWKDcx~t}*M2bROvzZCf*ZkX<3{2}@R_|l@q{ZtsYuU=duY`tv42xxu zR&XZ>YFaSbfL0gnOPWW3g55AnJD3Qp*AOGRJLDQBDFG_?s?V8qqowH%?N+o7%oGGxrN{6C&y^Ib}2 z6}`Ho-@Q4_+@#%+Zq?noLweE|MQ`8UrbtI-55lZr4?okD)B?s&=)t%{FkT~Hn&=)$ zEl|Bg&>s)ivv2K%>!NMoIw@~;YbtbZCkXd1#%r_?lJpU{BpQYThi0H#p`OK><}VxX zfxWL>A=eF~aE38!+LYY(MQO!Nv+~r%GV8OZ5rk@F;dEXm@&BS}Gez<`#h1>7H`05!+Cf=Hd>)2nj93S|hzwe>53GpX zdxSx%+=&D?6}+qVMmPkW8+FVIR<{!tQlgOVLYO7;K%c8b-GCs1H1Tf=v-AtDa){lS zC4QOC-~3&wRSFl2aZ7V_Llu{MYId=3OVn>bHD|MYUq$cg3h7gCdy7{{rUwkQ{Xf?2 z9M6?7k|e#p&SeXB(aH;U7Kn3NE2n*pi$~e0#b&z@q}axSaA&cNnOl4wS5iKb>}j(- zHQ81RPTfL=bt{U!!gX`fh(#+0pHYy-J{?ra=^N8sU>m@9=UcG#X-P)x(<)?d}-tiN}X{k^zpR|Vh#p7)_AxbI`64K|X zUw+60MNaCjr9$F0!ygYi6STp#wg_xDKp~8R(Hf))NoC{2>(vCS+#^8MYM`2aEQAO{ zoi0@&1*Q8ioli85H}HshrDeaJojV;p!6i`4hWflzTNPHs%;Q1X;T3x52*Sr<#_iHR zbBV@NEX^DD)DgY1p)C#VNJ>b{sDSKKs5ixHnMZoJ&8=mDGx5GN4{0FjQIFPA% zM)8cK;_3R5Ck!=8Xhb_jdjTKfdQdR?b6Gta(Va3x9gc-exhQartvIi0@*3Hz6XuP> z{7%Qwur?`aQ-ua>8LeB}ix<=aR}wCj*x%{CM9`{obQd#0+D`OGYLxtR@9f>hn^16W zku4wTd9^o8$V~A%HR&!_|0C3?B6K-oahaN}*n4uLhdevo(vMy?>SY!#(eIEV87?ah}n9+)pV;pMO>>)p5%=>bBQ35UMyR92HcY==GnpN1E*9;Cq7U&So_*26)MKDurGe zxv34BW54 zJZ)8fTZ(iIHOg-UbMI0V(SGWrWAjM;duk!?^jhd$J`$Z<>|Y7Dz8 zj!5aj+?GV^jLm#zF_dg~xoB^l91ba`oab8GKPEA|nIM z0v8ReqF!E6rdvz!6bH6{3)Fxg~Ltx-xdk@xUNFUQlXI$J4sw;V8enyWTwO#Z+zAnJ?ZyTi*XZigr&JJ;bj8UAu|6?uo zK#Xw*eh>)@9U?#dD}_Qh)q_VOW(eO2wWBV*-)^Gz_@hzV8?O~L--Op&5o3NcUS~;- zqwxA1Dxe5npX9k0UNhyBxOh$EO$=Ta^5wV2>%%PM7`!$uj)T`5DAah(|2k&pth<|T zB&9mXG6Lzg6uoo8fyJ)C;&e6d29_a~kTWy!&9urcqpZ>GYA6_Qw6+$EOHk*~gn5qp z7mv01M&PK@!>7L zHye{GkswLC?~-xo01!pHYqKQERVVBiNj=5eUtKK<72$oz5-f7-_3sKz*{uTXEOjH_ zZf%|FN|5%Z1wR&w(k$&AmY`+zg!zFMAjb5${7XmKe4MBr^%xkhsAw&OGhUQ#%wpv` zmxWD6vWy$W4qMWzLTSmhL&ERUogVeuub3iz*75s*dQg74+w}?2>zp$=w2l7jo4I-d z`$i+*)#lzNV@V>Njip6W9nF|DG!<=B@9qhQOXT4V9w6R9a3nu#_$dsqa+e9ix(jYW zKovP5dT~6Fg-zFYv(M$Qn&}WOJ@%q7lPg)5Kkqr=(lgX~sG7|C*mK;XB zbgsZ9-CWFG3f<(t!)5c{qJc187ciQ($#*Elw8@xU5epnsb6d=wS&?!_nf?v^K6724 zeoK@$(&mo=HLxqfkbrIC-B3pdT3xsnBk82PdKP3FC#j^YF&@A_GOSxJu z65J9`O|#x2+f*XcVR7zHRI|o^wM1`He@nVr$I4)(BYWs2qdE4W_1oY6cHp<9tYM5E z`aiKw5^3f)o>>1yD0wtxt%{P!a#g}}FUq<_K8Z_N*YhTZvJMjx{B2LHX{`Gg%9`Vi zLsm3tAKVgTXczCMu6fZTg+n|qCr^+4&yK--wI+!h}a*|D_VR1^&7PtaHTf$TSN0ZintkNFw z&?FmNg&9cOa(T2y%dG(G#onX6o5?)pXivJj?`U0xo(FoPw`5F`24O+3-%AK{^7e2@yAQC6A-3os6jw!~Ozw%CZgQw$Yp)9F z(L~d3xm`_=p9I{BN~$7PDM1sSnOfvQpdnM_(U-2E28t00ltWr3=*4(I{f_`HH^p=b zelk}LzEzgLzQ`Ya)5U}UYFVi7;bn5yoy9%;4#>7q$aJH`pO93}7|iQ8K1WP%{lUmE z^!58z`DtChdnh7yaJ{bIvqr0vJ2YJ8-D>fCb5Dv|LoC4rfSB9%VK$Vt)3kiSQ}aVT zI){1@%B8odrjSj=nNitB4_kvAVue-xSGszHTj{s@TC4g^y{cP6ln1J0rOf{WQKd|U zi@tQU_^)x;+NRoXr@Spe-dcv4qNBN1f3i95CkavgmkjJ-xvA#&73^DL^L-W^1&yxUiWs0$@Ftby1(gO%rH#)@B~O8Gim9p}Z+OVgLXnyO>*GY&4=|#N- z+Sz?NcrqH7pZ*Bik0(E1i=4&1IDru}to3!1VI;GLE z>_y*y=Z@Jz41jULMma@ZzKxdPbJ5=uL4z1}A`fqFOhFWZ^TP>^?Z%sv+I5QMJ@jQXlqYm|tGoa{2JEi8-WISO?cWg?a|Ik#P{9i7GPk1SmRJ*hy(m@tohK9#` zBfubLX-LbE_O5>`KbJAwoyWkI?em^a|7w`o`ANJFBcB*N0^ApE!?0<`{v@gi=Qf~1 zh}brDf{&|)rb%qSm&;=nSY&rvoKUXHPRGP_o8)(iWZ~EPP{X2r2r*kw(Ws1afFN#ELb0j> z9)Df8t0EF8XtF-Ez#upHucy7)|TY5J$>kHdPjZ@-41hJ-EEFJ_eUJ zQpd#Q1P$eSfpS$0l%L*VLHRp*h&$u2#)ooRKTt{+0_CYDlpA4kG%nBY1?5(*tI-+X zN*xo*`(+u8-yl$~j)C&>2$aeFLb*OZln;-Ok4x!7pj<2+wyA*;D2>}m~^vi@kjBrb^m^%F_Sp^-c<^r*i3j2~;5%x#TzDzD&TNLFUywq_Y}Md)ik<{uASiE5IfK~Khqh!9%ELBh z%AqYTc{qJaV-YtB+j-|;@(jz7)Zmz6y!2Na?xLr^a%hX)d)i%xZNTI`E%z0l{pqQp z3;FHBu8v>vhakj4}1zZ~ODuK)5}Uvf^kko>t}V@mp;HDCzhy{Uip{B@d* zVA+LRrB8Hz+1t^q5btZ-TdH8vr@jX*?BS-uzV$u) z)WJ*Tq(0z6-ez6PHG59%FD-BDpySm{&+#5JXu-@PQ zm0VUk23BgpGq2JrtyqsBpv>) zDPG@X8&BBfk|M;t1};0()EpC6>(oqPi8FEz36QwFSU{G0!nfMP=Z9uTI6>j}_?&WI zI&Hu}@bOc_ac7X$<`d|FQi@)o$iFQ+=TK-=yifVgtmoDBGIXyvGrI8nrtd&$dceJY z0XA$f&g%{LMr@vBKHE@}OU#QBmB)8R=_cvbfGb}upQ5L{Hp}L}c9hLiTt*VYbakl- zg_uP?fjUii&4>6aP62Q)TM5`-C|l!sewcQRm7Q>vS4}+CH>cL29=L{L$u-?Mva%bj zV#}3=7pr8z4vIG)F+rz_A#+mG)J%lQo7JbN-E-b)OG#&kD6Nwa14L zI&qFV(dzsb>3oXS`5_|J=5c*Us;> zI&bc$^BSx3M{8u{dBLC{eLFv5Mt%!3eiJBvyviE+0dvOjlua|H_dDZ36-Mu`ecIm1 zXYxvrY+17WwiJD2OdSHrj$H&n)xkUoGKOe)?hJk|@Z6%|$>44&5i>aE3e%0!%rk`k z1|EWo3kQ5FA=QBgAcf({QtTT#yByyMIZ;o=f``4ke+YlWi?St&&6i(9=xKvTIpqg7 zLab%p1$?WNHkKJIX>yEPV<_7yA&x60P}QPri=0BoTiqLQEcm@mJwZDd&6?!09l?_{ zC-l;BI28Q68GKwd!fe>1d5G{DOw+l_m*&=>jJXvBM9Maz~B3cJ^_?MHz5 zgpg1fR-xC`STBfeNG+VoI0Hp%{B^q_r0sH`wAbflFZGtjmK?EXho)HtXjw27YN3+N zJEOktNt?GoL*xXa?L#$0RFT*)D<-+0^qr02xr|T!iy;+Ir);o<KP zK7lZv6zSCJV98|#G$bma)x4eB=&Jv6sdtk9lLS(2S^!gXQhK&;B$k=Z*fQ6h_|dMO zB8MDC0jooQW%UUhvdq*!r_-ZveQ1G%9&9;NucPWHUXvMx^BEAUu{!dT2v(!WdQa-XxFB{HeQ zH$we-28@p0zQ%UV0j0|FRL9YLD8+gKN|(!~zH5RkTIVwH-}2Y3u{oDN!jp8{fv^Va z?hB2&bveta>w&s;vO#1SEiPks6ix}a*AW^;c9g8c zH%^Gf*Qc23nyc_a@ReJ%tj^gBH6bz1$A#$k2^Ny@#n;_UG`m}0U-x^PHd7r!$Px}JYbF@vmx@q zUf)R;f=2Oy3?xHW_wK5%0}kH`kjPw^Tj}f5_0&#|0CWkh^eo|dp~#eE`j0s321e(D z{ixUJmVqp!KY_RUx(zm;okcmdEWdjz zJ(6HFF?wz|=DEe8HNEG!+Qj@|odM$32Hf>>V##0g#M*A1SOkuPWMD9y(&~QL78+qJ z7xec&wyYUxa6jz7z8(2PQ0P0J$Z~SEx`Q_L+dRJUfnw|Ex^|?w{r*dZ=qi7V>Y&j) zx-i?=tjra9;=H zt}A0p+>$Kd1u$xJuC;9OziPs(IpU-;K_!CdXPh>bj767 zhkaws(<`V(O*T)j)yQb{=u~5t9@nzbf+GDDN7OJnis@xZRRQ!_zcfngd0*0ayc}UO zVp2Lcs%5@&ILk7Qet81#IMhn(FR7noTk=$(v_AAC>z6|< zs1LQYO8~^TIy7Gv(g8#aY~$;q7|-U|wI~Akp7CJ>-+ACW7S}Q7SrperD`hqxNl?Fn zF_hNt)vbFUGnaUM-6J+RkXOQB2}v?brCzlO#q7v({v8LFxu}jh>#TL9kGp5x9Cww= zdd@mM*(#IX<)*ugQA%&lDe#p%?8xAYGpc>5lB%hhYNj-&r*RNZ2A^#il3ryAXl z#2!jBbg^@J?4i^|R~q6_%%OC9r0}E2p)_9(5f{y~4&_jK#5$A?lSWmL5JC3$BVT@q z$7!!aX;kFR2hl^R*&bQfe=wWjP+A>D!snbo7B2On#8SAA4+QmoU0n_(;OIG&*#D}= zY$1eK9P$wHz&l<47HdXPiuk@~ua%tMJZe?qlQGRKs0I!OS^wQ9)4 zLiSYVT)CP3Ft|{Tr|bD)9ZYO4H*$bgIE6uR)~LddXrzn#e}xA(?3jxSmkZG&`0F-l z8u*wklrAF89?=XH8r+YCeQVSZD3-LbtHM*`mqW%`Q*-oL6ZWkFDZ(_YRuxD_n4j-Q z=I3D!U30pbpOjdpVOiwOM?P0;%DKpDM6x1vKPZTNpg3(b)E~#3NUui<5BN@j$|d`cxP0lgF6nxn)nXMbhMeL* zMV2n=oS6HC_jsHPk2vI<^6&l3-+Ur-6ZWkXvp$3%a;oe!PnFF!b;X6Cn|UP6;3|Lf zsY3AZxO1;mNg6)q@&mEQOTGyYlieW3EvoWgvet6lYZhKsU-zi3u|ZFjdv$}uhqy7@ zJ1Ez^a-m~NtNYOe@J!ZFjuZrQk0;2nvbjEQg1!&wQeASyK0)q7x&RTOc^|?PiTluF zvG<|BFdra`DsmrcnB;yeav$2PUSmXsAh>`-*F^P%lVxt4%f{;yWiw7F$dFC}68~3n zZgJ(}GLwWy`30|q2GAxI8cQGd*9C!goxrt@5PvuD%@yWFsR&i3_f$~H{f_F=N($fT zUu!0%Po&H@0R`DGJ(9}JfyyRYMhJCWHnw?@cwzl|!hyG-PE<9ArHTEJ?>4*E<01yB5-=7$n0XLY{l2M_o^4@!BSe z*#Y&lf5Oiq4k$nvN>NR=$oQA&LW%EW7EX}D8zY73I?oOX}csN3E4Kb zq4{?CJ1F!a5?S>+3`b7595o3Ff*m-mzb+$a;0vR2lorEhXfgZ-WVfU!b0W?iTqQ{sdJbeKb^UA|z|jKq(v374UXZPR_P%hYo7mO}(AUe!5D}nn z5&`;c^ci1(u7%$2X5lqa5eQq`%wJ(^y&gp1Gc5Ue4+YnPdtb1@y*ZAId~;Mr{sFR; zqh;h9wTyi8cbAcC`Epc7{uPV*yUWNonKE*Nk7H!yn~-7uPPg~XGIFWsG5d`tBiE=y zMh=_2So#^%TixUh- zZGv%ruQ&1`(Yw-Ci*hv+7}Zm=fnTlrhu9(H1;@xJUZ)5NYwq|UT3FwCIv4v*P}2i3RRoKzY%he2E@A68u{V_lrLje35T%#$alz)rx`ajckd>84}NzQu*5ni@IuZRFXfXAb!N;bU>5>v zQqPI;GUS46S6Z;HP;f{~BG=Xmd-bT*+U253WRT_BCPFn*EQ5T(8su30+NDhq z)Q_x}h3}ada9S_L0zi4JmpiSOpLI*aT$nm--ZGFso?$L1JPIwM{Ly0+^A>fS1=XMQ z$AWrYeDF#Ws@=QIj(={pjjKJ0(0yrG*N`H~dhGZ$k&!WS6}9-CkJ@Yl@LJoJZ4`{v zs;7c%PtzQpZxPm%*QxuGCAl){PHSdiRWU{9E5Sy^R*;FB<$ z&2T=0PreHqo4s&1+;V-NROv&?HBZ7Dq)Xt|m`|{yLw@8^S=5%wo$>1W54c!z zor@A}yD@|{ZTO0dY4KlQ_igcW+!%FRgi5V2oVvBQE4$};vuN(^NONz~+zOhbfX9xa zZmPUZ_C}i4Hn1+z4h;<7mZsdFVLLx?@c?;#{c?10;oH(xHibkcq-OXwhdPa4;oDs5 zWc@c?9nW9Z+`O%gQ_}=b;af2abExj~nH2E=Wd-L2m&i`OXC@1Vd@Grd6|tVE%o4si zd|S4J*K?1;Z9;vYm1-X2K@VLwxzjyOZqgVb94l9Ee8x-GJfCwEv96D=kU+gV&uyxE z)tl5*w^O415`?0iy7R{gR1mNDyn<-#U0jby4E*aJ6}C%W6cgEZ)f#J9x<`D@l-4A!R|8|3bHjsfz0BFc>g z+1(f9zhFKX0l6HJjD_lN3G!to$n1o>4vgjY8{_%x&TM+118N6F8|8mOo{&fQvLHf^ z*-a1Z=6Bn2`Cqglv%#me_?Pda49m&wTnRPg%f)!Z(`1&b_r7AM>F-$ZZ$Gq`cax-6^#62C6kuO5P(`V$; zfs9S7 zBDeE1P=qO3CNA^QW%9+8blVgRAJ9-u=UiM<>|ADp8*M6DrA~{EVwFc-^d=CqLbP4O zssPfxWZ;ua?j{jH5pNA4BR--H?zL+B>1+~gxq`(J#(jQ9&-G!A7-wmPgj{7sCKC+% z+WFd}&Kt>)Em8e7=fJ1}$69re<%*h=0Ee__%#SfJ>(x|JucrQ;)zj38G=;p<)#P3) zb=G=n6C=xCHN0Yui;mdQoFDtohS{C(zkVfs*Q*f>8)*jP;O0iC8S>a0NZ{u8;uH`v ztKT3mHD`2%c`#LtjjY6a8Wz#yE|0XuPFWGr1RyICcTp_NA`5g5oVc~AmLFQ2>~|)H zu)t`*Cb2vg_gx)fG9M>HP$8(BS0b?64r1|B;p}fono4p zo-0NQ?Gi#jhskP;hR>j*F+~mu0?&0^d9Prfy3?Rz(GVvydd?WgDb1 z`VSndv*~7MPwFid?d$~*d30xcfv9(9?@WqxhWE+npR!Lp(`27)6Nb@8dZN8HxWzVN zYBB$;j{^#yfHUjEN{JAt9d{UJX?759nY=BJ?NKUIcLk5EjKp*!e_Jn@{7Ys z9qfVp3-*vA1K*NUPLqYa&(%ci9YTM&cd(o*chZj}1Ci6V9PAr)+i(jnSMThS6)7o# zc3?G#UWnyMBl10;747se!FnFBg_LVhx%&Pa@P^zSo4RIB;~so|DPTLd-Z^Z&m^ z&414N)~HE@bbKq+%m6jbug9Qf6>6emqULmsOpTiMGc;;mhx-6EY&HLZX+8S^@+wr1jm&fhzM@RKn6YY->2bHqr_6R@o zHW64G-MBU(z}fgkp+1%nLHb5JpJ5~AfVIs~7@-=)Ql?~fdL5|Y7Kly#>|n*|Td^{LyE$B>p9$q6QgQN!Rf zp?#YH&KwION0)g)pcW%f!?HHucA*j%Z>KaZEG`uz=F$#=zl-BA!y+6Oc5Kp);oBJb z%6~(a&3{A09@nLwqYAPMkueUH1G!aYUCffrur*E{B==?satLa1T{!?@jyirvLTC~w zX-w-xtm}t|zj*8PE|e@&5$$*LNeU^4_@W`D057Y2bVl#__E+Iu(Blx%)AT6pFuq&U zpFwE9q3JNHNDjNfP{N+WP9I&`OE&iC0tIquwvH|{yqAuzc({Hk77fX23P(@<5^bUN zvdZBH(R5RNDHBt?DIxhkabtp+hX!nse+Y3A{OT+hskP^c&1hxXn3mj*MHk|)>}s+P z3lzGHHcr&kvN10;jdM+HvX3Y(!|7?ZcCK)hz-FI4M|kKAqitSD+`-^~@SiG~9rksX zsD>BA;VO+nywDaP6c&$^Vx!oVTb#adIMGR565MyHXt@S3-Uj=S)@ef!o($obmWF7A zn70et!Haev5qIYojlxV^N0W`hu?F#fmSE~SHtaBFWmb{TmevxS&m?XI;8>;#_3gZ> ztuoR=ti6$}2%p^XpCorU;*sdz4lbR7jC(Ir% zhNemUWA!dvi0Ob_47zh(LmH){>0%+yhgN?*U6rK;%7{dhZZ?=kgX{=%CO`}xLiRhN z9zyXPgcfVZpdR_V-~vA_@9~DSm-JoAV}o{UkyhS^G-Bd^m_LG)gVUEYXj))+?tb^|toZlfcl_8LO_L4vJx#f}V=j&YKpVKZ?pf z*Om2N`$}fPE@R752ap3)80{!oa4&aD7BOxK4pocHLj4xbMOrGR-Ztu4GcA7LXiCIW zSZ3K;FmzXLpj-Ej(PZFTE&X{_8q#9HaksjhX{?d8pq^yW`_GU^K~c8~@J70k{P`ba% zQRlp=IU`xV^r#xXjD$xg^+=@Y#nGlu>)Z5JBS8{&+(K)8+B!$t()g0>Y}}wZjB69Z zLpN-kMvj`{&DE!yB6BdxX<;61uO60rS)>++o4NT!q?dE3b}U@{HdI<%BUCCK22#}` z`BP|D1^gvQEL8kO;>DvSWaiE(Q@6ol%Wfo{1=_?fll*&AozKjel;-?hO9OujFqmPv z-T9`(RW@;tK7k!umUC$0e1~^vH6Z*Mk+!WmcgvzN4WtK{61t$Nw43cYy9^(tVi63a z5se``8b2U;qOThRgnQmku(jFF;ZyJ!p(3bVW}OD0g9cca(sgp+SPk! zCW@j8J<1*S=jvsaJKORd)U$p5L{%u&{{shFLA$DuHejT*!f>ERT|1gl@=H5P3dTiY zBCdmC60gQc?b{vdjgd@vvO#oOV&EQR-<={`qHC&|i^bn{rSrbO2)NBz`~S#a;q&kM zN`PE=GVKg1Q7@aw^f^OIiI#N8J}1F@8*fG!TU*E;=O*?t;FHME`OHhsXYJF^u+?Mm zLlRiK@p{XboRcp(|7xG!qMZJ{EEzA!1R6@a8!EqUbsw?K2@T9?Zm8^Tb$@Nci;3`e zO+{U`NyLR^>1a%qD+L$K{Y@-EiCTF)q6PT7F7E*6Gew76_BxJhnOhaXv;RO%%$=nu z-MX_#y!5m{-8Mo@u`!8xKn$(H^%vWGnb=JvOBApq_HRT0`^Xr5aoEZbF~M2wQ43J% zSpnYbc7FZ@H_;}E)7b7`;;?y7K*PE0b?}D%i+1+63o0ktyq7knHcU@wHk#G> z4z^C7lG?=L+5zDU!$UW+7r@1F_+0q2xP05miAaMZZK~kkG3#ePaa_XAXHEjTm!|mt zncDJE((8MdO}ik?3zO=~EwC?i(n6!N_DF+c&i+Y4E~LZZ(GJ76*~?>l^sTDLE7*6h z*>C8l(TcSRz3Mra;bH{iIA#C)sCI<*RkJ&SqUEV31buaGyO$u#aP<;3d)S|4wN&T6 zw9wf!^^t0S*RVxntNr`4LTAb@>DGJ2QCwr=WWkeYWP(lFf?)&!b{@N{jTVb|9^H#u zHlj3dc9m}R@>ku<=xTpUR_L_YUS@mLldPBcJ(Sh7!$O6JUIq4z&YFGvApS=OzjBi2 zLrH5orR4D-#Isj%moDDix7gk+wVV4EyL9okzQtp8aeLq5DY|$^-(rt0-r2YKI$gZ0 zZ}IKAxTA0JN?p9WZ}B=^yti-hHeI~0Z}Dzjtojxo)Wrw-7CTy|*&gqtv^QciDK2~b zVBgvkba7YT;yJpwyKk{q7u%eDW~V_H+xr%;(Z!Cw#T#^STHoRwy4cmXSn1;QzQv9$ zGMtRQ#iMj_X5ZpGU7Xdoc#bX})wkHIi%0h@ZqUVJ`xdX&#o2v}H|yeYeT#SL;t73= zJ9Tkh-(tsB8Re9|#aX&|THoSvx_Elu;%T~gM&IHqbg`#T@#9xeKpcHJ%gT)LvMX}N z%g*#>AhShkp#>#y3Z~d1{AMVpL=qzA3!`9c?{q%R=`t^LB9!Hn+^xRc@X%)2>f3Xg zagO9`B1iI%ts`0WcO?JwRL$S?9Lb4& zj^w5h|Cf$rh62QhZfdfSzHJ2k2xdT^TgggUrjwO@%W%ell?2>d| zX(FeY@+yg-ToF-Cy7O7IFX(3Jqe*y4P4Aj#&uC&3?A=lasnq&FuzpCxh^rM{2njoI>QS5E|| zv~xx95{=-rgR|*>6T#{30i4s^pkgC9?Y!Vc9l@!{jNo(#6n(o0PB=~;a7BFW%?M8W z>-jno#Hj+kOQ{axv_oC~Vw7TEoPOgJ!$rQlOE|QjycRuT^&Ta7yEU-#^pT?rS zpHNzzp(RP5=?`*Ky`|C)OAGJ$RBK~=^i~*bN^e$nL3c{5-g#18gG*$fYf?5 z*y(T+@NdOzO0xYv!6A|pM%{Ps1;X2+yTmk<_RvG31jH;{O}#~4pftr4ucrAW1b78$ zN?d>F6yaTLydD36vA8TS5|8n=I)d~(l2j@~_oM#)Q)#Ml8NvXX$4XS~*Cm%z!X>cH zKI&>vtMa4*1To*$Be~X8(p453o?Dde{hsq#m-E^4t8?F6aB6k#XA6cx^877{x$ZRI zUU}~%LV5@XjVU1~S6D7+FY*dit3r8lo z$SWt5MikFT$;^AHoV7X4Bi#o_y1NMJ(k*cbP0@hd^wbpWxVUqJx^(LtAOfHSoAzJd zsc)pX{r3vyhTv=}9vfXq6ZN8o1Rn5|(-yJBKG)V%>Bx0clR65V1X)FX@GRT}P-17K#|P9h5}nPIJz-s(XKL zNwdui!JHX)h1oqzoj+-Ubg-h!8K;h70-R0L6Ue!K7bd6SrMD%Kr*pQ-I}Y)zFcKZO z91sGRls)O{%yhYSfx7B|{SHA$mt(;=ykqS+#xcz#7B1?^q-jNlOBgJBH5wVN6T8of zimJefi1I?>zd3qfHI)T-9Wi0OPhc%fmlQ+lbWEP(!@6=HQpH7p3YfFy+f(Wrh^PTaa~htUQ6I*y&h)MiZ*4C<*jPKhLbM7Cg|9X9!s~Jq{kS`7SrPm9b?bZTT?wjMo@;Y0eHmx(M(qbunhJvYn@<6scXM#+LXMv8|GbWm+a;ty$% z!v*;~+agy4Hq&ykES1gBv)1~~(MPP=m~HVkJS%fFj48Ukr^%T1Vg|~NnVNj;N&EHD zW8EvWA9oEF3CHnm*Wk+%7vdQ6HqabjWZn*E^vv6Rd>%6#*5CsBv4<094G!sdI7?Uv zvBT+q4bJ%%WBEQSI%W-?8#5M(QxP*3*5I#`B4hdXYj8SVJ@Mz|PfYZ&)?guaZ2zk@ zSS<^@hcuU-6kUS{Q6yMR_PYk3Pc#SG_agHIrzJzT|*>QG%P%eoN<*oRR#e-715Gcj*9VqvV zu%MiGMl6(_T49=iER=JiP@bisY!)bg7z5?rGc728B@c0DJRv@mIsHH> zT?mweO(-9M(b2ff>ILN=(5pvr`3LHlxV%f2(fBTba&-)plOj+aWDCZJvI9;u4kc>B zTPPkbr3-X=a8C(CGjyFlrUfpU5T%EW%5tc(xk zgYVK{oZTZ`2$Z);hixh~0%gOgvA8@r7Rr;OQ0|vyG~O;J&V8NW&%;^J~# zd?^2mk5W7+r3-;_r*zn+u7R!5xct|MSSY<`#o*FQ9TS)N8cLf$xi$vM?$azNpOJ^S zP@WYZ%31wDDP0JZ=a^9b1tvv9nb!--m(PrW@@49nP(CEfX#7q9eD2N|D9a*Hy84B3 zczh^-vzrFv%(!$RP%e`W+tknqls`Wu7MG)Ap&T8B@(Wo;<97&@x5q%a5&EEKyjC9K z;&O0&D3khuQo0Z*-<1yA)Ga4kxa`b~h4OCfccOdzZt9r0EY?u&6DXI(Kshi1<+iN; zpiGPpWhGu*@o*_!2$T~{C||@=SI_umy`bDZDhA5k)G?v_oh+mA8wJX%VxYWEfD?K- zqF*TA#y2?*y?hq;>UdB}7Xsz|(qWrAJp$#r;jy^9Fc!)SqfjPmD3w6j5Ci24&<73W z?eY+J#y7@?a!5Z=N*4m<0a+1ksxIBa<&l$PpTxdZy3 zp}a>P;?DT=_)wnO50uh{K>4Mth&E*$Z{aen7nBcU=n$RphpA)Y@<;N~c!yB+^)XPM z8G&*yTQEM97sQ8hG5$>Pa4B5~lvkKgzK>O{-s9C7vAFEw+8Bkhi#jHhZL*BU?-E?r z$3R&xz{!kH>KDpE@u7SjkE3`{N*4m<@1?^wb#VmB=96NfoE;10>?o8YHI!+B%MCG5 z{sa1;poac5j1TZ==9&g}avA9eTC`F@20;k z)>dF;zfDm)e~jcQYTQbtG^s@0KJ{LS)Qc!%P=@x(F|d;y0~1cC(u zo=G)meUjeKCo9_dule2n#vVYAYiKq6de+l!DvX1Ivo1CT+q!w;4s_SVUOao>Ij?HOwwS|bH*d`) z*5s}-mEX@74bsJtr{a7ud>%}IkXo*+*I_Z9P zoZ3H&S6gqlKY9CL4@j<$S6lD2pTwzs(b2Vulws~V_1W+H;(`z-$^CpGn@%;y`{MP4 z-ne0ZV+S&3OBvbhCzhrSKlH_$r+0dX;z5#=aAWh&5^M>V6b2G+Pm@WM%7hHtRC=Ua3TvdVj>81wi=uD(Ki|^D7(XC==dw^{s&aNJH@HJ%m zgs16BXha#D)aX7)7dd}dO*R^iq=g~Fod5cRwkG+$OTO==$X%p83emkTP7Mkb2w~x= z&Aq`u?VMnRQ0>1B5IE81m}x}T=rkgPmRg4)&i}hS#iw+v(}--8 z!1ZP7RNhM(kxhns0|S?Y9!b9h2OJ{W&+a0;7{xt25&=z}ATPB&i4KGQPQL!;fH zrY}V2U3UOf#z`cyE|N%OY>&&hP9(BH;-Jy5v0B`ytvG0l4|4MLii37DJ;#rOM%XS~ zeBvY$aXz~2N=wTM7U=8$Mc5y7^2 zzsF=0v7)7&cimCZ(q6zA1K&X_qsUR8Y7+o)L;U;)x?h=0aYKyFC=wGbZM_*St;v47 zPARgM5C6=EM(GB)CY@4bP5f|a7nxv)gXQdxj%bUg)fB<2l%~M4u}vP9ZSpWb{=eBK z8KGX=8UqocOT?gwJF$t*O;vD>7@^$pwP!h=Up9R6>&$#wJ_-6maPj?-(K z6w>qm@3zUWaI5&gxlKO&;s3!lNxkN%ZSo7<-m$mIj;sHd+vI0_cBHs=(2hAl$5viU@C*SxqGj@BrxadlZUChvIFd!V_ zMXS{!*~AhkFKMpDus-}Bbmj$)KpCNa%p^pK-s7n1|M%Cb6ril6L>+1cP9oTgsh`7K zNwP2v;d}fL-}@Mj`xYp9$eXI2oC~e8J&> z2!v+Rr0c-m)wR>qKfkbGvvM}&3K8xS_?+o)L;$SKH%&FnazT1Vk~4o=nYu}Wx0JIJ0{A0k=!rJM4lli zyIcb{2T52Tz;0l!1!Zf$ib2^+{D_0H$3FXxC_7^RM!+=6p3axa9Cb8ge+Sil3oBQLW$zYk6$I`Zd)?T{0{_fhuK&hI$# zj}y(2kL!oByv?-8$dA{ZTj}`ndUqa4$Cn=I+}gke$J)U2>0FqMIFv<;&?a2c=Ufk} zOD%ZrhN+3B2izbWP7g97@GOI;(g)19g=cR@z&Sc7VU0FXRK z-5LwPgTm2(kfQ*&^}7M^itQ)>vibt>ER!ezbizx>^8Bx0;N-plm{~H@ROiRviCdqk z0kE=Uc6``t?3-1d)wM6S>qmsAi5+{SYu|V4`gI%(q8EjgeY}Y82Y5=Hc>~9IU|;(@O4j;VRH{mWGwo0to0NgQSiL z1qVQiUzYHNz_Bctb5p|%4ywfnF|fk(;Gx#WPTtw9CAut zBu$%1!Sc706l@&-8MpSx;3V#hWUMMv?#HxCR$(ODNkg%?f90oC=ej?TtdjN7tdeKv zK><$F8FG%pfvu{i;yyHLQt{l-8zfOPngmagypqq~$q#b(t&F6We1wPqfzlPEmR!|4 zSJw}z*yLVI1``Cx`mdR*>(5-*B)cSfA+k$u^f>|#%%^H7%WyC2ovBMu=X{ogmS*BF zon|r^C~dcrbv2X*)sdYDm}7Ev6+EgNUk(-R$$mJ-TJ5(Gp)s zsEtVHz4J{HP`iP*{||N70~b}5{byi+QOOw-krEXX%R&pqHW4)yN35J0L{Kxd-8Ca> z+md-|tE1RJGCXIq&Hh``zty(3tW2j}*6_~)CMDWGOie0lFAeQd8Dg39`<{E>d-Dbc z#oBiF=jSsr^WMGpoO|xM=bn4+x#zUYH_5|#5=y#!lfh>^-(;DZZ?cT?O$JkQ-T6Ld zEK+kxlrib!^_<6U(XuNIR(c@_T<~|5z>`7XP~sxxB#5g^(WMdBj?_3jMb~}lbdI=( zE#*+0kAm0e=WPP$H7aAjbS-3&t;Di*X*6+-&L#}5S&-2t^ zEf+xWoLsZDoLtvw1pC^q=g2E|sRYBawK{`yBjudb(MHWV`2^27iQH1RDiCu8#AkUj zxXF}rl4m1yrn0mH#*nm=NW_#XQkPNY$ws7X=E?Db$tTzH{^GX=|mMz z_$9Iyl62Z0e0Nk!`E|2s7O$@pO-(!fK*Q=-%q3hLy@G0uBUVVZ~vOj9Q+ORxyz3K~7c<6eyikcSd)lyooZtHZt zdf+iW$F%jT;c6WdgsfM0T^_Pty%a3?|7g9s_RY}s>cL0F>x}Ew%6B@hS8lZ4)%EHs0WxI0Dg#(e z3MPmp_Bu9P!MU%%`Hbt;B(xIb$W?Ht5E@kIdZnXHhxO{OBLtP6eTY*j%zEYC|8H5Z zCUXFmQvG`6M&vm~3D&Pyw*?=Eu2(&QtUfoTSg*c#kWde3qr@$Wo;GT$j7-m<531}*kQOVkyK z$~)NHcXcZgJ@ULZpUT<45sOkuXclF9C$cDWc*-V<^+&7TQmQU?PS?JPt_qZtozo9r ziq^NMvCu&aRL{0G-9DLgt zl2!Tdmxg9lc4I6(dj~SYZcl%FcT`!HcNI4zYFaU8{8}k{z5JIr(nU) zoqaWY?higb$}=pFLw(Ay>^90?8jkQ8mLJ9l-iWte8?s&(;LE~p(6GfnMlFBjy;Kf(gOL?FvtO=zijOvcuz~<+=@LN z)x*ZEKVa$rT7F*)TJcQGR6u@!1_#CN6v>zi5!b;v#Oqq;;d@M~7%d1c^9N(%u8=v? zNn;TVF!?kE`-*bQ;sgkur};h)2j{;R69aMZ*3rabzpTZy;$86HMU46OeSE(BMjI>Z zMEzLhZdJ$1CdR7WI8o4F8Yio6ocIXQg5@?cSBk>_9E|f3F^7s>ZUioL|BWmSTIOaN zUBYOrz(~tizG4F873a~8TSkRXY1cT2eZL2*Feg`V~&`O84J&4z##T009q?FB{IwuY7P|Q@&fI<$zQ?^+p zwz{4wvW2gwfU|cf_~aGPwAgjGK{7#S0MpRgB80CnJ1D82OIZBh=}eyu`Z#oby&1pH zVtws>XXyI+%v<5t*DuNS1V+lPt*<0L^y};J&-qSIS#ZfR`8c(QogUWL!?eCub!~lp z!poUJTVFqhF|zaZb!YHx==yroMO|87Qw20_eJu*MC)U^gXool>MikW6*QWPP1j zDc0BPhNz+kLpn<4J^g>Sz8bfOuCKS3^Z627UpK*y8PtWoeMudwGp?`NIO*5d{>cje zb1+?6Uk`aWM%wy15D0Z?eSK_KXY1=jgU`6WE)Y=Ludh#y)`@$*%cb=-3+>UY9>FV} z-TLZ4i$VH6fEZaq*X*#qhNb6Q7YN8(%ZNzM_UkJJE2P<{Utf>FGO0*F{T{V8_&9WZ zEd&UmM7CRBGkN2|ZR$P27CNl2g~4~h_0_7i4BCCWiVt)9^>qX)c359O7$kbVo!2?d z`dT3x)l`5_f1xM#&_AohR@YaB#_Ia|Tfpi1`nu(Be0|-10PAa^)wh{8ukYiB$Bw9* zNIrU$+}7W{MOi)(JB^tugKMY#Ciy5z`yD7?2%vFU*~C zbU-?{aH@QVF8epqB!i=_r6M;cDVYNC-Hz(A)Ph%){t>}eJiHak(s8bQ$LOHXK3W+Q zNvUgN*&wunnwjN2N_JaH2SH6inmvoi!G_nzN;wPTk&%br3+6z*zQJJFk!(TfBLi2bTn|+({$;mGt#v8z#vUel!T?}<-C>C()6tX zr=@8H8pcS4p=tC7oTdes!v^0GV%2$gqMBD|ql0^99@Vzu@Ysr3+)g}f^V-U0J7f#p z-%*o<<4~B$?{+<`+ozvT*)oFcgfiOhJRlXbbFitV#(c9K1@lOivlL9GKcQ#M%I5Vo zjt}&D+H`%Dbad@9OB`@GHj#fgeb*HT{Wr z35DHPes1V#FwFC~ijn8QWPmDNX!du?x=xRw2vQJvP2~f2vtSRR__ez#9-|rHrbhQo zn_wrYD1>t}&)-;Wt1z(MuVB8E3X%&f-Bkl=GoBVu%t%*plr5#F&|hsQvn zj~%_jiG%N8*2Yt&(RA?5AISC!aqvCb;GC(MO6-IZVZsl-TT%sDD61ZP4-B9A?nO1w-$f5!fAK^%jg^kDtqk3C{C?Jqf!2=cuX8D+Z9p#@$Oq<6Y z=6KKGyN+}Gh4cPRb3B)06gtP(!rG}wmkx704S=;do*=rT&G9+GiuyS|Ir#XrbNqvZ zpE}1cd+|(j{HEo68idaAr-$q3ID5L?9Ot9^Uzp>u3R;*-9p?B0=qb(dr~B&0qs;aH zc#dEDs+i+b@E3DDdoSiVZd$vWC+KpyP};ym3PPRa%|Arf$2~}JxEJeqy+^|BmpWFu zOqpR>CY&?uWwo$;$~`Sxv!W58TE0`K!o3@Ke{6~rRc1Tnj~P2$vf_(3|FFE5TCvB| z^m;dd{4RT|Z3hkPQr@hkbUl`a^8AB1QIy{0dG-j#{L{inmHNtiUp2B5eK1ngAp3YJ z;pnU^%Rg9h5W&!$)2bs=GyPMv276P3_IFjRyS2yLJGH*}M7PC*%ObtD?=u>TjF}uw zBYQxD;Sw-jD0Uq*NRc2G^6Nx;Y`8pG>nQB*we5l}?vR7Eyh`qRR(Y@70^C@ZsD)fO z6X5z?<+UG5x9=h+sak{7D?^G~7Mm_5EQ^utRh|*ha%+(TTS-@b=Psa(oKyuBppdWj z0cc*Iy+yr9pa_-7H;l0g+?fh*HgTYZNUk2+S~}nIk}=-Po#cekovq48=0aDT!Fj%y zFQv+9m4l_ja)>a=`Rn`%+M5W#bFjaQH@0;+y>gN^WrL7*-{doltSYlTmR415+kn)V zl`$xcOS&87NH4cpQwrxuJd^JT`U37Df5S5OjR?aqAEpZ^my{u zutPBA2~?m-m>ldJG9>V;h=4$dc({_swtN7ljt;y=hdsjkkRTQe#k!&FaJV@k@IIv- zD|WY;iZU(RN}}le$IX%~CEo&bH#1pE-iW3zF_w~xpwPM5HI|Y;0L7_pX0(*lqfohR zL%>#CQUwP@r?1$x0q$78gSrQQ1NRA|<(^seJ-^Z`ZIp92;=(yr{;$0@<=YMfi13=G zX0%vJ2BKU*S_@_!b(avBCOjFfOsb-xw0q5hQ)INI)DNgAcYbf)G611v|MS$35;|)E zZId;X+K!yoLL;KYq{zojuY(#ly zKcSPcNy-D+-XPSkRPt>^>P~_M6>l#)M*)ly5dYLi)wi*MJqXOFpv*J9)Nxw9nB!hD z8Rbv|D)PB1NY%G7cM7A#d7eVJn z8u?&yi81D7y^&tC80z9qx!(T<Wg4mbT^LI0x$9I?4^v3Jr;MMG2VSG&0Opg?*S&1LmFy;a znTI#&+$85$D7>QcY6P$Fp|)&oVK?%EmeOZ2&I?LgEhX#lMP=>>Vf~~rSddX|Da8(m zn0p)`i0Lo{Rb{?m1M+ilyqi(&D%3h~y;4`@mB$}bJCLg56*?{#IuvUy$5%|0z3fA9 zrvR}-f*SOsXxc(#g+9(9;t_bweHTm|-RODKqhMcP>HP!#f{rOIg{e>po`;g!>}Poc{U!c zG#&Yl=p?$1`bnBxqWboVmAlPYP0)Wc?>}vA)-0NVwSwSvD2?8(+--#v2FBeK3V3*( zVE4NN=_!MOw7r6}RFDF#+pXyT$NxeNLT~+Lypa3j<4XTUOEjTM@CyCEhWdX_NdH6e zSNjh+t?$22=|5VjwmoKSI(R~%K_@hXT$buVMsU1B!bnu5N%ADsB*qcU5QI*07?tn> z^^&xDd!Y71;Gk;hEvU+&->9}Bm@k-Rm)daeNfIE%atlF$v50D&5NDQ#)BJvJAr~2g z)S22mi1?0&5U^~$E}A4hB&AtOce{!srEzYT&$##ss(44cim!&Rh)_HrT?2a>#d*6D z#gvecnwl2E6w%03Ie#sG3Av3#^9{0%c}){DTAaf)hM$4vg#?L~;^nan z`}|Jof^!?VHEbjBG1*`wsR=xqvLG|5E0&TA+mu;cZM)aNp5%>44q&3eYy{oK(KSJK zz~~9BF}PGJ+66#E8AT&TR;XY!LtwOp3(exx<|H!kFxp29b1 z4`PiEstsIckm8G7k3nUFgen|fXhe$DXK*b8Uefq&U_$`~T*{*R zFmZe@KL~AcE1vu)ZEJ3?*DadarV>g zwZ$wv>8LHfcpKpxsx5vA^QNBEsee#O4Q-K=I#gRMUkQ1zm)(gS6fFvKc#~bw7Dw`e zooI^%3KDv4(E`klwpi5`Ux-pctObalqAfbn zW*BX89Gd;FXp4Q%R~FBpuGB$W%y<^^F}${zgjb5TSO(qfEVaeAULzY+75nfRFyVhi zTTCFs?wPd344{WX;k3mhyi&BqvdEDB2lX|*wj8Q0zO`BDKPKUi)E3vH>W|SDZ$`a; ztG2kbfQt-GTigaqX_vIcN$o0@hOekx5i@o>^NQt6+4Y!02bt78flIYKz}35ZYqSlQhrEnC*40 zE%Lj}|9AoJFX~<9SXK=0KNu5k;CGp0mAlMUbeEY&=|mFrV6wu|FxyTU>tKWWV2_ez z^;OQ<0-yct0>BvUTYxX33F~}@R>9KmkLAN&>eM>Mfs?#*G${*#v&;a#% zifJz8xI93*@FzYD&jC+ccqR{}leJ@KSaao-aVAO7VLbOXuZ~C38wow&OKU z7|K>DRS~Ku15zbrsPyHqn^t2kAC}Rn_?sz)M@|lVXcuTEI(`Lp{1>1rvG``T=kZ{_ zE$D#0->%BERzeAkuJE~Z(%G%X##4);>se-x&Bwd`o=fXG!Y=xlLFs%Z?|h!<{0n56 zMdvel=kp49=O0oZ>N=l?&QHU0IVhmo6dDG~SojF+n9TnaSOKXYGpTJ8 zpGUV~Gl8-WHd|@wchu4@6zHs_N^0pzrKJ-%+)-K@sJ3L`EjfIzQA-3$&QGSJbDYyi zNgf-*uWl+m=(He$XNuE=W3i~TKo*XI0`kPTA>>UmjysR^_hv<8>|7jQJa&AlWG$aD z-dOzI5@%HLceA7jxeez$h-S*FNDxub2Xgv8Mu8%AAyl75WZMoQRC9O$)fns-m4zCz z6bp}mTXtl7C89s4Ipl76dUqNMVJhctqVTB;Q`t1Y)Z#*pSr2Xsi3@odpoWhNshk>+ z=>;rB5f@;W^wF&y=L`fsbts`zgBBGISMu@bs+Fe+j(W*2v6fBY=JE)+Mb52MgQITZ z!BH!JYH-xApf4k!^^XgV+RK8y5V_plVG5+uIOVV>d3$G$`uIMW0dQ%cP7@rpGBh~q zGXU^7Dq_IY;Hcm@t31Kv{#BB}{i|eyBRen0V~bzx)AGN*mZxJi@{7=$FY6 z(c$}!ICv#~{CpgIiiC*D!FO&E9(ZaH;7{Qd-U$a^zaFo`$2L792bTk;#=!&VtSN+p ze*>uhVGjOe?$67?mnHlJ4!$n70|y@=eZ33eedAE|M{)2$m`=~k!LtM!#KA>4pdk)+ zKZwDrW{X}V4mSI4eHa`p;|B>~m(|@Efm{N%mO0K}r{~8>S0X4={%8RwaP-tfUXLJyIa9|YnjKe8GVhL8Fz_}F7p!{EXdD1tf zX5c7lP`EH&gHrCW=}L{0vr!{~d2}@(-(vt570(B#9Ns}Xe?g2lgvDd;w2B_m!ogF{ zuxO>NO=t@%xj&z0NMiqjUzq6Siw}xk-pdPEdD0(Nuf0C_ka&HE@|yD4u$Q&h=10Wq zZ1Ea;%l&`CV!nU&>`8L%JD=?Pt~58+c@q&#nt%YS+n&}DE1naJhxotkQCiAH#8iyW z8Uiv6KxlkgXQ|`EA78G)z6bgRjn8|$fK|?oZQYSXPJ#e-IVhd22PWuDK|VR1*Aj#; zAfO1sS`7k!{0<%q+Qi>0AQb5!z@^|ZjR(%fH$eIa^aqXW1SATo$ss*Vkct&Zm!Kh( z-^$Ck;{ggr$!k!WI(Ds6qirT?%wnaw8sGt(H4zUC*7HCwk&S`k5q^eHxHZutP@?<| zX9miI#!kRmLmhrvG@2UPD7LuNXtKW1zM|3UDMO9yUf!w*45_sG47K{S(yAS;5{oV4 zNekI(JQif^r;u?NFJR?)_}Fi>*He{wc8>Czqk66Ox*x2RG|d0ZqvowV^BlWOdz}Xx zAidrzUUM$6T1x(c&Tvjx1gVhqqzKgp%E5wYK+GizpE|Y7|0r!ji0qt7lv#+q1Dg&} z$%PgRV_A1prlGPm>*}3{b81nKXV78ml{!~(EMooRd6FXB+*4_g@{mAtsL~6{yTfkL zUe9`1yzVAmyIm~?=PZtYTHz?Rsshu)2ANjnJV!yi3KLIm;E8J41q2-Xm%3barcnM` z)JhC!&kI;tujh2~Gy^|6m8a(bvc}muc{-ou>14Rga*nMhaO>cPMr50!VZk4l z;;~?ZU%~^AMrw$_q7!-g7(B)_h+-~LBu5U1(x$Od3Y?E-@VRs=FW+u1Q3OO@gOY=> z2&KjgR3m|<>uPi^PkE5QWng)YIp$MaThM3f<&9`d$WxBgdOQ}rG%4(QB`;v*>B(5J z_Id=4H;4#H%4^=}FSXZm*NWFh@fz~6XhEGH ztb-6vo<8)ru3G{U#R=w+?jT613ZxIGa~`;vmv6@d6knIua8iv^n?&z7QjJ;ca$Swi z<*6Fq_11rqJQYz?6-lv#8huV_G)FYr2(K8qMWBI3JCUcNVC5M@S%2;I6WG!cmH(!^=BS=}Nv+)%HVJzDgz}oh zJfgjxuB@sn#Otu~^!Q_)$s;EdCGBlMo;(XK}<$D-^3QdkeO60}rW^nrE@37+3P8d-W*eE=N z=ilo}f+=S-Oj6PQ7+6v*Tc<=fyVb$YLrw3B2&&UOkDE-ayiy#mRB#9@ zv9FRe`Y)k}Shm^|(J<~i;M-UacMqieHatY3hkJ&?gOu+rx&JG>f288Y(AUd-O`!!F z9c(IAI&xts@%PalBf#Yc;<2p+-mc_5i^7;^aI;f=m4Ysnbk-9|Rt>!yCLTTl6Y_T{ z-+5eR>8??W6UDt5xyEZxPO*)e;DF1>!(hf3$~LLV5G-$Kq@ zu1%naXlWyRLTPCeS{k`OZFgDjy=kqMZIdrAftRmyGCX{pW8mHEOoeB!(@b8y&Q$+s z8X>d%K}znZNifCjPpitP=~s2UA<{M~az}aYy^*#4K9P3jw?^81{vH$Ery`wEuNcwv z6!$69!Y5^pAU88DNm|x(g$Z|f%o!&ZnNm)0!`_6rAyv@(ML->Q+XQFYIP#%G+=czp zP~68X7NJ#<6$fe694yyN^DzzR=&gJk*u)9O0>Yj>6ecMdK5)HvXsEKEBu!4 z;$PsmOffR3cNXEZOa+>%@gMvmN_R^ax?Q7Tu}vn6UvfYi4gg6Ff^-FqhwlX@c<$x_g4=U_L(Me@QQGWngP~WjfKAw{$B0SNl_n4X9j; zh6%E4^k6GK(d4ngLL5W_d4{~Du*(DjBbtivzk;Nvl>D<7BFIm&_$u2*rECWjdh9J7 zjsFSpB67GS2)fog#rD-TO7nICkJMN;nl#fPCB3odQsa`WSzNe1_g$yfoni}mz8_BI?KP?~(oehoZmn$F>Wt60=ZvbH2M!VlIK zGjyXJqYXkppZ^F1^fWvPhYblv@;r2}`L3j9A6(3>Op%m|s5{}BN#xAF-bPCy@q4&SNB ztD={k3+SV?IQ*;vdjGdTpsNDCNE&Nz zb7Zq$d9lZwP05p?J!)x|=W^c=3eoSx>A&XI62}tBc)_9o8zK7R6t|YCyWrNsonSVQ zw}k2hlgR$Lib{Wga40C9sFZG_(&U&zIKww(N}QZ$P1%uAyZBP~@;GyjH?jLncoWE{ zaQ$d}Hq;5P3CTnMOd@m_G`R&H(>!eB=JTt32F1n90l2}H?Es)@1%PdsIb(U;;tP4x@<+gU0Mvq5&vI)H`yQfN zZE&evJ;x80;0U9+ne5lM2Lebnt)fc_TfGahr;Tv$Q1-O%@B3~#Z8V`!7_<5^ zO*HWk=lDAp$P;6C$`ccnoh}ZQFo}pY-3#IjYz}QMDf73I7MTv6^zUC;LbH~?FPz}J zniQ(a~r0k$B8^Vi!By&0-j7q5ZPXwr^aDp70VhXkdqwZ zc=R;VRX^ty%Dxebs;kOI^5vy ziHoSQo*uM=zs5u-ZpOtxawm%gViaO!tZy;lnL~Km%)pJ#j9o*g=Sa5%1@P-|f65A4}*O+{FPRaOY;d^qvuU*eBTEu%c@(-eC z$_U(rpIsRN3}wg&PK|o7_f;@vk&zMAaVU-RTK8k*8ec!$>)Pjx^t$T3wmL^1UEiL`K3+tk z#|r+0$C)k8!R{Rwq>HQ8IRIHL3{nF2K>>qdv6WhpB94C~+jcGRq~hLoj|jN85ML=a zFLv}^^d*Vr3GYkFnfvnTz|-`_1Eqj0I|C z^RP&RK_8kS(fdFHY&1ELt?p;(8@B6G60P0Sy$>A1@0wEj-|*(68Ph>eP>t4w(xZ3= z1!*Nt6gja=-=zo2bLJQiLBQ*Q;SW6ChiSMN)^JQa>3iveYTpSVt?$Nh)OV_lz8`*|9$!S?`=jsY1$+I}LZjjE zXD0M$vO4SaZuICTkt@a!lw4NtX7rPoyzC!E5}u$>O?C-L(Pc+WmxrFJKH|Lc`@c>kj# z-tjuTC;b?_pYjO2oxWY9X*J;|a)g0L+;8KmiozzxC&U?`LwW3F@>Hyg>#{8+$X^WO z-CB14d1^1#I@n4HKR{RTE`Z_!lOj>BJ2BR@)|-Y2OI%Zun)e$G>OK#Nzpve z9BxYnjqm(kv8xW|Pan1z5o7}O1*BTUm2$9gsEBHKZe#<#hAkABRIty$YO;NujA#Zv z*zw!lkJp-t3~B0XR9BmN=PO|E+6<5tRHnj#12aY1v0vnio&gZ}8!N~kQP_V61xWGQ zi~1qIh8wCXAZA{!O{>yY>_aROeq3TGvplf9461>CKJ8c)!k693&d8VB z`vOHS1;Q+?S86gq(RLpAL#G9^=GeFKr|C-( z$puvmkmk1gzE1mcQTx8Umlo2Ou4+4JpWcsG)pjy*m>fpi`PJoTqwV~uFpRcSGD7L)PtkUs{v8JA=hAkv)~bCE(RO-|>YBE* z`Ib(!o$}NUJwJPG=Q)Hs5y#UoqjJmSi`!Lx%K#q$|$LupN|PkRm?#gK-+0t9TW($D$YGr z4Xq2>4h5yu;r%Lpo&oP$d#Tj!1nZ|S18)9VFwOjiqSr|~A07gcR1x13n<^xDoX!?bC2 z25slvk+Jxa%>f+j;2$ zDDAH=Sc@e0ofn$$3^dK>b8utPQTXfWszy4KJ&cLoBig+y(G$Hf!ctlf4O+IfxU0Ur zwRS!kuBOH{Rq|)aIqs@hN8vz3P*c>|nQRW15{ccSn;u4)f){{6(_JuNq9RJ09ff_T z`}YZ$vHE(0LxIjA0QMHtayP{uKhSUYV0(*as<|ms1Dxn6xE(+IcZX^0eN1^>4|zr7H=U6ySLA8`W622u|67(eO#BoHJ}on7d6pf z9I^j~iK^gYZG|KgrOp8O_EIqXP=og>!;sw*4LSHcjL*0D1n`M{bE4t*_%M9F#^(oo zV!*%i@hQUlefV6BXS4Bn9G?yNe1uOt-Ved&GJICyV=zWU#>dB-qVQidKJhW;Zr$U% zck4ml@y}q4J?EVGcw>Ce_;`yozE}LY@z(hG-f?{pBb`sgxj<7t5%YWKCSrXtBoWC` zF%dH{D5sr>PweFraT5LMbRvE~6cBZB=TAQoA3*6dPQ)Hhg`bF)=R?@|>?Y!V+*83E zKI@72DC+6v&QF_&_Rz+D!bH4p+W*W%T=JZbLT5V>k6jpcA|4si*+jH0Q77VySSJqQ zGw7{}hUNH_;qw4KeczsFxD%hH_}qif8hpOQ=OoHrkN5B3^9eo|;#n#_H{-J&pBM4* z;bR5A|M-cR=)0L##P=4{MD(~Ivau*KS`_!isB@7ySQKuDX>*aWtvI8l;QB!aJ<7OF z7uzVJdyTDGFQsr`hiI`$6n&-}M0qe7!^w9bP$Ma&gQ=arDMACKLexS?I&dzGLq`^p zM1uW*CJQ6xY7<#%_Af*J3HPZ8xFyrvkIQjaTk{IBMnS=d#erZ8E8Y+Ybc?~93iNDR zsmT9RMrok33gRe6Sg@(=43wqW7vsM^h(lv24o%dppd|6920J!b>sUyx3OF(1bd)EV zsQeqLO5&j5sll9is?^_q;J>9`j<#7v>Wg>x6P-FFSU_`Q$2doh9p=1r>}AqO|Ii=; zPw^TZl4a-+$j~7$s2u{m_-{+;aZpJ^;ySI#_Jak&W4x{*;>UEmqG>y7LH>enURxuL zUMSfnp>ZAA;L>U-#X$+8E;dKvPt)D_&wa}197=w#gT;Cqs-@5Xy^3omVt{fx8}BtJ zqKvnGY*y`4nXa?3NvaHvP4oq!W79f_e(T0&G;i)~#wPlV2(15W5P?z-(5W$pBz~J= z+G~0nqzaDti}h;9+7A#A#u;_9NqX}%V=YGgf3B`Hgx2MX8={l4eAuQH%XDF9g?hk3tRUNoC7FwtA7#dhsv$L|C~sdGBc`eOkF?Lz8DKw`!qYbX9JxL)kOQtr66%@N((|IO##k|RnlDBKXh!y^WVC$Ddx?c&DdOf zMg;z`C5XUViJ=JmP5cfcw_5k89cw>8U6Na0qv12lE%*8$QBNbOBA z`v?6xlUw6%=W+`N?SVV#BpcZaNHJmG!Uu=^#;kAy!%}8M~Bsg zvA%NB*M^`uiW#HR*9M&;BNLs{Lhj|###h}tF&1+df(AVoix)MsEPis%pG^fxqG#!pYkA*fHN}<RU+mL=?Vq7Rf>}a7Fb_J=} zc1ZQmBenbvWy}RqU%{oVbEF(U0jcW*QlK;(Pg9UEqwy5>AZGT=%ZUFnTXnU?J4$^L zhge|tlZe;^*BYw_k&2Sw#}%LPf#rdn&fjL(6P<eIno-kK0!LP&aKqLfWNUk#@bOH``cloCqm;BIV7A-ieXN8~RlZ-fkoaZbO8O zuvK!r+>r5s^r%0kFk+V9v*ajy~_x_OMqUV1?jevKx}V##3I|KASKDd zKfz5|;J_Vc^PBq23j}~nb~flm0uCfIr&LdXkM=&6j(~vu0>?iX+~yntXB~3LwQP-c zu#e{wN3|hTcUfd6$TtB_-5E7f;~Z+7&VzW{#7b8sdxGAz3FLCSbr$OCTyFWpn`S^h zh==g*6~5B$<|Mtp6lj$I9LzMNpi+_tHqU5}tJ%|+Z)!4f6D=hr2Fw{-V#*G8Thy{a z+%9W&ShgB-9MhS71mL=wg}rhb4ahHL1g|4iG;2L}R=Ru1UTQWb zWBalzv*~r<3U&+a>1_-?MDFMaV~pHa?wMh?T1tyxX~dmFe0=~;gG#=am2*)TbV)>& zqn=3F*67JJ$vyq=a~=knz?7O3avYIq&CF0T@rUDcG%^)V^EHr|c=2XBOxXnD;qCz3 zC_T2#baNJN8!$55c3hPi8y&3TDn(|rL1t`Z(;=Z{+|_N!E{NNMRLW-jr%&txlS3M= z%2pcEms*|YyO+W>cPCtPBPoPihOJqO;ctyu^6`wN)}kT70+y|&JHV(74)#_$%|~}z z_oC=28AaBG2dNO+=$CTbYg(EIKfo&XRvwXS0y#8;iKN(o)PTnhb|>~*^xanFZcdQv z9PVGj;rf?wxc*`ey{MF>&Di`RH7{=HX|CcFL=H+4nsw18qMD6a0P&S*D7?{k&SN0f zO8oTL*Bpap6>>0>bxhE1< z+?fie>>kSQA@wp54_K-|tMJqQ0-KCHi~t(Y55i3_SOuhKWcylf zfp}OOfthU34jO???0ec7)G*(Cv4BkTO`;J9;Af}o`nO{$4ZyCcu-$VVOR($Hztz~4 zvd9!9{`=W=z!hg^*TuLX8jf9$I&i`ej$L1wN-sKN*9WQvyFPpkdRNWlU#sl8n25C> zKmW7ry7s~@vg^4xpAqUX*tN7k87f-%IlF%Qn;*rlj%+maQ`j~CIz*Z2$gab)Xb{4( zYj0d$Aa;$v8W`8GZolH}%2(%U!R3b*9>{&Z_K?^)0f+R0X%Gl-FQ3qzXl8}T+gv!o z!Lo;tPbz`~!Z3%EN-M6{Aew~l&zKGNlL)jX?@W6OS^&F!mRJ%Jgeq_*U{eLKce;fD zJDMC0*fkx188u)CFFW);@YbSV5^wFIHCl>u-_!`{3s1qL7D$e2TfG4{l>TB!f~^o5 z!4LzTdS9C;FHb1ly~45#SK_5^89SU&h0*iUb{~dg>k*H=E@Ou@=0Mefj}P@HLCIyJ zbTRp<3SZ;YDY%1Wt9!lT9;4wAx(Ku*WydX54@m~YBgaofHb7s^9C^3_OF})%ypp)! zsMVWaPYb234l*mh9&oVt;*HG&^<~#CY+YtDIbB{9QNK|q7F>J^;93#?DY;@ zm*V4q96J~aL?U?}D~@|t5<%)VnNPd88^yF!NHYgN|C6NYW9u?$hK}zdX{LcRpSS2p z^Op;{K$fai_p*F~^FIKA|0~<^KhC<^ z@qcdD_&*7g4OVW-;Z zBs8*--#Zw41Cb3jHC(msan?SLcE-%FmF5b_Aieif!<1B<&(tWy_ay>hQeHpq*UmRS)S zqt)3xLt=}fQY41x7_GQ`$)jUXT#O4L{5AtU(HlfET?9#s$%#@r^C)&pxQG|agB|2j zilE$vfW)RF95_0b!`8zfO6|zfCbgFP<|KprW;OJwl?~+0f+!8F3}3N|+HL^Pc2TS< zGJKgSgr~d%!|~J>m8Ucr{-^0(<6&jNP-M6z6j)MNU{`ejHckVk%J5g_{AUH#Z4U1CaT#udNW`E!t`Cvn58>y3Qif+=*=5qqAKgXL zkPN@TuOm%sVi!pB&2)`4myF}2xqSB7%5X0Lb(G;-aBLeY!~b+$*Z4muQxzE=Ya}E! z8Qx#OYo{|!QQ>Jab&LW}S&%x_nS$^X8NSXC0`JfL!p-mZ|JYuJzj>{?W1UAP1F=P+t?@8YuYRNqf8`C%foCPd55kyw1{pqw zH_K)C@5OXpna5=~Bwf#SAbTx-dhE62KH)kFU3^;^T*2Ho9fH=n3t^Ps1}>; zof?sy!z6g9^SC>8>@}KZLn$r%#+!tc&OTu+}7-L{LgRSo|=sOEM z(XjQw(3d%TcE%Cu^LeTbQOV^YEUjm1$)9xEmI_V2X*AXwp*W=-q)}~wDH1Ukf&n1N z2x^Pn*M{T{HMSOLLk8yr?_K5`2LdfLny_0zqz1Vf7N%(a?QMi`z>l7!QF%?EZY*w2 z-Z6|1NyZfGA`=cycJj(kqcRqe)*K8@ETZZ8iV2eeKMs?$iQuL#U~*y-Fy0jxib?AP zF0*eFm~d4!L8o`;;uI^EOtE=0(*ooy8%dVqW>}8F))WN+-kHZ>BAy3{%A--1wyuaO zjF{&i3EEwo5{dk)y{VE{{6`OGi6i%Sl&SosE#V{OmgYjTsX|-$t2mOEmVz3rZS>TEE&LJ+EAk4*| z%ppD^ot(2Y8J>Ci8IwVZV&h*z0IB8p8iTPNfgfpA=`m7tdbBgzPya`3GEy=b6HNwe zV$&yD7xwi`w95P3cg4}5_o_BU8076#f~8J76`%|xO1XY&IkH9eg86-cXVfHlJ8zAd zl(KnXnq=B~B+-8V3gKmgO|VdBF;Nvod2b+(LKhM){OqTbdI@3b(c#aT>H#`!214K^ z>FZ_F5dz32UuVsDbK$R`fy?=^Dcds|7LTD|30~8A2*DxOpr(+D#Btrl2Aft(~Dr*g=B<*ZbKoTLEeM2o=q#6USP>!T5>Eh#i3qZ|Al zO=(sB-=Go(vp3880Y{wib3LhS`g)Swep(N$2-O$|A+*qv2MM@4pNlcn`UMCBTM^q@ zz@L!yiuK_Q_+wGLs5gtDUl&kwk)pZC!uVMfla<(<3`mGkq?x!K49WdSh55?qXPY1vQIO*J#zzcB*pmOmFN>wFKiS;8Vm(@FOSPpe`WW%Wd zW<7*BVnwJbj?K7WQ!O#AVLe^7oX~C^jtso99a~v^m(bXi}D7`9z>8 zSV9r#pZ)57da)WWa%S=?1<38gT=Tf>|n3cmo_j!CM*{w`IJ8ctVeeVSadWG zIMo(#j+R|5@YJ2j?>SHJg$840BW|a5>H_Zcj3W?q@IIUX*062YAOx`2-pH<;ekxF~ z=7BQUcEu}slpnWAC&-MNJ2Si&+!1+v5x0k6c?8=-4a*}aBd~mt*y!@9gym2jmNye}#Fv9Q#d1}6EdSCoJeCB4uzY|3 z*02jzEH~g>BuLA2J(lSjmS&FSWWq98hvoJh1u@L1k{PIy`p2*UCzf#ru; z3YK%O)zk7zEC$+$e~B^z%SvLS%N>Mest!wukfRa5tWzwn3Xf%NY#@w@SekqT{s4KIg))lo7E-EF*l-e*HPLI{!poEA(t668r$Fh^c6W$chmc+< zTN7Q0Lhc1-1A8IEh`y3I_kMx-u4wYS3X0c6AH%}JUWDS_YBL*aq9-GB9&&)r%47G8 zBk_Rp+WL-2g0VHxtEs|7v_%zWYc-&n&gfV}!FEym_9y4D3p}cK z*jOD#g*W(m-49H1K>@f2q#eYD%VT@jlV1<@Vrlw7X>p;IeS;cU?L1Q5p!}0qOD4(o zce%^M+;6eFToOm>v$4iTmy!%n(V%VHA7N^cjY!K|TVzDaBKT%o9< z50ff-F@&_Hir#oJKXzt?HZUPH;H=*R!xi|!F~m+8xZMEUW+A`KOcl2lfgAR5u|h$P z5s3i1hp5Dr>{T#y+QFLWjTnGTLXb@Pgbde%E7^L8xWedJtYNYactm*MA7&_o=_>GF zD8P4h0{j939yyE6(E~5Vk1##YKU?6hW0FwM4|M|kS&SF~|0t7sKGwII7{eS2dyF-p&y1=+6y-#|6Qz9cN!eQYd%6SdP0W?}%z41wbr+M0>EL#cco=}EtCz?2Ia z5+93I5VPqK`z?OxsB#w&lYm%OJH+7jaeBm_#uoTAh*eJ+3O|l>2(zIbFyk97lPFkFCQd5$t9 z_{?u%7kv-8*P?N&k9`HQ7Dmltmv96|`@SUvX0%6O77&01^)Y`aJly=ti%$%Zu7o3fW+ARZN5WHwd+i>@$snu~p*MdNa|CW&=OwF0 zWr)k}|3&eMB^%IVgAMdW1C}lJUf6WBnx;;5!d)wty^Jc{LmA(njG#mX&bR#A;GC>JTrD2LU)jjF zJ;7jlcTd1dlN{!R8RvqDw9iTM<{#p2k#>ZRba-s_9tqO8mZkG1rK?6~nP4Q^%a*qw zC3aR+nXOLruP&s2@8UXFiiEd^{4q$>X~h?B{$Y79we$_64!;|a>gB!Fwu1)t5soM5 zLfr<;#`64w*j!2P7O&vOsJ$%yjBrw=zVhBzjqEYB%Nu20-k{T0mVdD1pqyXpbW}&C zX8Nzz8r}Xc4SCzUG&*%MyzzA71N^;H>x)lxTRgZd(rf!ZqoK%{$!1NPkNiVvRb_B;+(lV-3%m2vTpLW@BOdDBjiWL zX7#4EnDw#9Z|bqF_LNTJTUZ2JT7$XZ@!o--UN3Q%=Wh=BztoBU+3T1P#Yp1jJYOVI zP>!q}?2pGV+mPI2oj*Z)69K5$?qbcQ@bT-A--Fs?i?4!M-;Jyj+!SQrP-cG=S%b^q z9~mh!fKceGNYvH)JHps5+g7`8v>IwA#8Jg+yywXvM5|m(S6~8r^4GH7z*1m=h2G>~ zX?sp7nI{2(_vy9U2$L_T(rgon6bhOlExDbgpb_7c3Cq)p!_^XItTNmUE6TKND~T#V zU7ir4J_ZBDkR|CE?EH}G!cx-LL|?A4lz4%nNDA>h3LzJKz*bgLg>Y0(U$JY0!BTpq znFhj#>v8gMZ)AdhInNs}|l?O8NIYh|YQOMxDibICG zHv2oycp2=OtosnSI-vmu;Ius37O%X-7k zSv=aXe5YLRe*=lvZ5#X>t8E*Iy6nvXG*>qmoV`F;Byy=@K0Il<;|HE&r@Q|~Ie(4+ zI*r1IzYsF6^akJ^cuoAzC;gW@RWc9Pk$Dy`M*p)PaJK{`xcXC=jPQ3nenMb9E9bB4 z5GP+I66KXQu=98!ODQaRhLVGpl85kDW#;KXW%Rr#OX=Nshz7s<1b&0~`x)*tQ0^S5 z81$N#@r~v}AhK=#LnQom0g|6WFZrdo=7p?7>G8fvv5=-S~qdfcYG)@YvR} z<#<(c(0L`gI{#zplRyS(YJ!N9h|aITDh8>6$qp}e7$6A`_F*mfZYlVV*F%RXeUT

~kB=+87VXdsD#I)E`WiHJdt*qiL-A324Kc3k_0bw}qCW|( zRNEdkHnpBmD1c!MM>$AgsUF0$sv?)gplWHWrKFN-1{oj-orE+hp&zK1q}AJdKE~R% z0aZ&&P?bYpsEA_ea|p=P}Vp5WIH^``brC7`@EvJ9mOL!__y@Y^J#i44MvN%RpVQ zlw8vWg7XPmZF|hXZ)%|XW8}w4Z_q&g2}`VH%XLw5rckz_SE9I)O$2P}{^bJpUcko6 zUtGyGha^ksm&Ymn&STI5KE*dKwwn&&o3>mB7k}!c6kqIm6e<^1x5D9tMx--~N5lT^ z^c$HSKOyJ8jqG3oIMlY9eKrajdx8PJ89PYf`!(r+2R!-Bq+YV6SepuaAPcv5>9B8} zWr_XaJkf@r@R`FrMP`Sm$m%JI^Ay1&cX1;2Tx``F7-n3u$u!G*X6CU${{Y@g=}e^wP>ItwZt-k~iu@P?NO>N&@B(T&&l?C9Wk*ia!xA|*$@=4`{Md9R z!Rp2d0E;vL{4qJP2mnJcQUoAZ2LO8Nqmau0VkuRUBfojEu2TXKS$a4iI#yu6RsfxY zc7WKUygYG)LTRYp5A*ggCT7>cB%Zs27Q25*y z*iO{k#Jj0p1Gjp!d#F540#i8#lo**e^IJR?{qL{zz@qekY~{?My?#b{-ExTcpXK2q z0-dq`hzyyqy5ku893UDk8$3pTZ}%VrvmC+tZiq+6S@)F&gK}>XHV4Y9gX^AgmMvH~ zaF6_@DiVEh6O=5NOxQ4VSuhKZq7h#)&G$sQEkQ@S$X|IQgn79wvCLLnZW}8SS(b5& z3O2>u2E@02Y}XsgruSTLDan5<7f5Hh`7>BvtlAS~vYZNb!6sKJVvrly>M=l!RByyy z4(_Z-;W=#@%MwbGcwXQ&+Ny@6u^a&Fj(+~$8rc9oFVqvF9)ZEJwkPQpQI zS!cN_ZDk^H9#{4{MGX4ps^M7)}i#8L)J@&=Bbwwh5(2 zmXbe1)N|W}hkt=>;s*XjOIAq*n%>8Mvb_Xma7tE*eR42Qq{u8uc@$Scegbe4vN}<+ zO3SLdF`EQ;l67&!--yZeE+Sw!u?@#-WhWj>g={4vaV7D!l7mv|TO;9t`@EF6(yB`> zsYi$>t{jc3NL+a{QA{B0;VEX7#Fb>4Q4?3vcadI_IlLJp)3D?R%)62X}CEnP_2k}Zt zUWwyOo{;iw(3r5*C$A(vp{Td{0!NIU*7rSpvGK40r94>&8>Um>Nnx_qH7XMqt9QF&DlcZ5-yj^yunNb8ECz)}i4sRmy-=9>g z+@Z2f%kEU=%{|&KyHg$flfD2g_%VQpQ&tEo5NsMEyVD__-Ko*)b&*4|tImB>EhJ$r z&+fDfT34SB`GT14+C^zoYI)j}s_@yJ>e%3OfaFegDRdgj?v&~~On6G9;!t)c_){y{ zop2klU3MqnIS6>lFqTtxr`lk4r@z7;!qKJNLbW2hQywhau)XB4l`+r{tk=VxIz6`$ z9kA6=cA+$RZ~DwQ7{Dy$wtuFzmLa)QlCFsMmQp*FPmbDLW*R|RoesfO8wW#bt_t$k z&W`0hx&g`y^+*YK`CI(dN6fh0M?#(MNFidzeXrq%8nUIC%^=^t)5V?jUNDK`&W@lz zorb%NeIK+5-ezh#eYnd%zK8YvOmS!bPK$n+xU+|_^y?x|o?W=h^{7k%W6n12?9HJ- ze_FW9^Ftf!NdlP%A-oE)c+M*BY~xFu`~Mf>&e||s+OV8$xXY+_A(=bIoxKtFLKI0L z^h|OPq-5(X59c-_?(E|OCmHtOV@;Z5_zgab@hQP4de9`pjrbJeBjK|GpF{ZgQT8gl z-+|9QeEQ(oKz#D>`8__5U4F7zor?_NE??2jMaF6`!(0p# z?$So#E~6394S_G!bHvH8!Qg0=?3@3>@*wA0k#`&3yRmG=yLgiek8>PNX2x3HFiqXg zA~qVO%LJ2!M!JMsGqn0X`-9V0iK^*$QlQ071N7y=f}} z@ufmed7(BTrsWXCv>b$(mP7pgf-on9gZUwjwNw~y;`l)i^Dq3jrSzlFVQAa09|oLV z2S;L(8pHB=R3YzrdrL?ROF@_7`rx2|E{FstEmxvf`lU06uH5{wO8BXrMOnNLMbtsm zQGGlxSGb2CY;&qNycwiGElwZw6!7uiI;x-CceYf26E!-(oUem9qaDo2;x`ZUh676d z1Xxbc!%To7P{~XZl2Ud;aLZn-IAG?}ho-!tF-SDWX+u+vL`lK=Lsgi%(3E13djO_x z;Z%8S0ZvG`M__BvX znTDK;MDi@9!s6-5mb7PylKpnB6tqrqb^Ax-PK>!BdeKwS@fPAIa{ zW*%9oibq!36@U}ZxmtHNJJ{vVE8U?`HJe%6P_%`}N=LK#L4U!!bZ)FW#)1bq#ZIc_ zk(CnMOXI8}vQoKWjP0Kyu2QW&u9EWFvc;6@@Y>)swC#`TacMBF5*_LHqZ^T4Q$`97 zni}a8oI)(sRom(iP0qj_2;DBaGRea%9mOjLTlPJ6ZqiYx;qAgKx!UMOEsvUkFiVvI zX&3fX;zB|mI|rt0Qp9V~EcRdTB!YK%n58VD-1+^9a$&%xUt zy4O$C-^8vC{6Idxxd@91*;qKt=OpT{!%tjMMlcB%TyPpO-gQsbfd%0VQBhBSUA1Ml zW?ifo+>|Af;P}a0Zc8e&ec|th|M*uw_MYlB*?M*zaOHtnZ1uFMs}B@mYOtBOAcM;e zPg*)$lSK#@dp+*jqOgd_f?Fe^qGXLkv}C#^Ys{X>;@&24hYfo@TYQRl>F)DImrTA_ zs7nvvC&KvYE`-u3lnuaLo8VQ@6kDwGO7%8qfQDr`W|n#z6vj&3ZP3UaqyT2KvE8{1 zM7@H!D+gYfY$xi1shiFN4*X_fb`H{ryJB%~1es+|l1|R_=>c3RdWhuO$rcu_LDqn6Cm7f@we99gbw$TkBf7nHKBt%|JnM;vbuw`IsG?rui( z#<;ZIxPghn5gs!S(K1v12EKzTvOP3pqswf8vBRC+$EG;pa1bDT`4uWlSsZ}414c^; z%Hm71cpiqDD*fnv>$_2*ngfU|Jdu~8gU#cMdK3J?ZZJ^hmT%6*i0PB;S>e*s!Nwzq@EDz=;uPv)MNJFYT33b?rjL#w^M3U z?9EHYB2>|NvaLlA(K8OVp zrv?$85%Nxd4*@U2laN*wBzkrTbF{T*j>iy_{|wBripG~z7&#`R1;QCkNKu{`d`oM6 zgE%1r0y|pX-eZR}g!sg=5>~Xpip2>FqY(OWaW7(-acQj?A1oZP*p%`1q7*h7nqe5e zA?`FI!Q>lMU9Oft@SBex=>7ij59RH_{(ytr&B>r^q&vwFhJoHRs~rLZoeDD0DIEiq zs0_4JWgw(n{fP|J7{WjpQ(Qi?w}FeKL-4M}{r)n0fL)ow*<~#Fz=6-vKQYq;B@)^J)Y7@?sxaw%G!YMApvi{UMqr4s@_DFA28D-bb=H zIrkV17T7|1C0%Ni`fwJplsv*`so7&}x)U@ zWHc=7j{!Teux~&*27Dln-osH8#a4{U$YoB<|6O6n(Y+T;Dj$Jm-qlu4V<5#GKjMDJ zpl8<_`5pf`I)+W#9~|PsK*1)20Gt0L5H&dRl-uP{Eso89njZOw$R@87Cvg)Uo^#AC zHn=J_Zo1KIAXQw>g-_&fKB?hET>`?2{RIwUpBru*C^jGm;5rSR1|c(D})~pV4)>yAzp>4zYt3`cuSs#eVvIr z?QytTYGvzy!R(Cc+1@*h%aF}8ttu^$ZcCmylU^c7r`Pm%aHj#j)k%Rqn+Uyn@Ji`^ zO9=u$K%F|*JJp=AonpH>$B#3ZkRm*ut?L6$IOMsht@NNXxhAr%4pfVGuq9jZ7+!~M zv++E(Ci3uMNUWV^PktNN#vg?^Y5AyODKVnq={W?SZ1M_NA{GN8Ghq!s2KAjTeKSWC zT5Q3+NOID76L0@Q7?kG5IxocvPgMZY0PoFvUlM)5wNb5dZ&XIrrnPwGHT@#kkIOQ4 zEbh%dh@(yb)7z9D^mec#I%=Y&d4(tEN-n+n6Ri*vo=LQ`0;5jN7CMG2oh8YSL z2r8f;HbDnTkPPgiM5m@q_eO2xHXDk~?sR#lW}2Cr$=7O{d7G)3CbgS^6kwUxrYx;+ zvRbsA!b@;WV*kF++WQ<1Ua+zL|KH^^`eC1aS(j%$>silw*0Y}HS?WhhUjd^jtyt+n zSqwvuoQJ&27!hc0Z{j=b+980!?@SASUsyLXdu=iyQw&37R)AQ{2?F|fcm^B2d^~PI zFYDD2iVbi>b#UR-Tgb-u5mwo3`f=OpcMC%nu%FnFU)c$5zV5{v#eHn!DJDT>L_C~} zn?xrIryPrH?Bnmy;UTzFO!fQ3%aqpC9*|ZWXb9EWS;-XtOqH41Bg{(eaXt<*%L3ok z)CAH*xd52Gob0d)*c1*J`cfRps+wrT(}wgWV$v|SW)|Ruw>DpwTYC%OzFy$=T*PVs z1P;4pM=VsEt4ylwO%S3I_tDK%(K<(U(A_iyI{u0Dsa0tq2Y#b%z?`GMX}kJ%X{bJg zO+krDI!Pp_G-vYFk^em>ZQ(L4rC?8WdmQ+xQ97y?`}GRxjpS z;YJkb<5(`I!BW6>L6SBGkr?X^{<4w2EbR4vjNw9=ItH&2w}N_I5TUW`8UgSAYcf)| zuQ%o2b3=DaZ?}#9zm6QMz{Zc@}C(-$Z>#XW`jdG8hvV zv4l};LcFD#YV}r`Q%_XwL{w%qOtF0vjf8%JEQA}TGuxCneK}aYFahzdx4YfwngNa} zC{?#~*WOddpZbjrqw(+7A_Z^^-QixUw3~!+1kF_#1L)Azu9*jsYUL2c_NH$)%@K)B z`uHa!lIiXM41DwvZxRA0C!yAG_6I5lbsP)S0no1vWII>TX-|`i?Ftl|k8$Nfh=gvT z2x0-nB(QtNERH{pMT&D{gwvb(dRc1As!(rcjC12o=f*MKIe3xPi)cf0@TLijwnb{T zkZpE&8MqQ~kv<$k_FDR03=@nYl7^2xpaHbNUavXpe+Rr{ zsMqZ$y1_omv{(K0}yx*U7v_ETMP*(V=bY6pJ zvaAEqcX);bCQ>oJkw@;LbzWyuX*4UP9hY5FDNJ~8~{@X6?qRn z4uENz4$~-h6~S~2c)zYKlmmmwcoKktmnmLmwS{sxTJ2;9hZjj`GKHGiKR|$>Vbh^h z9t2pVa>Y=1mlbf^iYR5TijCxhh3sh`sFvRsvER@=mNr8?md+J@WW4BI)*hILw*i61 zlwr)Y;ly6p0~d070YPEXsu~6|h+;qE?*JHH2~qTlk{VO*PR_BS)QI>l5y6N`)gjG& zA4p4G3d`_(kMpYy|(IcqX|Hy$IwVkU5IBLe5x(0|XNMk4i$- z9GL!^$vA+A=BAqGIhFtwi0Ku114ani82k_I{a!@`l|Ww6!Z44kh-IO<(i=FeKyMqB z%UA!K;l!wqh?XNQM>?l~@gf(o*>8bBU7(^m zxbya0AQ@KE@QvO}OfJYlo9`C z=L9nhAwk`4mU$fv?QY71o~Vn3+yxT>vmDB{Td6gUQt16}-}g^e1;M|3Q(mTt-3lp! zeYzSJge?COqBsZuSFuc##Jsqm!eQkno=Z2ek+Jy7av?Rc9J<6)lBbqa#%Ge~(@nSX zZG{l_9@d9U!I#9Q7Ec%}MM5%<*sofed6re35bn1hQ)Y5*k9M?iFL> zu?~@pP1E)@lzc$~8C#Fna3);$Di%zMTQgFdoplqD0Km?d!|7#t%-;~NycZGM*+yEQ z5~@bP-V)T(;?NULN>xkW!J7?i>44(UdL5QW`CofF7^j3bRijC z!KUtk<_y7Fy4YeM2IbyZw-2JB22BikB(XcGpkf1lMBbSW%V)(5o64+?d^fu_hFaL7 zEMqKM&yI8RzMz0!&!GT+uB;B04s25&dW09sUe996vlN#PAI_F^uV#e=D$OPCdp zGde1Rs@Z{Rveg6FLIV;IvYL>wAJc7Z^35xM+98ZU-jsiA~_I$`m-Uj>mUCWf_!yn(c4_TL~UmNJ`&LbOeT2*$iPaTpJ9uV7c< zeX-j4yqSZG<#^4^O~_>u!k#yGHlRXGA$H6UA+%*)&AvwC0nEkN;lHT-2_$6i(wIa2 z&hlsJ@lE|v$ez}u{)D5(D;_HXdS0j097m8z{W!wmDG;q8P(St5Q?FBg{ROh<@0PTN z5Hx1Ai)J)W2)hZK0>=L3In>EN1;No^-joXtRh9zAlWr1A)}`U6b`w3g!E?o{Um6C| zC`)OGqR+F?MK94eSnB1oVo)m|*_V(t=GqI5PJZ63jt5yN;0(3ND7MM@aI?}JLOcR9kAhi$)6+nFF{h^?ti%=Fw z=3Oklh;a=sw`POiuc4VnXUuQH(~O1$YX8t1sQq-6b45{kI~uD+Zo)iUo`ac7i@YAU zq<;`2%iCWMe&MXU50#hOx6H+oDsnI7SVZ^AUgIf^Kl$`06tPdpL2Qk=pxkt6;z8;I z?CLM4211i*7NtfK^SEtbgrB_YN%FRAEts;Fv;$(jzAiKorgm;v~(RWH=YOEh^1d1+M8pYaBtbtBqk^LIXB|5F6~j}JZk2sSSSr$1nDel+1BFabo%!CYW9{+n z(gCNndF<9<&BdLKU@3vOVg9!Q-V&bynK@`Q)561!oAMzxQ^j>STz>2XzTQUf>-U46+CtLt&W!)-=;Qic zjDfb0E?f!jwvc1EBPpgW#KhA9X4|6MnoMmqHauJKMSoWKia@?P#E0kR4zLD+SOT8Q z?*kuYaKxp^lQjC^n??ByG(_uY*l?ka2I%Pi|3pyA(ZJb;uNsQr4|LX5U`ZvVZ` z^3eIpVfOofeg{{sM`@9%N2ro+v>}eHbfewWmSKAW@7v7um2;#+4sY%;Mx3GiRmc$( zK$q>uma@Jc!?7yI=$*98M^yAKI1u)q5=m6))gog-R8#3DM!z8|Wi2uq4~Wm}g(5ub zP$ISfn+gAVKNS|ep7(kBE6_b?TIvqLR=-`mnEe+jSK3o|h+!{XgOBQPyd4@oVxGy= z+=1aL^B(TmwM6D!TiUY8ln!yD+=VGXi;P2UE#)SY)r1Sl_w17tv#tOX%_N0np7WmEY$B;T}@t{@zJ%oJeIG>i|T z7LS!FAkj8k>^9JqmyscC9IAKkToD9stsd$mrgD|ttK=#yIaQ;5@ZC{Jd zO%OB`Jxc5Z^SlGAC_5VcOO#N|Wg%iZB&UFnB)y~yo_6t4F67syxJlp~N2Uc3I5VQe zky;6zG1)67ebFIKL?{8PI9^GQm>CoDi!s93 znHSPe#LSE6Cw!(U{nut86pB=+N7zrVLN`kjW6;m0mV&~~<$umHy+W7NqbtW0DYGB} z!Pni;ZM-kF+F+L7iD{D3E~m6~Ia}J``Jnv4noN^1cY>?CdCTq)(d$r1>RAzWhfetGl~>w^wGG3nH$~rBc$-(?Z-{7%uIw7-irnrLHBVe>7q5Nhs6XZ)*#owiA2Ddy`$r zqaT+rFLA5Wypy)c7ed!}2-1+$5i0pY#VP9uZBn~k&xpCew4UB{x5Qwtu02M7jpdI1 zI=BriKC|CISbYKIq(4pLi|kGKiOEN_Sl4Pk4^bu=9> zda)C#4>wZZA&r)xE$l@k8cZcH=QRoEEmg)Lw+RkrCGE0xsm!0$A&S3v%rt==D!!9R zn-R)24rQ0J1ZP?zXyNKBZflOf!Kc<1IzebiU>rUq+(rK1(eiwmX}JiP7D?TfC8nG zvO*rt4q+cx$%&QoZ0rDTWdt@NeKpb)vYqs8c`R$EUzl}mFNORtA9G_Y=4*GXw8f@| zrM3&hyl$If0goS|9>%VpY=PROZ>}FfF!n(#K6@hk7fQLG743CO9c97@d}vFDVv}@} z>FVvO$AiFW4sCf9zrxT9_j(ifEpJ7`4BiU7ASDFpv+U3Yv-PA&0~YoFI6~H4PK3^E znCoDu4OT^+adWhCTa4C$+Wd4Q9m3(XMZM@gTDiKhya-r;63))oYXcV~Y-3}S6f5>} zA1PF#vG<5hMzaNDKDwRHM`g9EBlvVQ5;uH88iE^|lEk0jJSwQt=PLQMAwQn<2@B9% z2ECGBZ>V09*p!^*AO_NHc0ucv9>s%`!=Dp+{~+x<`zI6;TnYJ$IXbG*L)t=zL1rxC zGW1z`EWjI%4~SAu^n^+J8?-*Ky9hGCoqlXI`Z?`WgR7qVxu-j;5NGIcrt2Kya7t&TEP+1W2}tL4Cu3@VYXOfG-Y z_@uZWLXP4D9x{VZ@kPAtVsil-^9aD^`$1#0E1{@-C;@T{2xvQG6zC}Jt?4#1bg3}+ zC@x)$O=dJ8Og6V>*i1`wq6JmcnF<0af#0WO(#59MY#VL7uDc#nKwx=}1$AQAp6$?j z1R4A=7bY%Uw2jd%!#wul&96cj_EvTv>^E6R3gf!NTtbvGOzO1d19cRIM_Fy0Duz&C z7^9WFNapAcvkPHuS;t5YA-Nd_P_RRW4p@s!#t;t-U|nh`DpUll3~BASHr4^Qz02B~ z+E-yu^*Mk3FeWbPc#QMsyP?UbJzfKPSvku2@Z6g);~hKZxV<1XXwCuW~4Par9UEPPa92f&icpczE!^`QPBDF7nYUbIBcZT z=B=>FVcu#RURhU;IO?n#E_K?y74|acdroh)y{8omO_Q+9`SRyhr}TH+mpSjuJLau8 zrf9e;bxEBG_|1;N<&FezMS^skp7)eFXE;A_lsT)%m_Q!qNGhQMAun;q%U?S_Us000xy!PeEnVW1wuiT8Pr}dc76B-vegbfO6?6s9bss zlxvfYyVj06>bw&eb9pP!vT9(=r84Ks2TsNAfzx3Z=4y4t5QIDQjuJ*ShBk!Fms-tI zn^}J){tE|#5RLo=#M0bpIr^0JPpcOD2+tPleHghPq|0OYdj@~6;?JOw2dS{&d)T-( z%rhHrfMfcuziZ64G|aR3(|VJJd()h})_k4(42s0SGe}B^P~Hb1@ozO|YYp?XylbQ{ z&Eip>zeV`F9e@5h8?&tq^Q=Lz@#leX z>1p(L1KQHlMngex&dMunV9Mma&ZH6fYHAU() zi-!%YsIb=CrnE{OPOJs$KSjkLjRV!qUxo=~-X~-6Y~u7CO4Lr{tdIs}DTZTp82+vy z0xiNTv<2_W(s8-NjZ4K1xKu62hg z=>08Tnoez~w*rGY<|^?suwo%WX$B<-PGz)wp44W;0!(ia6kJxF+Oy})7kdowL6d$8 z@VDn>h|;F`o$+twD_dZ`id;h)M>m|ubHPng2&a<4!@$9E#G}QXoe&v<*K7abzv$eK z|M1_J&%}RiOU{Y^@@%o*2;_c{F46dl!(STy0zB>iEdKjEKzpzWmv;Q^#orO_=u~03)cpvn~w+!mUka{3Chc{!hT*^_kjvpMv`! zY4=Z{PMh*=OF+bx{)Pl)&O4gQoXeX`)*a3fVN#n*`l2g-hh9Y0)&8kOpFkeOG)9vj z$#B*4V(5}Umvp+&L^tmSx-8eHIRA7GHMJ(bsRm^6m9qkM(i|U+xu2v198}a6gLxhA zRvzkU9uL@ro4jkC9f9u#{5{PidJDrF!scQ6)1Sm6J;6Fczvv+XA7@wbmLHIi+S4H!U~C* zg=zX*@k<0gS~0RnInn&7-TDdrxU8S3W0y!xHet9wM>=wdM;5nG+Rv1siEqEI_4QR* zk4uNO#2wHN)E+RI&9y>@a#b(NpD;}o#x!@jaO=RWMQvZ=&D0jRcr*K!(Dgfh?Zp)! zLjwVo7_<~{aFdwHS+{yD7C{U?TQ}kcYg&Fk%m32hzj^+A*h7Y z=kJ@m4sP3y`})_h{h?$X!x>i24R4=5$zwc87dBIQs$KD9fU*@17r$@zI&#r@8Z5AP z#OE?$2kY72eET2=f8W@Gj_( z2=`w?edSR0Hmk5eMvpYBaL;7)YlkLm701`s)6+x)igj*iac+3)^xw;Qwd|}k({(1S zUt++W?m7e3UFV8*3X+a3fx&3zPdo`}(9e-(Zsi34>k((bdc-+leI$w<4C_ZidDG4v z>wo11fYz~lPaFm#_0WKk8g&xZbylN~)YXIWnIauDFd3lq^fZ&ilYq%UPfv&kpBa8C zmpS7&{f5{hC_Ozo0Q*2L6MYiw-Nd>?`va;6`vnamH+HUp1 zyA<0amAy_W6zW;%F#Ggpsc*dV-VmhMVqbit8p3SGL3j%k9n_nRNuf*m7ES#sicbc5 zD>0-o;Prl5Ggv=8huQfoqvJlFWYD%EmUR4%GY##lDL?$O(b^0~kh32J@^3Kzp9S*W zJjuC3{$G?|hkX7aePkcj`RTkvn3wkw&iy>}OG3ELNh>%PIRhu1g)#>l(--K?8f;7t zitUe~LGxp~i?H4GqhR}9Dt2%#x|An5cWlQ7L4J%NhbONg_WTeEe}^=6gG2r&p5)vi z_fUR=!hHm}??-`r)Y&2Lf^2;jX=hMsd7kncki*SRDe4zB&w}&2&dgQBl0orJrn%>e zYY`&m5~X=@=Ok#%l=+_y9F(69GAQpj^Pm*}eC7cuK7_WM^I*(}u~+qh-GyUEDy^1=Ag_oW7=6iL2uSMW1FI!`my~rVf*VJ z1>0olbQWyi%9ETcQ9J7=^+P`Y=s;{AJy&f11Dc+}u>B&w{}9^7c5?vRJ%sI^9|hYN z=wR{DdWHq+34U_Qxnuhk%5Tv2iGkQYajw|D1!WF~?RgyLbLS*s0hpZ|=A)*0T70{+ z?l1(!fot&2k7;W^#`wyY* z-%x&ow!bB8fBU0gdyWp)V6+{>lbk!YJLs%I4!LvV{66Q#qP{YvxvZJlog2H#lr8$5 zuPpT~XWa`(3N@*70~DN)J!n1Nrflzgiu2C{)anC2N~?1Tq`_(IQl8}8Tm9uRf2);@ z&j|9*eiX=mLB$RZ`Es7*+#yfshkSnLz|qlpuA^iB(ZNT@tN8vyM#oypZ;a@F4TSk$ z=L&P&SzxyRK$zQ)^uv63Ak2r)6=nft4#tJ9r8YsEL~ zshVM>S#`r8*tuZ@qBjBr+~uRlY%|oup;W!P5t&hNwnc3YPWUNa^MvZ3VA|^30265B zHK~um$C^9o+?i>*PslXAuqM;=uc}Pbr+2_UU}dK1`07kkBAzGV`2sv=;kmjp({$%g zVcNU`>ef{V<-Ru4^y2NArswaX5Fs=rP+2R&%vMJ zp4s^+UIphi_7|h|z)Y=Knn{^s_pWs5{^*5nm~BFHWI|L&82_>dX~zz>^^d@M42Xd( zs`4{Oce<@iT!Nq}6rz(1@ej&#dL^w-xC0@DV4sxh^Ukw)ZS$1qTCc4ZZbeXg!Y(R8 zd5<+g^YT|S!ucWcPegSNqA})b$_eR2pSTr~WTvPwWHpL^D#B6r2^W+vhn;63&iO#I z-e!A{8IebPj8qsDBqQsXZc5q$&=*-N~*c%}|yjWwk>XsaK9o`F2*UzoyFNMGkg1=^AnmQO5URH_R;f zyp3%i4m;rJQMhE_8LsnIc=0fb7lHdQR*skIzu?=0{^MTYBUvuKF*n}BIm>~Jen)RK z2jHYOi#9SMmYPGPrjSP0j1gi~-EQGfquV?q-z>uV-hzNa2$6qK-8;5PYS*2~k(W%L zXC}cM7EZ=&TRF<*jzHKQp?o%@hJ#mN`5w#MDyYLn#)fO7*9`dIfi4Z=e@Dej5XGvc{I;LNQT%COV?BXU499k1QaLrl%`*Juja^6I=+kgF zdl6}+aNdq$pc<$R{`#w+ulUqI2KfHEtstLF>A3>~P___6j&m5`wZPsP2`Venb|SXc zMj7DPe5g>(KyzJ(n`VW;seWO(0Zrmu!! zIgAP1-VB^Bjq_W`EC2ka;y&)L&3UVZ(4MuXZsjy`nQF;Ir6E9tVhS47+~{ zspJpmRltO8JWMaIuGiH0AR4NPhuBAGw;u81HE5Zn8)6V6GXfq3wRhWUkfb`)xp|Hq z0f*+mucbq|8(aNy?%tHE92GNe`yfIt*`GQ$)rRC%7b*OnJVUBS!=Xf(n`{FdFpsb+ zHh9}~s6#T4lj2;ox)*p5*X?cW=_2r*?rqZxJ+s|#6Kl(ALd_cGF}9+l$|iDj!i0*`dOoMBDCSbh!4{kf$ta}pWm|Ci z(|xE?S{)5fKOR2eNsuF3&B3sfvxb}#&AdC2j_8fsd{o9zOx9=~j#z-tM-0VVv@;Eh z3m`(tnhYlf#395xH+vS{g(DEOE8zS@kxkfRw27Q;DD0R zrSt~M5W)}^YzFd!cLuvTaI{>(JvkE2?8yd3VA^JFo2!+X&6nZ^K4FUH|^bs_S#tlg0uc1JW5qA zt9}YdZI#|bqjAHXO2TnNP9@IzohUb@G}>9;h8q?Qh*B20oOLzG&jab<6gw7*w>WOj z3|~n&VNsyX27K155-+7{#8`h7BmGqjF{%)UQ1NwzRN!k^+NCUt7RuNQw8%?`Ll{EZ z;Ff}Q$%~@dqu6^ZE(WWgt5kNRjCbA-k5~{W!nG;a*vdCq;op6=-NwEHKy<>%0dy3? z$;^?OFm5|i$FKdM^DBCVftq^^-hjDqee?NIQj0G-N><^{5ASJEvIw73mN=aEXh4ZK z_uYJN?xB46U&Iu#9T+IeLQGl_sSDqAN*_~#9FP^Z?K`~1T{4b$DsiM_Alm3(@F_Lp znDc?BaHFKqSubng*CAIj^sDp!2k32fG+Be#$pI>h$+?KCx=mhqP|n?7zqKk}tBBU7 z!RdqT#4bH#1`uvM`B^SJm;=)&c+w$heN#2u>X?+(<;sB&fnZ}(5lCEFxJ})N0B3N4 z#Q74CPI&w^u^ldQVi)KbLF$jeIp!T2TW?H8bClc;G$B)Jj*u53Qg8>g?dO-FR}%Nt zR7O*rD|pRhzD;AarcyJB*DGNY@pU}+m|c-4RbzlUy645%giHwoP)wtH@fMt5TgY00 zOzKgg1W|KyUBGL_xa5*(aXvr;N-5T41UwHBNUIhofr}Y?6q+UwiFk=2mr&(zf{_>F z?0{F=V_I7I^3gUhL-5CQDk z;q0a9XmGGUg5bay04l>wt#PlseDXA^osBOw&bkwT3dpijVI@)0YJ^_QBFE(Ym~s&U zN`-PMWw~9LT05J&HchIX&0U=?)SHKZu)sF>kOL>pwi3P({>@qcBsKMC4w$8_!yP%C zaaU-XNn#3^r;PyjfyiKZmipGpHQwd$u#Ha5KDPGe)NEgMsS>JG*_u0S%G%^(a1|P* z6xx*QUB{5R=4Uvvwlm=uUCjb5Peq*bZluGTHIfxpnMt%%m9y4exl0Yu$A7S=rx8NwgUU)5t&nzizG@L1SJ9OB%@S*##@tE|$Jo&T%`Q+B-GQsmM zie!TS#=L@4U?3YxGfb5><+vK^UE{Fctp~~yBMKMfD<$>@%FC;s~B#+sf zjq@>9Mlln(KrsSaRzwx?@B(U-|I6nfF8>!g{Lq+g*-BK37y#+qy&j0a6}B4@^!@rQL8v$Jur5`2mS%S@^J4wyE|XKvOCNy z%#_wdfhLJJ(f51ttF4N_0U(7e8uK=okW?LE6AKaRM#!gp@RBi79E1`ah6NiIW@N!?*Kk7+UD@6G{-H*iIPKXUT-KPnyt$5E!#uwX1D4fRZN03Yr)zCQH`w@F&t1*gADK*h4#UT(!JHnoTIx>k?;3ce|`Bl2Y!DsJL9ojE3_l`fH+dLsl$JgphfuT*M^eylsI&ZSR47 ztK;?WU^jZz#QYYp3E-3XijECPObf|*7J({3uoZ~BU6W!G?&!AEU_~y3fTG14l_fSr z?QanhymRc0V`fB&=hy8MMm83kXDl*{!zm7IlLbK|4kE^02w%IQBrNvS`0g+Zim=#m zUVE0S+hnE(M2zh=@z)l?n%JFC$uP5ixpyksxYPufECjzGHQ41Hi^YhDZcqkC_ zK@X7hhCDaczEqwFAjpFvL0LpWh9)PD!BMYLU!RbQGLock`vhC+k%}qaqzdo#FSwLp za*jj#naw0_D>s9*u&!Y9A^*Nalui$e@t{7x^a1=3i;F^!w4hj9PlgSmhG`R}6B1FM zojkAG*=Nsc+Crr~3jWmEau)^Eo(1{@Hz?t0&A=b|JabmNfP`ffo zyDJ(jM7t}Fg&ElpQDb3YQGtTsdx`rJcPDlyYTB;F6bI`;977*g{$ST!EaPIK&e37M5bvJg?_7a*;f07hZY4^E&$q-9V-aD0G^!F;w6vqI3PIB-n8p>KjgP+Z_50U^5W?2(NaE*`hH zz5@$1inA1hl~=hQ1S$av2znKcS9$`pLayJ7lsIP_A7vh|Nv`jpd+&a_KC+jtk5e#7 z`Nf@deQg`A2oB}rKi)(9=ka#_Q~w74d8{Fx44ee8kyF8nAI6N=%62ZuU_n>Jph z5gbacKgbgyG8F+%YVCT8LB_Kk!i_&Bl!Dli6id#_!R`+LH44W^ISCIs8t&f!G=O_0 zzO#hg{4~m;Fkgf^@Tc{AL9fPRem@eirUh37tDCMoe?8C(?8oc69bHZVcKcZgu}B={ z{!S?iF-k|${=kV5iPNbP@IB<+V~j|!&dqEJXk{A@_~CZ*n4BmEkQG8BOaE9I=OYpN z1I?w|Jm;}L?=cf#A)XLO5QzG``8>p-D+Jg13P=NQ2X79FrB~X5z`n^JLev%hfq=|^ zgzyj2M{_RVvS%QOwi;$g%6>8Qffhf30ZTJY>6pkT%rw>DCmJDO5LGFXrIjFD2tPrC zT?t4%qZfgp{5^^Ssgj}`VSN`-#XoxyD6e$XYP^sH{8A}#_@!cE=ocb$6#XJRlZ$hw+LBhr!db4t6t`FJSQ4&-w_`?j44 z^1}THSg;8o!K2R=Cv}*G(n8jYkz9-uBoJVpBLR9(TRkOGa`$)7wa1yoaCSqWGIcmk z6`O^^5t@51viK1M$s774^+H-clpxsqRw}iHT@uL1E+SsuuCb=SlLSu$2PHQbReb=j zSqlY(O44gobK~66agEoHo&-bO+5u7svL9k_Di7cYf${1VP$=@+<)re83r zOh-)v3Q%mktk$`%NoIA*Deo-m`LWfMP914{a~SDIOhTliUW6asMAfJlKorI;YF0<|Spt{l)9JjH# z35?Z{&%D_&ZuSv$F6*c$<^ASwL*=ARN*fVIdxBzngm?H{dlcs~&nd$sAjnSVP9F>E4lW3f>-C__(9L1+8%|sULk6;-IZi-APlu2(C;zy$( zZ>|Pa33Rf$`UvN~BEF&mOa!`GI)qa%4i`c1q9rJyD8mhor1&7JK^RTMeF6K)S0G%3 zUEHVSTurVlIXM(ktDvX=dMW5&3fxdMu<8)n0*nF+8zuQhJL~!Yq2#+r%-EmDC2COerv-|*2t`mi7YV})*!5s;h-%#V6v`>0f1RY4 zz^3e0@SiTlWNlKeZHtAxd9l*mG~Hgx&)B$1a5OOrO#7B?>$}oPuWA*>65Tql#6bu!yuk)sWv3F>Ur1Vb|bc&>Ch8 zz%i82u#nK;_E-=+iXH0$6#6dU<=8GHp|7{Fh}{&(;h-E72=7icn)b}tR9=zdD`XL9 zLNSg!;J|T2vO4HW4dC)w;kTq|q>TeFg=6a_l7aB~7YuyxNdM%DLZg(!x=^o6oeYtf zpsIFBPcO3JPI~%!{&WA6V5ORL|1-*W?A@;$o<1P9@hG@Ne_gXXd#=mP46_ElRB zDkP{AMp8j;D#*x$QSvB_65DgZqvTPD4S`YOL#ES>lJk%yc$BQ7O#j{}sXbH&So#GC zsWJ*Q?ZQq{gk1jw^ujp6!&VqzmKrHD+O^I|j2~=lfdvWttdVH1cP$b#FLqj?bMwCT zAfB*@-TgoKhnP&SQBhKd1+hDEGi-~@6UdK0j3@b#M{yO0Hazkeejy5lwbs)e>F&Mt zRFDpdx4s7VZb0PakfD?E-CpmLc*!2e_81STsz2T}nh*vB@lU`i61QR=9oCHFNA`&j zOT{~tda5wBMZ6S|yC$U`t(d4TR&>Ccgpe(SU4|ys zyw-qQ6HF&~v!!)3>b|3+pSakzm_7TL&WTWE2u`h1Tl^)78$5lb4OfrX)aMOp`0V(v zyEcITYS<_e{>PpH|KY&H{|@{YI|tx@4V{`u_$L7Z*q7Qd`5Wl32%usL(4PSGPgZZz z(ND<=fd8?;KjgbIIZSo=Qw#3It!1)fp3w_`K!s=Rg^PcCre1gfy+9SrUDBui+31Ka zjOYG=UXcBMcTcpd*O4p1vdW)cqa7IoZvq@T_C#pT9b#BaEs~?FgDY zAY8wTm4zW(?||_jaE*f%5sw0^xEWGqgsCFQuP7(u1I)Xm;$c6>Bl6-=Co9qKh*GizK!|- zrDlHw6N60pf?4LN-K^&e2uIj4D&x0J9{TLKnCq!YZ^|4Ib-!3epvNWPO2W3m(R1j{_5wSrTW)@SoP0cIk5Gw zQ}sKp4z&KQuLf`Z#vfLF!b#O{r0U)M)&J!5)t|@vJ|hCr&4auC+CbMQQ`aY+t?U1G z1sXp-(DjN*{VUt^lR(?I|Le4E*DIfoZGHsC?Uin_ndG6M>ykj_8B}@N*(#q-mB;m0 zo{J#o6qH{!1B%>!C~{5@#VCXPm3%^hJOU6D2OyY95F`%*ft4u#1q38kWBVb%)+`-4 z{vz9PRR9NX9Xc%z#-eun^JWacLglVrCErId++~wTl&UudpvWR9(g%S8Rt0W$89^~Q z7z#410U)xQ*u_Ye(GN}9;LuQ5+q)u^JfA#N$?KJ`vi)1oSO}WmCmGN@%((%YrC4M$ z_B#=fnM3o!`~YtLqMjBvkw(vy>0MLC`(|+fE3*kJGX}v5=St@h92W<$Ql?Pnl%aQC zU{m`cm^=^yoQrF}Sr|q?b7)VMtkcqsd8Ul=OTMK-9Im$t7vXxR5RI!SjK+1ffP;2@ zi-e)LUV2Ji6u43^x8US&SSsd_wZ#;=OqAFVAqMkRxNt#ZmMiUM!Jf8Kuua>lTK)<> zW!+XBq)-BD)e=Pc59nR={4*(k66L>~=br?4Y4v0K8`eLfrEwQp<+@o2qo0)`FAm3U z4lIuAOg8hm-w45Hb94kvA`0;qxE9Ta@GMYi=ZD&$0UCsw5>Z z4u_iCAjl`+^p%z#(J{YfOM;vir|hlyHl=C=9jAy|``TkWY&TAxVcDrpv^74W*XT`~C$;qrsC1UnlDL~Hh59ou&YPKlBT}W~DHWqn zuD7}DQG7z>WzNl*`R!76QlGjJAneir1fKZ$%6=#)0QqTJ{tZ^da6`y}rUE;l2Usg9^`2gdJ6{ zYzEVjGwgB(!oj=bj0ia+O3sLuGh*b7SUDrEOwLGE;&C!&X1DwqviY&&Q%yd9%hD{wU&3q8Ld>m`AZZDLDc)M;t|Fx@g3)vLt*StjtUA@4& z3g!@3V?M~qaU=4*7s}v5?Mg;UVZ{l{8l{%hAEnP&#BizIBJ(FyW;RYCh3XmlunnB0 z-1-qn;c2>s`M%Ci=;Ia4jSmn8uq#`P$s!aRA{Sx5*Do;E9y$ndw107qJVnr9CKs{M z*oA4}Yg#CJi@jc2RzlYsLYN9gWPjkfo|e{7{U!5#`1YQwj8`(TIa$<(gG-IUZdqPR}~R# z#zMD9|(k&(!yS*szDTWO%Hbll3lL8Rjrafq~u%kIM0QUg~+ zg26ZFs>lZVfI|l4oH(W727d2?>jEbq&>03}fnri>8i0Jo)EK3P%xDq9G8)Y=I{v27 zoB>PKICV(cGGSO+mjC@>W!LMn~FptDMfw z&CU%qkNU88(BXtJM$>KWIB^1AP<7@_c-hQs6k%V7g=fMfN!d1@d$xvTs_g*PwpFjH zebGr((L&3)In>S4p<0)G%Tz};T)W)tO$n=;reg6h|2P33;V`mVv`VcOl+-vp2v4Sl z&};;X9^TmA7@Cc?AN6x2aAN&rZF`Yt`6B1WDqC49tf76*hqsia?!{@2b-SJQp8?sJ zvg<+KrXqF(T)Lnk>pRwoo1%s+jWy_R`dBq?8gswHaH`uX3dy-RVVm{^8gu*bd^?$Z z|B@H666vrn+qjqAiaXdB?-RoT)mjAs7gKW`>d$8E74HO1R5^wK1e{}28G)Oo)ON8L z2V1Z>M0q6pwY}^D+{N$h*;hPv-yAFu)vOu0nm8Tx&1e^=P?9WP0ashIN2$sRMXQu0Nx?ab;;&33H_1Al}VX_?j}&BpQ@VunQ? zZ`5n7Z}q9#C?#uc23zvpPh6eVPU3D``c5BK^C_h+XZ>5~K(-N; z8Oo8rb#PrmXFJ}@rO9$>bZ0$owQN^PX_WK6`{=$R8s3IemF;fs5F%$sOFp~svg8X} z^`;hE|JO~K*h6MAjMvmGDKAcwOJf^K6XenuxpZ1uJ-r{ay09ksZ$B?drE!rv_X&BLD?e+%(fioaX%$L9kBPsMSk;0apRU(5{P=>AW1 z9AT%!Z{1DI54z!n}?YH!l?XqyZ(Xb)BZOooVc$1+NQ?>(h>{?!#v+hMC zfCmCFsoRVKo6dWmpj@%_BVOhhEhL=H?Z;+SoPp3J!0-`T%n^DARCGE*$KmyT)C+_q zw;!P@M<`D1$aXn5n#$ztX=P*szW}HrXp!_Y4iYx_wzDC6%jzfTh=i2X!Wz>8h^YS< z&1h4x$GPIAOw-Ts_W=GL#os#oJ&nKT@V5zn!T3FX@hSLq*6%=5+2#F3Uy7nhA^Hy9 z8wkAzw*iEbIc*R^lL4qfh%XT#z5%plyu#5&v~XrZd z{(|wfb>b=b0zFz&1KrTKe;_>;U>Wl7(c^JixNv%WgI6{2VEMJdOTfdi*vefQWDQ`RUOD5QpJ! zJpSVFHx++Z;BPkma_|?7-&5*CNHZSjCb0&$5$y5)?`dQoU&q;1}Gl-Pz znsJtTYet%RfpcU2wAyBx*B7ub{_V7%?$AH+1{S?;s-a27-k3MFH9HOFT)QArn#$_a z+(I(dmv2mfJrj^D&(&zgTQO%mEmkL9@ z8F6m*D{Ke1^y_i4o~>_MgID!grQPZ z99)7(grJs}No$Zxuj79PtD`YvYFaiqRY)Cn>^wQ^={TFVjA+Ofrp{Nv*wgaFixsoS ze%*vE{QFdV$AXzX4~?bKy#INh(}uKWvPt~Hxw%R5d7KZ>*w_7aB;S1D8p(IHFiY}X z3wrjIJL^?^RWe*P$>pLey)9!h3N>MQ-?<0Bc*FoUb++mE7`mp;SM+=EK@&d)Ny&FL zTGA55sG7UY)5MY9Obc>hg~`e~Bs%qP!}M>en6^}iNV`>VrQInw(nP4{ zRtvVYMPdo^4?!CBTHK)7CiN$h?{?u*$tMU9G*;o5Mc>`xmG}srVp6BzhW2{YiMSzL zsnNVSw~OJ_98elTqK4rfOdQ0h4@utuRNoYY>RJ>l`A))hhJow3(1RMdp8Z}Bt~sJ< z(s$Mox(U$*gy>8{^i)szb*WpN^}YB4*ve8|IB2wq@Z?AKKk)^R9NF*b_Z-at^4CGI{`Yt{t*LW6I7orV zr4~u-I-JqP!h}MSO~ixwNL%j&H{6Yz4>7LQt&(qfb*?a5^4(H}%5NoRdIvGnJH-u1 za}zDVp2E%5w4!)S%8PO3d*F7!Mnlq7@59Xp;4-R&n}?CKa}~r6iLKOE7F-_M33ST>$A8kj#UYL+S)#zpRmmP05I@Dxz&Bjp zY=_&M7nNVcEdz9w#QhhbL3uIWswj$QWqrmhjK#rW-OXlk6bxSV5)vT%=p{fz+RhG) z#ps%CT02h3j)4UOvh*iKWyyL{5=;6mtYMzpucsyTPvSmL#&sU($FiqE$F{WkHfP;` zfeuoeK|NPshN*j)Q_39bWIyrL1`*FM(X~W8Pv9Mhhr$ba%%`EAPYVF?`RJeI=0T`yy`D6Px{fXX|B|}i*7aK7 zkCi!y9Eg=AksjwP)U}$3h^T8LRF1*awHR_Vr>;vO9dlN;9!b9kbrGe)Z0i4MR<{1Y z8Hue8BFpz6wj1>lI4fhAs0JanEA*s6#CGo;It9$~^@0nyqKAoQ?cJD|_VKb=JzbJA+;F4O=w^ zO5Ue;A}XN`PIKHM#$!>BdF*NznaC*G{rL6^{5^_4x_`|0qkH;$!ua)nQ#5^RC>!>N z*yvtO2R~ndum{-9xm>H5OzId!8L?q!_(RgTzTuKflR%3b!-QeGn4FyqrHWZS4>#)Y zw(O+XsK1NKJ8o3f%0b{RB^p^hO-S<;5g%l4eQ_M|Q0uiCywf z+Vkvh!g*XW4S5DGkVcB(7-rZ}&rYgIz6_q2c`@nffKn+;g2Lxk=xpXgXLARdpC{T{ zv!|}~-feCinu#seJ@c*u_G3uSm3%kS8YQR$V*DL&o)}3f%2Jz!kh0V*!F^Cr#Crf;VQo=%AoL>E ztVSn1h}+Y40?v2WyMcU~*yGToVUX0dQ>X4=*CE&GI$_#?P8jl`-U*YD+USIju)7xM zgj4!pJ+>{2i>Vc8H8sTUnMc3kshv^#$@lGyFwaVesM*s7_6NEH`(Oca4;@mZ9Ok$- z==}$x{3No!Zg&9V7vT1^7$21E*{<({@n1ooOJx5tQX3e*4aPPBjGs#O2^^2#3+2PH znfLwZ|MVyi8Un;u2J+%O5Ev~ltJ1+cQ!w<2c^Bw3=G>Uxs}FT*+sBAa==NqOV@Rj( zz`Xc|YcYJqCbniLnAPzLw^c`cCyTPfD5NpHx4{e+&iRqSX#@)ng{w+3)ZRKfFHCGw z4%3R9R<<+=us1lba@N%m(Qjve!K4P@RuQrYdV`a{3&p1nxn4O2RzhP|Z$nmZYu0x# ziy}~6bCz8PX!~;-ZGf84g}Hw9kV-;tKV)(w?iN>jb;)$ zH!kWW;0(Z01AqafX*zHXB>?QZ(*m{mZ9h@#MXyK{Vs zyH{OAEUh}DcNyVR+_w; zhiwsUc>M{<2fD|JbiytUL&&r3EE;{F+Uf3m5EH;@W?^7^=Sx+|I6aonB?*E9R+&m( zQmZ*Z%T7i&!#>rpXVOhF37>CugUT>BDtn1d6mz^f>uLcLVYQUwc7~4I=b{6+{nKWS z+bKG35fgwgOAK8IV~fCt)FmvReh9?_zs6&fsTph?{meM!t8)ilPhj`bPxL8YkG_M~ zA?&v8`ke7IC^3M5JFz69DTGvY6nZY#_v7Oqj-BN3(~tiNz`Blq2gwb7{9i!$_aqea zE+|W}3*ls;i|&A}uF(fH){I{8({%PXgVOYs&`}sPJ?%A)cZxfQI{)vc=~HmJ1Jk*V z(@mhAlW}^Tfm4@((>&mG!~nYHLS;ZYXTSajm;EAG&zJ!Ij=VznQ|A)p?>q{ullgf( zUB+?k7$OMT#O>Gy|2587F0!eSxP?pS@G|_8Z)Zqjc2q+cu`y!tr;*pM;j}4|KC1$> zxd(y=So^Kap#w9LdHR7_24K|p2$U>8D6oV#3llgfqX-n(nMXm51TQD@ak>C}T*-@q zI{-}GddqN2t^u&W?QP79YOw2I>9R+Dj9=R}r1q^Ej11WOB0i9vJqJ^m7UhheKRz+& z=Pc~KwvaBfEhCP0%djIwdt$7ZN8HjcA8*9|E1{W75V-ASnWCC`_11d{S+zrp1Esg;rPeg*8@@wdxYAx`_XwN+J?( zRZl)} zh%`P?^#~P)qALmY*~wU8adH{3zB+w_`>RAC8>7MGhUlm=LqJ^Ojx|z*M5Xpq7>BI zKV1N8(q`QOZzPus3L|jNx11N-c^@jHnF9idXD9>&7h6Y41w^0ROx7S~uN$`Gz1|#) zoaYj+g?nCFnUowWUP10KQwSlM)L0ge zJrRQ!Uc8BqWfytNyhlEKFpK6IgMQ)rOkl^I2JA1PFaPnu&ep*efD;4kJ2##N>^Nfu zE~S`Yg_7N$I)kUytx!m{0ekZqCW^l5kS!4FTxD`5tnee`Ob6U+V8a>+2C;w*#l!>w z?F-g}mKl{F*}yCRhc21=H_D25OljIyhh2wrqgnDz)c4mDwG`g#;&nJ^SMnvSxLWe1 zteWQ;s*9T&p?U_&5Gytbee8)X#*8OUO8FhP42mpI$3kB3LPXNA*AOu~+U_ALq78U8 zRQ?^^>vUxiu?q$PLay|2BDx+$D+>`;*Wu04V9+4**cGrdF-k|^($#UE*hOV27BNOT zzO-_zK}+q`7NuS00WTU`j9nh~4N5aG(Dfq6z-Q7L#7Z86YnU*K{iFZ;PX4{$><36B zEP|nzw)jE4#-MF6Td&mnO92f*j9>5lM6lMK>Lf^+aN&TF3HUko3(YV9zy+pEX2kP@ zC%{|f#TwqVEb>P#W5xphh&Gug+rIDKAP>#{|+O=4p#97V-4-3n8Dnx*l|HdqLD{)oP>jP=e=AJ&hv}iU{VoEefORMz@K_<%LIe&(OmT5o&1(4m zWx0guYJB{1duq=Li_$|;f8cuHpe-6Jc$qmtv6`3L6{|n7&77-go;3h!~+9k--=C($O}% z5i(&Nwrvca`q=Z}?d_U61=#umQv*)zAXc8W*NaH`S^F`d5bz&ysu1wnoAs`H0drvL z4vJ$G9OEDm{EuCaH724Q7;ZbKPxIWXXHT>9<+Gn5Pdan`0n~zETbPw7 z2$yJ6PN+HFdnxDvh;3G(cU6qyD=2>gMCHxyaI>9%!NAS)Y4Qc$3b-`9i$co}xhYn<9|&4`NPCEb#u0Dk)O>QjZG5jX1Va zTSDpy@kk+i?`h=YK8c=)@=X+p>F#BkR$FN|#h6TEn|k(&=P?VE=bj;@asuo73+SPh zJ&q(TiQNcX<_Tlh&PNHd*sJudqtJdb&Tq)FuN|MFhsqPDvSS$9vL5UXJTk)LC=H5u z2JytCKFf1TP3h~Ygn8;KhRa?MgexJLDt$(Dzr6@E$0O`@&$Y&xg}KsNYm_F;WD{1SBYb9YLShrn z(~3agUrfM={yWO;Ii}j(o^MpE+taN@rX#eaQG#?evLagUXx4@e$Tky6(d>`7m10aF zZio^FC6dR_@ji@z`}B|OSAq2E9Ec^Cq=pklR*qMir315@eWAB)1(ZDcArE~hger)M zhd}*T8~KX@`PqU$^O0oKRMP4B8wikZ3W1X#EFxf{SQ+fyCy8?WHU&WRGd2N^>Lo4U zp<@xMM;KCz0B0ss&8jcaee^&pnpGbK`CsF}B^SJaWgL?O?G(7&2%}c%P@Ff{QBcJ0 zgjxa%g$v;o3tpEXX_mDik``NaF?$M9yD|2kc$SC6U+6;6w-Cg~lZVpTMg$tMBX90r zHn|n_m*pVR10P@r{0?`uD4d0Z2zdKp#r(h6d-wRLs;hr^CNq-^$-oH`APPdbDK=`O zgEe6Q!(~EHq7!2hA_i=WdD8JxggJngK;p?r4#%VRsr1pdwEB2yZEcHIG}NM*1am=! z09J#5MoaA;Cul?@6NowQckOe|%mne${@y>{&-?lD`H(qhpS{;!d+oK?UVH7e*KYAU zeJ~%gR8Sm33;4d9>&-+!M2Pg-)3hUk6Pn&=#8G=XTO5I)`kN;dAipfS016@YHOMk8 zU0k=h<>H)K!`5QYrbTM%j7-7%_h+4JygwZoh4;C!_YSBl?KA@q!?2$1PhB3##aX!q z$SBbT2ibA6mcVj{%cA_w<)jiI?%y%E=b*YsI!{ht9>c=DACUU`a2p2{R!B|tn$FsO zj>l_KXb2v7AA$$o36Bm<>IZ#2dsjpHo{)AU*k!M$WtB^Gc#3+~IHcY7h*S7;n+;RJ ziCC?Xhe;;@y-TC)dP1!-da}idVA5U&dF6FQ<|^WevJ!R(Qy{<6V>%5aKNr4pdHLi`M^HpzT7$qh3y{o)iTXWR1OsLO-C{Vmz(xW_LSa>A85=%-w z<8?k+232PC;FKtF3a+>?Ic3f7zn)W$vZP%xPN6u7oKu7sb8KyX zXBnErcJBh$<3b|wU+zP>m0%HgeGgtD+SA^PB;$#=197rnyb|-cTtnP}X}Tx_!v;1N zSml=Z({BW)J8_+9@DMb+Do?L)PbnV!GvQv;yE;vHu~lL@;n_%POy^2)uOMa8+s#-N=f1||6b&cKdouF@5 zCw`;Eh`TWz9y#>wQsdhN1d|dYV;j%YxnwnmMJ&U`3gVrLIoxNhb*d?(ABk7QCE z{A|GFkVze)O)kxd@jfIH1(e88+QIgy{{Qm%J^z=_|G&ZK6b$$>k2eF8ofwr~b9z2q zl_uIf&6wz3vqy#re-<-rn1!P;UJmDB3M(UaCnsEEk~Mf6rU#p{Zxni$!EG2BXH-7o@X z03LU464vAqm-+TPsCLksj3UK!c~p9Fv9e3g>|-w4;oIfHRSoC!r;M21_~pFaQ2F${ z=VG4~k#7_7!nQaB?(?y{$NGlmtqi~Y2wFq*s|*(aS^kLD;k>`=)f^bd0~h8?(Ti7o zs?I$oMMtj1T`lm@QtK9=DgF@^p7wD~Q$kXc6K%4;Is^HQ#+5OMT_RJl>}0=1<_d(Y zpd>j5Ar9F3pYt7`9rn&ZM z7E4sayyUb^4U29JpQwPT#ZDU%9BB3s zlZ=2Mbyf6CA@_L8|GnZPG=Rdr%XE3fzgt{sH>#H2w@MvWd4vfAnmO(RasqdC(Z4f*6z?S{Y)dbbs~gN z3(91;_ot1~39{Sm&2SeHbis02fn6SR8Nxl7=zJ@RR1p7TMr#a=@-p8+tT#>^=e(|ZdwlF#QeSX? zSky*`w35U$)(oMe%aPie6PAPCfrFJ%1fs#cX1X4H&>PjGH}funE_@b*HgFi&v9Pea ze!~%>E2Pw-qb$=v=mc&O;s_n7Ji&fwBE)=*qJ0lV=&}TadM!u1CkPu;U?rdefH2ii z;AmLVMJLXC;CfDIKneDiFK4l`)NjgSVZXol8=-6(nx(EM9V`+z(?Z;VOc}6nAPh5B z(3RK*G?^uyncKV4uu~ zyf&A^-&E_rPRDBfVC&gxMI#bw%>{#>z1F)DYt?xYci6Bixj&ES^rtKd??C%u$HU## zb8xHVWHH{}LQ>P=Dq`d8{lO zl8`{hah=*1$E`#XL5x=L5 z*_;GdwFa2v=3s?83M*Ve6B+Owg~<-JVueiTDW^~b7ghs4Fy_%+=Q}SyMkYW60Lu|a z4!)X*K~CUPrRIcte{QLUC^A<|A0$i7!#0P^rFaMnDlElA=29H*<)|oRF2(VFCD)lf z&1=VQw|Xjj0=5R*d?k6I*~rLq;2JtmLhbg^@)u1!U4Km3BaUNqf*TUU>{c6ph4LYA3=K4V$$RW{e^&l0sK>QqUU>5qIiok8^XXI?syE z<{cnB^eVcX`W)p^CCjb%xpZ*6em7=Muvu@Q=pR?Mcb(#-@= zkFOLX=|6;<2xz?#;Ma_xksUi;J!#1$I(t(5Vgg7nr@y<);~)0v6Ok< z3EWis6Wn0xxW@C2_&HvS3>+_bc^kr4c?Q={0}YM%g6INUzVK)739}^|?EYbq^F4z# zcDQ_x#ypq(j+`qmL3~7zdP`Fz%b&C)G7iVhPUD`@XF>T$n(;!*FAT;ZZk%L=bkTvR z8mHg3baTqgx@R0-cv{V@+lF84>m+YZ&z~zNH;nbXCU#$sChmlKq$I<74{{=1aCcCt z=Z#W-qf!^eOG*6>@jWVbFN#5$>n1c{?N3<>7{Utz`Fj0`V8Z_|1-l@TgT~C`qM1ka zrqiwjZlkU_0p*#hO`ch|%c!lLYMZB|a2!(_#!z%F)V7yp62KJMn@&ikG>oY2pC0&* zT6BVuRKa!6eRR)y_ZP(5kAo`o5Nm$hcX zIev(`G0NVh*R$WAK!q)lCAD)d3iviBBlo4k%kApiPANKU&1iM*Z=~qCYlf?HU!h-z z)W2LD1+-1%E)rj-f@2AfC!y#M!7yTjr@wLE11Al)9J>$k-I@a+$32I2a@^BRL0Vhn-7giX!zHKM#>lH@`Cz3I z&j4l{&}q^lPvKF@q7WWvDplZ5`cmak#`RCO#7{=;M-ZUq9JFZ?{$Gm!h4}w{{J$Ij ze}@0R#{Z}Be;5AqelY3rQ=J|kCdKG+2SjB8J)XoXrw8bR$ZSLr_>_Z1D{$usM=9~c z55P*1e*(|M#QP|*^Nhq7DDfp^V;W4Ak>~J))zE4Kuug|WAQk)z-nxT<15KMyi+Cy}0s@{)`99v0Jv_dJxJa8kwGqWy;0(>W3&( zK4sErUgY8s&tX`3(hU?&b~(o#%cK{O0*=FCle3%NtuigPbhGYMUD(mUae6*mJ4Vv9 zwIhX{ZMfY&;7|*#@IHGjk}m9QMFL*o#tTDs7B&vu`#0y~STKUbK^1T}K^Zt-YR=5w zhnc?(XrwuZ_tpy(?_N2jz+*^?G} z7ERpzT0@Zrn=_6mdApU;!}x-%n_B{KNx(U4oW`K@&{wd~pJ@pi7&qGjYy!e;a&-|W zE=t@H`yEv1c( zCz!_pwGsiX$Fn=KES4$JDaUCmyuFtEV@C0niVxSI5}O|Cg%BCZehjWOlO9GAtR+KF zm18_W_0NR!U5zWZ1Xz%Ij1e(b((>2l(Kce9WsO6*(@qzGN_kd1FLF|3$XeVuPy(be zy#lG+)>h`wKCl0B5BJHNH9mF~cnnCD&hix}SCeQdQ2CZ$ui*}3) zc$*U>^f;<+D8-GXaCmC7!$(owNHm$;Nn4`WKaf-KxHS;1TY=B4?kB@5R2zz@)N3fdMKnz!s@li5Al!M)Pz);)LMZYI; zbtCIe^jkFKi#`k6?=eWw+-uTvWzED!dZd8R6Wwdi5Cjz91FQQ}cBUB9}=|{te2C zMGZEQUGPal3m&dM+|7cg>eo@fkDWJ}kfKkpTqruy97pp4diQ>e`U&nP>+@Tv*r=v? zO0Ql(Z?LCR`~bauBjGV#eqP68D*>D@^H$0HC34lb!REe6z=r1sHhS?$vckbA2ASO* zW{U7a%B?3;ZM}0B4kb21n4)&Nhy62H^puc$zdyC2?^8M0j=oTK%W5NjiSiq1K8s$k z#^%3ZiSU9e_;Z^V+Ubno|KL~YmxGm4iYJKO49Y9AD01CYp6TPr|@hr z0S6yKG1VS?@YDjLG11)C=3~3Ap?;y#?vA-&a8F3s^cRS5Wjp174eUIyP_PG8>D`8+ zy?6<4#U$kUR7}|%3U9|F+=)JSceqh$-xE8jBZxKl16X4rSmU&K6zp)F(U*x#VRi=f zNdyjdI&Sh-!l}gI2ECIEo=Ao)MQD=mqFTK(wpqj3gw8=>)BS`xulFTlART9-gAUaI z2Ycv@6WO5wjln9;LTo>|>O)Rni;@T>2@h3=j578+uabd|F)bio69ohXx}bP;J~ z^(M>?n04y~)U5_@##?r;y#0BUQ|&J+^$tprgHPZc68wBmzYxSRQp=?Jo%BJy&ZcbGD^hK(3mU=PNX7I}5ZzCsGpthLQ(&bR(F5+w&I`UQ;P2ovU7YuQ$ zSp!QU#mW)Cx$EmWN(YL8^n1uNL4psUcBX74HZmk^vJPL_Lb9G1=N>f0-9Z9V;WSp` zQhC&V9nZOls`3H)$Pkzh{htZUr8wSo2GLFNs03-EA~`n-V$h%J-p_>~XUPO1_{VP$ zg2a+vAq2z4ps*nXDce^I!B+~XFNO-ihp5|kav`XR^Ksp8q7>A7awv=an8E~MlH&3V z7YOOo0{f$n47l$(EVEq{a5vjWPq!|<9GZhD9x!QqqOQ+?nB%chixgUDZ7A`h%+i42P^B|1{ zRV4|L9l{0G^k&}{6P`LxLU+?usshs2AG(&j>3QW| z=oeFB8dDL*D)FVlMSeD)4P^c-1S=9mX22U0mqM@s1^D2h-XAi-4yo{Ry+WN4_3A*` zAk7i(jxa8c)q#-YG=Y#THRf|eF*pY28eokBy2QVRppGe)krfgI?b8^3fBZHqeP<#| zuRix|gE3q}d=B*}-nOB7hJjZp@KS=$0AFCIZT}q}Vy3A7{n)fm+>g*mO1-XKavre= zJDUQwe5~G@)N3?aj>mQ#Z>0{0y1(^4EJft) zG$=efcTtJ@*|g_HI=&rrB?i8illf)R?V-Ze?|cwN`aa|;96f?H4HZt|a4`Q|gR3g( zi=oI-E``?wt(rbWauPb75@PxnWi{wB8{3$C^iu{Mb*SohV1_yr$W&V0C&AWn$fHiq zg&mwB$71O;Eh?Vh8vkfkd*-5oAnS{YgnD0vv$2jXYImPROuqzGod_j!G8*Ix?t@s; z$w{K_)Y+AG(!!`0ZvTe)isrYkn6L6k6*uN9%J$Xsm5`5|XUtbzX*cJq1f`uQ0IsCb z65gawL!`9-29Ji)uIsQwAFjjF1A5$8&*@4#0r~2_jw$UV>#4Y|yqmI~3Nyaz(-J-x z)#{{&(mtBdi7D+=(3sAs#1N&OzCmesVe5#xY^c&sxnoNE?@7pW7KGAHLx7a_=L|ll zkFl{&FwfFpQ)%a<)Muf)aFH+7Vaz%-h~yv*G|Vzic`H3Zaf{70d3-6T&o_pej`@jJ zb*lZvGiRDN&L!t_g_sw#^!o1$xiX0sJO{XQ=2jCQKFm5kBAWL5DH<0p&7PbfJDL zULos+`rUXS`PPizZ|Zj%+kEvH6KoZb`Gnq3!L~X<71TM;n20E=A=p+x6r(Yih%Qc? zh$uURQAFS%=uMwG&L$g4nx8=rg)bMOo8QePq^ZNlQG^c9S)Sx1>G0R&D}-bQsp{X#vhmSO6X*Ikx`FdmE$6KF`L}Gvbk=qY>3tGMs`=biyGqSdj3hd^;C>yT*u={>0b_+zVxeazkxdAO zsm~yh(EO^Uz;FM>mjX%QUhJwG(gZP)-6tbiSQpTAA$@6Guv!a!=&<#|SKp2R zL&(Q_>&y9ywa^C+Tc^^T-Re2+*T$Wkg5g2@vs}3MkJMM3Ng>F)Cx$+D__MGfqjxOY z#C3j%3mQ#qK@m1&?&H`L3OlizK(fBCQ}5(}Z7%IK`LmW}ht!M-d3@rQw-B2M|I;L$ zTHO$A;m;vFi%#5-peX?GUv9)`Zm#W!?a#P0{=IBfDM+k!PuIr5!v!6f~(mPaf)J_SSM5HtDM1n4HxPI^WVE_mtgmN~m) z&sOH<`vyK;LTa4jd2j6qVP^}RFjiV4qabSpVJCtz(i`m{w`M7P?-7i(D7&|Qe_$Gx zBKz~N_3^w_Lz+pYP<2 zJDER)Z;BYN*qNBJWd^1wTPq|nJ5Y#vVE7>RwW%~{N9lTS6R=!27)j3N(`6#pYuoue zXL$RRUti4D9D(rMl^MB2&juZI3*QOXM~OK`idAmH^sxsJVu=na6b&8Fsms8g>9*jc1#EK1DMk((7{FE*CZWF*AsmrOi^^>>iN)0#o!VeI{3x1cTjO*-j zQJ2(j6~C*jwyW3JF})wfriN@&gABjAb-b9B!(c*_daHXsLJ<%dp`I?HB0L-I`2NJ+ z#*1P&Te$vF-iDUJ?{yr?V#~j^PwWB+cZX-UJa$~ivc7}v{mbPv4$Q5!c~4Mg<0!LS z!=yniP=H$+3veK~Tb=P2b;VTNv|zzixM|5ylk4EwB3H7da%q#g266e6e(d<$I?0P= zpGCU8+e+~xin?&3zS8N3Hc5?%m-6Qas7x@I}%mcIjigXLrpf zk&$o^RYKX#%7T0Co&}11wRIliB&02icZ*U3HwTw8qY-Wqh>>uVJgCIi1H*P;d()EL z9&zl*!b2ndk&6z);_dCk3I#V}A61GvG4B-}K5)y?10Sa0bkyrOjJ-yn8jCuW1usVr zuwmY#?vrg^+H|u>&2Vz+78))E!=SHK*H7WCq1tDv*Pz-Hs;f>edfwxWu5}=c3ki0q z<}j|ju`9!5@2)m)7lD8SDLk0hECRioQ3rOqN(T;n0u?^0Jh*JiUN|TXx=(sSs~u9Cb<|08s!eJ^;G7tH{1r%-5R0zDmY~y$jB32tAsL0f!DB9 zg-13@eGkHvoF;Z$!BeowJB*Fx03t4AUp|`Nu4Y-N{WH!OzfnU*`Y} zr^i_G*4K<=Q})s?&O;%HtIzm{pb7AR-JFz)-~m#zRrrH_Dz3gjn1T)s=~BqLIhlWI zwF-~hr>_1OVIX#8E$h$;P+Y7x4iP$ThR?2X_+{y>bUKJ1hAt_?F?`7R>Z?XUre5+> z3y%6Ym0pToTr{GwcOzWW+UYipLP^kyi;s+-$|hq=tAYnIyntd%O`<>JQRs++!6&o~ zVRpJgM{b(xL|*?`_`)wJDPw;}8Dv4ox@8AHJ`#Sf`{b?#cjxNxhHWBv&{3!1vfCq$ zUIPdR0jL~`g#Mj!FB@` zkP>|rnMusTY3fKn-)o^}dx;!io;dx+Pel{V+DEcuL8@tL;sG@F)Kbt2*RK~LK*az~ zagA6*v+e+NTmASB)QZI6^|~~B<@p7mRy}yiBK0_hKixFdt}K{ppH>TgpItioq|xcg-i^rOtb@s;ccW1MD->fL_$1VWvKE-0 zDD`tZZeBc9sC~Z{cjywgeae<2Q!Ny+q=Vhk>}SSNyMxr_>TpZ4*Ya0*qgcXIe*+}U zkFO8?$XLLH1twZbx9m+{k4II}ZNym+y7|^4FsCNY|0BgY3qZcSAR} zz|C!pyMrIZOj|HDUEIaXjz?K)vC;|e+1`zH2vaYBRq-e$rvbS5ER@P7sVAVkUQBEO z8i5afdE`zf`)@*TS9-;f?>moRBOpL#;tK$-5iPWY=aUfzfXxb>LNJOI!jUc{W*`wK zW`PBQ^i&abZksAJ9ZTt3Fm-G#UISweU1FKwwbZ{60DT&vzgWVbq42?v>)*iE09t;q zJNy!UsCD7z=smmB?&~@-x3yAY;aqQvYc2IgS zM5*r{0_j&5=K*z#_F~N^O~SgFZBM z)gfs7sdTOy2vl6&WCn!2)$7c35R`;iM`g+tR2&+&)Yjvf%nZ)d*%0V`VYaF9Rnr2#x%mkb?ozglIEI7H!#Er!_eGqQ>CZ0QNv zJ}e&!?OHRN<59FUA>+<7GEOryD*5(UHmRpD?n7&ytAPqDR~}XF{~Z9zmEAZ=AXj$E zVk2}iGWumePge_^&=d1A#qqvsd%DF^ta=-yWh&HA#h5dgR#Hi z!JqU>EqbS%U9YDeyd+|WVMhX*?SJ^Gp&)^S-VVlQ;($Zkh&FAj_>pw^QGeom=YNMmu z7Vv%lVUz>wkElb~^aUy_p*tpCY$AU@@0)+sh`QeH>m7A?@LgYAP4;B%1)@<2`|jg} z%TyX`El7s%{SL}c5P1G#T+q7E>Z_&`2WFYm{~Igw0Ln-;Z(28G=T?3kxIiuXWV02E zRjg}^;o#5|akkoLX3Y~`up%1k2`QA6TcL?Zu=L>Y2@gQV-*Uedgl=d5#d~2qVRHpx zQ+m|hq24nHgbMh9Rok#+qg=GB;as($7J1~NriODj zFWgC(czQRESN}?Nsk7ELT9CZ}k(Uv|k#OtXaLmB%HGubDRiQpd?Nv^F_9T>D|HO)_ zCy_!3A%(v_p>E^v(a)Z&dh!Vc3&s2I0|wBq7h%2KE8sG@eC1v!B9==Cdmp>20;TUI zkFr;4@h2O8w^cmpVdHHH-n1782rI%PttGu(ZB&UxzL%1*0z!O2?@^h9RlK`o4h{m>}_`{&ix3|N-Ir3=9l zALG%Xuvj#u4F)D!f<-xd2$BjdF;wkhwy6ZjB&Y|U+)gwh^&l==fEE;WwWyaJy9*Xq zT-fHflhgh`|Hk!ms(47fX07pZ+s$%GRPK-8x?GJ}&PnCOZ(Yu7mP7mvC!76Ec&yLT2TfNJ=**cfrv-jdYK-E4H3~%cykOos$b*l5NIKhG= z3O@v^5nh2il|G!$Ks@!LXlwG!xdqychn2SMR$Itd#!?oWh~B2`!5MA?E^=q@wtb2c zb5W!~3p_kNR^-iV%p!S-MJWG#>2%7fEe*+}D3n6?LpX^F;$3ErnKr`;XcFY^%C9HL zp*03U{I2CnEm1^js)qRmhbgY@jH8>qTNy)kYK&%`PT7d3+>!)q0+uH>Za3Hqy7-vm z2PRQ|!f%4;LqmB3S9VhSaJLU=^4Zm91J@=t(4Yy=o)gdgYApAnv*d>DgNVp&Oi`)d zwd$v>$=LW~gAfegOrE7Tfjr?P_@i;IqydD}KN~qm3@ai;pcuiHa~ZQj4t#CW~!18${JF(}2~tTrUk9uwEX8N0@~tpm1cV zYX6>(t)+s!6~M^LPxMjSFce&6?2_@kT|haz1jn_gt$wWxPXPEku3(6Q3GfZ9NGl>X zb%|ESetSIzRyli=ewGt`6S*&T)SS+KLi{M9Y0$lD?{XAM?F0GZIc5G8N@&?5eS;Ko zgNK+@>uyW2Sav*!IpvYQ{=Rq4+Yc@?h)qY)DaHv-ykRYUC5WL9_zSNs zLfJLxb)nk(2;ypf-|t^Z&GDuyg@_0xH2ey0Qh%E8z|ZhdTa$&8<4uF@ zQ*){whBk>U24Wh2687zU><-u=u%HdQ@yh{>Cjd)PuCAYGBs_54*TAqv{)$3%>oOjK zPl|BgR4TSEIc8XX>_ zh5DEH19tiE)gKVKm05-0-|>d(q;)Q#%D_!9XRG?IjSBkRgPDjth3>rKFV$!1U@Ay?}GTkT3uz8X}M>x~{-vC)2A6(gBvpNcD~4dz-mAB?qe4zl6=E9HE?p$8OX z-{l!y;Rt$_=gmZ{+p$uA^2T!#^FEKfk^M}1-lQknfKdYPy6t8;7q+3+zbo}m+;}j~ zxmiOww>Z224K{GE-Qcx^*W*=+t`#2m0lEkG9I=%`{RBMnA#x-COFSfQF>wK4l!|!0Lr07?a<5V6j1j1lv@(T`re~Ga4eCrqnl_jz#z>2Z z`wX{(nN{t|05?|}QH52u9L;LkCw&}!U?Z>TSCWmX`I z!heg{JDTwo*_>0THg$J;^h1X6_Fx;Z? zB7YdKALjxs1I1j>^#I0DRCgoAMD=Ane=Vwy_>=rAAXmfZ!=%jN@LAzrl;g8P4Ia>h z*Z>|6q{1_i$n#?03Jo{%ycitCXXGW+!z1)W5TJS%jf6o?m@LGD19=b+nw0Z&|Lw$X z=k&*z{{>)ER{qk(C{e;R5D46l{CegUoc}S4aIpyf=b1~`+h^pvE9@c$W(7k1PMz%n zYlv`|1~EhY1>dLvFQc|w?AguOUjpcX5Q@OJaY;A;~Du%!XMyEoTWDbA1?1V-~qC} zTug=3cleVlBGyGpJ{hYTeuz)Ab+u;+9%*ZKed;59n$qjpx87Qyvp`JC2qkJ$WnuE& zN??-Mlm!$xbHzE~6L>U&6T&qpF@(}d;b(Qu!V1KcQhU(~bLh9=`D|6hrIbB99Y9&j z7MOkzQa#EhLTkj%lzTrqQJ#~_@0 zbTV!}i~0~yF2&YlwaHgTMqyP3{X08kO;PPd)R9&jU238`m6YKhd-qyRdu-u+O9cNd zh4U@9MUYqpuHeyfXB>I00KIiI~pM9`He zAUvk=Fov;I<4S5I%^V(3RknE=STk7dnh1vdavG;ZRE z1@bUR!lIFauecYZB76tw2Xicezqfji;&=-jpOp8oFoZp3ZdINw(1&NZIVqKgrRWOb z0dmZ3GVq8AGFzu*sZaj|r?Ft7w#M_@AUYlinNvQ=k7hL*FN6lh^k!^9Hxx>R`k zM1DZmcTS=|S@b6ze}v$(DBzzLZl<3fglQ25bgcf{!`tvk*;47xu&``?DGdJ{kJVFo z9nsB39m(p#WWXec&%Jc%_Tj6;~COpo>{xgulKQ~OqZ2$MeU*L^nzao5`=)4p|P zsK!4d)tEfz&O;Nx2{m092_$-~QVOsRL;9kvsl2Tu;FL;g>zW$H#>cl)vhlW22Jyp4 z6*Vk{{v<~(;OLh`zL$`84o@qJOs2H4^k)p*+dweIS|z7TR=|o(<9QZA**{8_tu9S` z6Dz+?)_{OEe163>N;OP)acmVFdxG~u?+q`-ANI*p=9&!4v1^cG2Ahg$reW%p9xSs=ZLN^8T^r92s z?0x;*);LnPHHK7sB?bX3Wm}3sB?uBS52q;6@Y6{3&jbhsmd9vCl{`XfP105#RrV+? z*?af(XNU4(fc!OfV=;NqN`p2w$gCJMKl3_af5t@)>WphiDz_#9l(L74YdHYJK`b>v zh!tNdj_hQ?hG~*ei2@894d-G?lKN9BgnRxAlOc(|WFK2{6`-4L3midjxh3C2-&D zZ$sc4aJWp5b%zUUz`!SQ*Gw6EWjPV|u=18H_P(-$2wNI0(YFnhRxCZiWzs3Dm|e~U z%vN}#rEC2ISlS^fH2a}IrQr($zsdnbzvU1B%iD8NQIB#Ek%8>{d3{M zAUFzQi?Em-aL1^3BcQ=;Pf4R=|6XS9N))k$fNkra2M0icbSh=lv*h{r7QM8L=a4T1 zSaNXPE4yrQ*lXjk2WgFaR@ka0N&sB_HGp5eJVuSh z|0dwN78>4P1N%pD*u7Xgej_!KRy{}1aH$&tuHq_Emq%6}MHSjM`fK*zs5sPL5L9fZ zG|>0N{gj2EG4+28%oE6bm!nYH!&TeaN~ukFv6k-lARu2r$xNM3*Y zwtWb5tsz$D{wK9@HRM}Ua$UT(13>fJwJmAYV~OoSJZ~Hm;QRrJH6TAgiwJES{U!d? z*+hs}MEfUvyiksz+(J{T-e-vw424ch6>S^+jYEGH3lxKBE)zQC`1hgHf=Js&f8)?g z;?Vy@V}!;!<@i?6vlA&piwS*65r_Ucw-eGf_YE8}S1={5};U`2~!(nq*8B{q)o$nU>pbsZ4K%) z2?%c#3+_T4Kx7HFV)ca`GBi~7R7rEDh$*e!9xL937n7x^mu_pgPPE}&6MJCjxZX#u zBCt5%GakErZ1qt?DF$pT!Xd4o8UlBS8YsGS6mK-H*`$VBvn!*K8Az}{i}O^QUvuxT zlE)%y#7OkyaQ56UiFA`m(4?~``3rWSE$q?RWU#>s99?zTR0dm?E?XXRgn|A?x;1Pd zY*IN0SLv)fZ2>V?UqkL;C2SI&dED%&q*X$`Dzy(0-Cl5I0;u<>ap8m#;_DpBLv_Uz z&zA5Z~8BJ%OW1IM4^Get|L- zxb$%UFTf8SZIal?Z-*J+5XL;CIjP8H?J$ezu;5 zD}2+)Y>q?fq%FrW4})D`rnQP=2zlHr62K4|DSxMJMm;GWKQhQTLa__j;^3AwG;Rruz(nK2za6zy`iX?J$!RIrT{6 zxQHv1rGyY0nTP}yaQerv%j-d}la4N29Fr87vEht>I+eXMnS# zubwFHu=PiTS3eI}U;X0kCiDZ&Wn`hmF+j7mMv@H>?F8c0=-Mzb7Dt=&E*+spv3(zVT0z-fHRDdiA}AeD_IZj10>e=};H09Z1L9}d`}Upkyd?xL1PC>w zSZUARg999(aywC3bzMzl7L#IRZqD-TBQnG3(WSZyBTj;rLeTbMecZY46p{NKo!r8G ze>qzt8j)x;;*XTkXvAZ9rbh6-`A-@lR-pmBmyAXT+3nN-bX8K7AjZ3@IUUHNtG=QQ zk@0bo2S#vA^%i!L1z_K)Eq9Z zfM`Wmmn)~TkHgz-j_%`0w`VzE^$>fO!(4(3gQ(b*RBUpj4F_Id<8nYn0N&2*eNwZn z%zZNSQIaPFInX(!8Fy-xIt%2HIH~066;CdU-Ohz!zheR1uh~wF{TP3(?DbmQufj}R z#x5mVQ-I{L$g1qoMnC^7_8;HE;xOQVMVt=FaogT97Cd4Y_gvLobn~v|<3UZjT_FKmO zkgcO7)YG=2GDg{r>9t(F=RttL(7|<=&b&OFLJGNXBItAFHBdZ7xr^rd6wK|zQAW}n zVj5gTE1dbJ`LL;JN@70 zkn5X4LoWOo$W~rWHq@7W0OH0roHlv}yvH7EfJ3T$#eMYG+e?gJm6t0zU^SupZ%@cI z12pmDdXeJtavysRV90^w1ia4}_j~WfDK|95#Tuwe*K#>Gaycnubc70euxh{82V-R~ zTZfYHM*@1{7^D|Iz791itxDhHwe;{_3`zQ=X{% za6~`GlB)*cM*o zCQ#6BV*Mep6E@N)zIwbTP*U85tQd(^^1MN8M1_;!LgJ>Y5&#lGmH-~5d5L5y0ar9s z(1ZN+`6YZ##7nce5BYCe*5>U+KjO$i#E#tgRe6^M`f&6SzxXKT{?009(PaZ8dD@*x zl*qxRB2}*J6&~_JCC}W)BEt)TTym9sIU0dBHHn`PGHAzlkW+MVv?dZ-fphaJdjl># zH#J#neZaC|prfFBLBJQ7Ejz}Ds zGjPJYtxrt%wBvf+KNqEkK1|9U^z^T#Ea$5B%lvR?`^iP<3P@|V7Y}5rYmIH4RffZG zTzKpzFaa7dInQx3o<#T*wlElNNqHN_j$jdvj}e}$yp*d& znoU`7O9$YUm9sZCLH#d=7@~;-gx#w}zEj3Xw9!5ce?P~!gNi&}jX!KI?Kf)>_hW%~ zMHx${AKd=F41fuK3~=q4FzHxIB23Et_zHqa8}%G!%XAL&Z}h`qa#qJh_H_Gz6IAWn zoD#{LH9KIP2h(?j>C&A2T7m6Tx`szQ3MWp#-N()c1Y^wIj_rU5ZV5^>I@Mk^n_D%b zfh(ymKDm&Zj}dw@kOP+x47k^D8jG*oMc9@G{J5DBCUwlQY!U&6D7Hmwud;|wM@E*g zDQFjMk`dAs;AjgQ0KAIW^+%>d^pA4P#V#5IS%>)yqrI~Xd#N_%Gvd?l`e!e#^0er! zyDPpg5QT<KWZLUC_Re5QF zTz`^}^<5Ba_vKjGq1_rb<@I*YN4w=5#N%kPmr=u~QzdA)I(~jto?HBNGGB`HlJ!I@7Z2nJs*KXs=p>)IXO@B$_xET zCG44LF;ZTZSTW@?D*i2I{}R@XjIoNJH7nkYRI_4uFej={%BSV(20H>XU=3j?1EtOi zNOn)37{UCy-2KKfw*3HC1)A-#yNVQx$3X)&kb>|NkWh3igF8n4OK>l2JH$i1Sk%)b_E~1(+EIC%VYF{E=*-B0fZ0h zmheY-G)8b-AB3{TkI!YdN=-JLzX-7;9C;sisPDj(uE2N&Te2{^1k#jtv$0XMbseh2;s`Dai^^ zGgq0-b?~?O;<_SxHx#%wW%x>D^t1;?x%)8~l-&pR#@kx`D}0Nt+?T-)na8&LV)8! ztscdKh7SkM(k^?8atmWE+2-(eH`UcRf4KVgZd@x8SL~#kbc=WngBpZrTY+KF5E=Qz zRj6K9EADlKo`!qhILU~1s<+qYPh!6VB2=)VBESz}QYlgsbjt+0MM3>hxCN|uEC;Dd zeszdBp(>Dvjy5_S>mD3i&7kEE%3Vjb@ehlUf>S!$=$mNtwqtc>yS%BTvFJve_=8gP znKE~lEmW85^Wv=bhda_xVO3sXrg%tN7Z|bT?@}WJB=S<%yF783LuXE?&#MoQ@Iv@# zqjU6;Kc%et1X3Vfwb5NvDXq_j1DW{xY#Fv=EJPP%$)GIU|Kfwa2~19UJ@q==F|6>K zgu#x;v&%)VH2M70c;zDkDcmV~y`E@v1Ro~mTEN|8E(P)&1Xlinb5#AdC1F(2oH=Av zy^4IXQMHS*5{PvKVg){#qcMDDIW<-e$L=h;k@1rjzpFZzie40}{UWn=)%!2sj^E+H zI$MdZ9D>8#7%VV&KF5Jm;A=+q&y11%P5F+2c)BUIOqb`dh@D^Z5*?Dun-ECDwDiya z0gqPDo<9lpk8lGZ7v{)Lm#$f~m5Y^Rp!EiHIi&!iM=5aO4<)@a3`y5Iu^N%Bv<>`c zvkQ=C9vTcfL#b?|+-J4qBUy-Uq@B#MWioZ81VrG=KG zTuLJy?Azp|3V8ie(_$Z+3mkcs`EZCvG8j;?oUElYlS$%rCmorn%PJNC*J@7Tk;wlT zJyldJQyLn8mpr^3hDgOJ5AUSkeEZ|$QKp3hjldU>Ka7E04<$^o3OC(qGA{Y8N{0^!%qmD24s`9Q3j47|aEj=N_B0U4?Qnc4n#>kOYm!2_& z`cU<53@99G%=rYvRCJ+3vE@MOB`tc65z#NLs6vF$OVom-s=Um=G{4|eH<8`npYCH> zcN$ICZ!V~kH_=&!$SzD^)hmEY8Owvwg&ex{2+69eKzQ+7I5tAU`7gc^(l?Xea#v?o zbTDw2ugsrc9+^q5N@MVGb+vSQdEkeXs?#DeLF!Kuua~0ftBa~=NnM3&Rp;Y-x{jBR zZN|XXJ7kLg;w4ocoO*};sUfp|mP8SuQ6y>JfiU(luzSP<;zR_}F?F?-RLm0g*QqAC z%GfV4hmyIs*Kb*(+)w;|GKAo3P5II(E#Ss#@q5^f4oswDS)!747Q;bLp`kP zIRQGy^&V2G;8jWLj~vVZm&;o-@fTc`A@3ZIC#>v7>6#DMpElvz3t~Rjg3TX)sajaA zUuB~f-X^PA$geh#9oq3I7MZd-9SPv|OuEP`oxsYf3qP_t6@S_IAIEs$$0&o{t@+{% zvaW7O5-(P^6E@X1gBP%IRK_0ti1RjWTN%;dlVlIfIiy-5!qk5CIxKp)ha!x2pJ(^) z)9N${%&~fn5+pQ~JylA2m1iW0vHc{*d=O*Bh8PP$jO`cSg&1?-y4Q9t3tNDa5~L>m z+eI5tlr>C&YIdl;NxwOw%m8@&WmxXj<-Cyr2h z%dI74iHOd;-5gIpB}ctXZ95^&rkKe>a1C(6qNh~bPW-`!#lPHyFYZHCnB%f{P}@EI zt0z-@hq7XAJM{`X0xJa{tbx&d*oE&yF1^Rx9TbFtb27#`P^Rlc5TwkeY~{Sbd5bnA z%UB_c@zqC^sU@5a39C~V=dI7O7^XvoB=mKR%S|kV`oE)FxV(%w%IP0_F3Xeyuv(WX zpW%4zhRNkBe7!f?wJQy2{HEXNYB81k8moNS=YU?qLBp!%s~)C14^*QcV2E^=f96H)~J zazsbOMuzN$JW&gBv>Z&Q)i==?z9K`w3}dS<1}5d~Um$fOrNAK{vuyPeWHCPN`jJ5o zAxIEWzgh^51Y6 zFcR*g({iL&i&rbxPKQ+sn+hY9HXbQsn6_p*TLRICbq;oW1L;W3y-q~(R5q8ArK+hG zb-rDy8gG%8O_vL@%!z?b=B3UGFy-t3d$GTYdw=DEsdB-1xqzT41^JObntDRX1e3k$ zdOAU>p;8?poxJ;<^3Gf|5V%glG?88gwc}5a%@7=6iGG`sY)y*2ExZOV?xwcjEMx{O z3~M^-rgX_$7f^9Hm=_@jWb|So_KE}hL zFz)io@zcedr#~=KQfj$KFqGcLL}>=->9LC zT>*`0( zx{jDM=n(E-hH-^?gLZ1{1iYL*1uIWQ%r=u9GIWcZ-WW8MD|W}YIFla*2gaEkdJ7$* z(V2YfR7h=h=?JJE>yS$h=HOio&ca`vko3U&)NBW%u=JdeLlm5+nsg-8)k&cb5%raN zSKgkB;!4IGWp|a5BRxq+b1hY#%M_k2USSe;B~*$#;mNao9%a`*X2uCirNo!P0eFZh z8X!e;q)t^i7bS2vWr|JS7>syT?Or=E1}nu>EC;6}iR;I6Kv%^z2NgjVL!xruZyrTH z=wtM99WEdkPo;Skm^=xT9L&dGAG`Yf*z8xrhxbmx1KmfTW&0fQTyVrmBq9Esq7qKB z4m@%mn3IDzcAWZ9|5nc{#_pRCqyesMr(Qr@W!?|U9vRE4?F3mV$kLkxDGHvUl!Z=@ zHLy_OpXVvK{E*O87TM(q%2vuCt32BtDdd!w*%jX3I(!|HtP)`9lwPHP6fsG=;xHDZ1{8MLQSfdD9~d}bBwuTf*a!i%JQ>Sgd0{42 zA=vp#GcZ}09vLB>c8J5w_l#RxT;n8BQ4o)+kv&NiY1 z9;UK2^kBgEb1+mX8fEmeE7xQL2sA!6I0CjqZM0K^yA*Qe#qUiI|CaPr&hC7n#Qt|I z#`0qik&%a6J@hrpd1Q=}gp7(>ybr@M&d_q6is@U<&5e*I!W~0{AcioHYbsZX&?Dsr*?0 zUUvq-YdFAfGUg~WR1?%GwBW2}-*e8)7lK+>20K*_)?-f4CQQp^E(?|R5@iCm;mef` zc6XPu#_5i_dk^eAu;;*QoX;ax#qj{xOJ?lQv8owJ zG#Dy-b?*VPuC!*i!F&(fy{B*7{ysQ-!4V0k0ZUK7kgdC};4}-|tfR2;pnLCl4=V&Y zg+2W;1T*d@PeYVutGW<7b^k*tX=QkyYiFDJ3$UhFY>+KqnqaKy86TfE6vS_X86gw1 z5XYY8T4glZ%3(|K;1=|ycKA)XPbquc?|_W2QKY*N@(og0&~Dzf*$qZ680WzPWw z$A(qF-Aw-95xeKTRX5`_+vkegeO$I3*b^VZ$fVbz>_%sikzUC`1Kr0D>~S|AX!nT3 zW5@&wiD@1fq`WNfCk5of8NAcjtA;wo6C;lRk-+eBwjX+t4zU6!DanHlMt`I;lw^SdOR88PcA@@m==p-9W<=!mcn_1HjX&Q{fI(BHb)@Gl|HzwBN8D|b#nEX$kgV$Z=&qDRs%gk;EO}PhB8C!>u zRK}w3(BBD5;Tpoqj?nY_eA$;lp(bGizi9wx7!5mHS@px?3oICw%m;dCS3F7v-&<1Y z@d-TQXr-QXJx^K>xg_%sY%WhA6SjN>C9@nPfFb28C=E3YAs^(glFViA=<-({JPBj& zoItAfJ$8B+IzgTT+Z&9y)r{6fEAfYohKUoKWeF+w>M6P;ElP(arw+4upEe~#-Sc$! zK<_|cD(x6>GykQAk(hn-W78q#!;uh1t&#J{mlgSju~g)dlVN_a^33rrGkn^xkw`vm zsk%?w*w!Qq`&A6u!yFnqnR~Qtw$EuuS%^Iw?#%WnIkTlTq_W#7`{c-8c(NTZrT{X3 zQs}lK#1(dy(NV?G!i$$z5#ms>Fh-k`$P?s4;YGNY49kwYM`HgX6#<5Jai>-vyI=*M zq0pPltLP~sM(*M>at{2^%sHHw;W>xIhNAZq?Pdpe%DQ0)4fYHp^(~0JCD6tBD zXjYI*71&}G*vtyxnL?;Sa+hMxsTd0C+(cY6O;Ay4bK|RKn;V}t+YFw7rz2n~R={(7 z8D0kp#ZYUfa;EA3D|b}yLtn;N<7@V38lm-mn|wIy{H^k3CFY}RIh@#6@z0kFacscZ zX357+A0A|Gs=-4=TYe#R2_CED!rS-{H?87HdUP@IVSP+|qQj6KG_>80qZRISsTz}S9B2vBiID^q{ z0di<7bJ-m8aXNFGj~BD)=3_oP-+Wxa&M_Xh-Hf&{JKl!0rxJ)KB-mMiw`4}FOGwB` z8x~sv)3r5=S@ubA`KFvYhsA5WL6!@ylK(vg}G7N~87>J(49((ID><8@S>vXtVndEdIiV<|0k39rY z!U>u|1YQ6Cu=Y0aQC3&t|0FX>29hul6AS_p-jo`#XuuK&GyxK*7ItD_k|+V{YL<>| zm%0c zl&S;rCGtXSbhqe&0aq;3UA)If_g>hGQY9A$=HOOa^+&2#Jh)|!P2B*|d)%6SeXp;s zVm&ciLp%yuCly6tHwOBXj#oKK1kMcwvkv94aCq8nBulISs z-@WC+?xqAkyNxrDiWkO-;0L2M&S)|A1v{>9{5<)N)~OV+XNI@IbHM%0&fa3LpFNqh zdB_LmP^-H?@QfvtG!VU0&!Ey>Q|;4q(cs2xP>{d<{^aU~ldB_l8ZA4EC)bFpjSShO z@v4*HI~_^(eHKadb(hoYx%8T79AChlB6J^ul9e=1G{9B`PEg6-jN8bae~NN{cOxcE#B(O{AwloMCOO636sR z2eQ5Datat-F*lcw-wyOpa*Vgm+g;iD8(=X?>tvMvkyBCpq`d4u$gK4ttQ~sz0TLd6 z2#Sd{kN*MuB4s@yB&X|Zn0cM`tB313)M6d37i2`QQrAm8u{H6v8*w?4GeFJHQd_gE z2lA#%%Q!6w1IuWfb)1re%u?0+8-0)wR(W(5ta7&ektZmWh{W0YnpaGd#4F^_wC1@& zvY(HAnW+=yk34Yrs(WHz9+1R(`7>9br7H31q3d}_67^?!@(oi9 zV_%+?FHgxIdGfi`wAhy;l6X-5$dm6vb#d&AZ3KzE@4_9rFPmvAA=tuRz z!v+mS88VtRQRzX)@kZ<&Ql1Mk^sz2G#%> z4C@8pt+Cg4#?nZ9E0VNr61E-s9KKZL|0;&QUjeI%*k|>|epwV_^}W%+#B&^wnfHeS zfO7`B+2WgCGHN?K2wn9vuvVR~J#E%G(bV@Gtcd1SAB)6JxCwE6CY7QTCpseowOknE zF*&t6)JXHxZmz}eTYxhxz=OxAT(H$6e~!Hh%Gy;Pa}gUOmmZ^mDw3mFJL1h9VL^4A z2kLSGs6lrLREKJ3%oumbqt+Epi;G_(Ky8gfZFuTy2Y$s0fvQ3G3e+TZ@85*FD-PB7 zH=wQ*s2a4R0jSC9syI{`VaEKN=DraJe1Qen`PD&CC0|%mHcq_GF=cVLcIV99`7z`n zHa0NC6R+*@Uz&q6`aHFLiI+P;4Mtc{gI1q2dl#5^H`|1IIu3P#1@%1Wp&B*R(E?Qv z@9)6=5JE_c7sX+p{7z?J|DsUY zW>31}J(*zD8KY2x2WDif&acj<)()Oe>*YpK+J5*6b3~jr)!Tz)OdCr#s{=f%kK|9E z{JDVpRCTHRamyc%{JCBJhzC`LVr{hZ3I6Ctl<95ZRoQsh8{(R!N;V^cr)23toyBHyFw^fCM_0KFjTfFJr|+!mT~`N0VEF-T31} z7OUp7FAW7c+|!T17yHXKdu%wKWfQ}pV_Kt1e+nZvof@6?tU6vV>?$W%d$j0SEN`$O z2TVE6_zvXz*=Io4Z^4Pr+KMBO#`t4SdK_1dsUOi2q(~|t%@A?YHfdiLsdCbvs-8)( znuqpTbPW<_((YtgYBT<;(E6^PVGE>dDR)8Ienlfu&nHhhWI;DDh0Cz0IOr=*3pxpk zi2#<-hTpKM&;Bq-rc*8zHT!Z_9Fhk7luu>@e)_Mm227U|!&Vud@aWCBU6;{1gZ-$7Vp~Wb{w0a~0$xS*V5SX6Gi)S_I*1=8s zu2lVZxm)qgKEU1n4KdSWvJu8_gffLaN9Zm(;aXV-Av`+naxI`$QJsq8GyWDJOA;_7 zK%BmVXbk5@LrUrkZk&kFDw-+aH-*wvRq8q2;22p*d zA1=zHo)2ph;_mgQVpiWZBpGH8E0kpJe87Zc-0+uwYRLTzbDuri6kD7h2%qqQoPam6L>R*zgW|IXTmM>{Wia7!kPw z^PJ^~zF<^lm{w@r$aT^=52FxM!fHWN3j38nw({zNXaQkQcLo~3{oYl4XDh^og*r~W z6OkdnpYI||zIHni_=Z6FoOdMW$fI$^nNmG-7$S$ikXDStJol+pA9Wt$rL-)#HwqJ+ z<{N?oi&*RhSKW(zi}CY!;naXbp@jc6-sJc`ZA-!pcxOR?e_43JaSrc9vHOn#8FPp$ z^O9UB9u>qM6&G=RC{OOAcxhSgt`ZMT)t)k96=A=zrc4Ira_SS)$dpKt(G@AQ`XOOs z!wZQSS*$~soQzENde7HhT#$To01Sa0RLR3x5h>s z-1}v!zi_fJ4e^im_D4IPjI~U!AZ#_KYDX_!>PK838O`~X*=t#7*|R{(O>2gzU+U74 zIamdkKsqwZ)CFJ@+drf?Fq}EYWS(xSP2@ACMy@R&=?ZuAnsNApjrvEJA8!>PI!xzM znh?qId5q?zqEYmndHon{A)QYQC7c`PM||MKyC|$coL`d7JCPQm(_*cw;PETsdnaAf zh{y$2k;0@I-LSOK1|(DdRLgXF2E>_h%2q9lWx6yvHgRYYbd=D`8XXU+O1bD+pv1N1 zzk;N=w#@&prx?J%G{MMcNYZh)+M<;?jv7jK!xkwjAYr<@WzA)J(Ot|Z zqL^Q(A~(gB-AAW2w9zcQ79z#agPn818U186tPxw9f!$RIiu4D#gg?k2%LUcf**FVn z&HE&+b1YYSQUHq#NOzaIY8Z{dpW-%IAU0go>4lw4EOp#1`D6{r4zVd`kfSu=W0Jh7H#omYWangtL#lVKeX7&*<(~vx{Os{XXBUy6|!h>gAWAN;}fjB?9SkP@`JR;6TXZF@)S1i{5_NpG>J` z_0Vr=*ITBKgUDWSvpppR%D4csV|F)_InRP%V1&GUI$t8rl=)mDNSy##S-ysH+ie?Ldn9 z*>~kSeh`zSGmCbD|Ern9^9N_9;V(wHp+H^xfRSyiTE z2h>9a^AWSf%431PrD*^=rpk&Ljmwt0?mH8WQ*1fm1+B=l>c^@Psa)_Cr{))Btj$!5 z{~!>x(GUaU((EKj@I0U7Lc@==cB zS7-ry+{RLd<0i+1qP_|HaZ_LOzEtUYb+_8Ildev!sIrT*{$OwZnna0t-o^My>x%kZ zzuCng_Hj^X>~sW`V~H0hd6-&NbKgriSN5Z`tCk{=CYcRQ-8z zAgMlke&iEWliX-2Wy**AKuUG^C{wyH;INN~CmeiP|8*PTfM)iOr$K z#~2p(1{Fvp^SDh(!Ow47buk%zw~@2-Yjcj3oI_V-OU|L>{02D(Lri=iE zMAM?yL4FJ4JR3(r=)J58_6T9#!W$D{nF$)UQncONYzU|Z!NcV*$dF}@OTyrW(^D8A z5jeo={DKGBF@%3BLDN)!Y_vYv_YuEOT^j_5D6RXGcBa@O2m~ing0V1#$Q%VS%H%eh zOxPz3-r(ezLge|45}%NZyI{kR{GznA7pdn6w`7vH-~Uy1O|z6NL)qnSOo>LfEY4v= zuRY+OWGo(6Qgw%BnTHa;da`b$*xq4op1>P^S{2Rt&v_HY%>&b9#$L7Bh) z^{<%$W5eh{Q|-BD@KocAZ}3#hp@>Ol(b`*N7@6e~8HSx6wWKCKyU955N9=3PF4bYs zWX@~$+4IUQ$<2IVwE9I7JJVwPqh~N(P`Ynd6QjbPiK{xP{#rd-ja4m6~pY|8Q_$U(AHT?^f08h0j7EsiAGyO_S4VxPwHNq8P6dC)vEubFHV1djiP)Cg13 z*mKC;vcX||-t!(Txd8o30(bVlsa|zN1YtWy%W!j~V`CpQ;)Bsu_bEHCA-th0HppFP z4|1ehHwNQ`N=#I-*#`(}guqixkB-@X;R?5h26dt$?boz2re0c4)$YQ!OKOZXk zNMo?KZ~f&o`BEZ347JXy^~Gpiu)4Zn{AK)0RY-5~+19F)baU02U;l+06TRvNQ-nd` zp=D|oWRz~HO5y>b1A^ zqFjcyjjOg0P%)#WpLfRA2wmld?ovo0^7695(Mx5`g&iaCM_&4jUUvhsnGzT_=pLuk z5o+8#Xp(lOHwKuPg34J>j=1n=X~7MdHh;3jUs*ds^%Tc)o>DreJ|hN32m2+YM1PTg zSg^m?KV)Z7pDoxwFW}%I!6=#->_9=-7Pwj%xBu*BH1J^qO&yQNuTo~ysXix>;ETeS z_bRbGh)C;%BQiD`xPoGR`c6-_0TbeD zK#VL7p17UQSO%X+@Q*xCt}mIJ$T!a^TFV^-YbJ8>c?#Tv)EwSu@M#8dO|Zb(PkhE8 zsxli~t`~}&H+fXGRw{*m8w&T0=2-%fDF(Q?jJPyGW&u0-MwNzGO$^YT>Pcp~qM|cG z|5=x+0CUQh6#6k*-aEBSeUk*9`~4Hk)C8W_-ltvJ4$i3_mJ{FbSYnQ9I2$};t?`P}axk2bWRfC;cg9!G0H=)_bATzgyh zoXOSxVwx$WG70m>E&`V7J8IECy_7>opljnu*DG_UpT=VU8tTH7A3=H=Hkn=PKa#@ji&+Aq24m}&-YPjOpGgo>T@RCnSPUu%XsaRfI&=z!>@NniQ_G@ z)pSughve=~$WMQSy8x(rTzctM3G~9F`u@daUjr#btiX^PSstR!H>Kmg#9Q$3nDVOV zCr6+=uSg;(-+NWml%q+sbR>=#AVfw$F!MA^0VAUGu9 zpd%BjSb-uuv((ZPwC;F9H0w8}xMBx5+~;~>LE41IfvE@{pBP74vG^6=R|`7SLrAJ| z#Gu2}uf_B9F&*8zoC7OfgO6#i!ADH5!N19koggHhJLl5|A6|n`))#$R5y72ZePvhP z?)svWg-Gb7eSp%^PuaaubngPyNbsm{jgxH!bE3e7GYH7Tmew)AL_{v4<)|Pz zO%Q5T^M)2=f9O?T{F;2wvcul8xFq`_a~Ka1y>bIMJIMx%W1=L@8#c*SZHu{FWX7J# zfwm<@E_%wT9fVdkKjqLzL=m$m`RwJD%@D?52iB#6A*IHVl9J#t4rq?W#vP8(_a{2U z7ePH39iJYru{tL_C!07F(bZ11794=Blhql#y`kU37yc3Ab9GvHP7XO3*=mnkP9rJD z&`P1DLW7K6RsKvgitPFu9Q`M?&&l=%k7u_pnV8Xbg1^r8IT`JvCjzHT%}$m|CPuQ$ zl#@s73j`6p>UpQlMma6*)-Ip!uh&yxd~nPEhu%!4p;m96rl$ZjJ2cHGVrV`H?y|E> zlLyXxpl6fmMtkM6X6M90*H}GS$a-S?A?e@-Av<(%?Qe7kFQEZIE zfgWDU<3JA&a;&0Yyob-+JE(^kfSB@gLUx_P9HzV3=^xQulmV@W{_LP^MexI(&Igzy zqj^G629uwG{>87&4_|c3AW0Ft5u)QAUPo=7TyXQqJ-fhb}Ams}K zxE(C&e$g)MUk46DGN2XR6n8gn$jv2eTUR%(Ed5C=?1XvyRdQ^R)j5 zr^PAoJMB0oJ>XAl>tOqC&yLs;A=X8g;jKGEeG~j;QofYdUqF9yxO~e|Bh6HVHg(-g z*<#{sXM2(JNKs6VClbDM^+puvA|%VA@T~c~-S{y;W8J}X*{igzAv7Q1qBF#0 zg}8Bb*n#ClUZE4V>Z(HAG~-^#j>}`6;*6#2S5}H6meQ!~R#KuQB~!3bCF!II&7_!m z?5(0yOJqG~@Y`t_-AxXjQL>+(=0wjn_U!0x%7{HDb~oktlgTrroTkMvdAf za2IYC|0uZ25lOXPBEelwLI#M->deNYNqNqiqa7HiUM2G}q&z2xWW|4l09c-Ll&h;Y zaMjsX&bgbf%lV7bm*Dc{d~&wg+sZwWYXxp$jwVZqp~4)>v`d-xfiiq2ymaC6SQdfO zZf`I5r~pkzFU%v#DX4$X5N*K)&hA2I26Es_`+0E6!xua_yqbD+%N)WvaF8}xBd0|!h8JV*$Na#qL=#FuD7EV!#2p@x9yjst_)dka4%E-GO%(4a*3OweJpL z6L#RvWcXN~><9iq()~(6h88lT7ueyw__(cp((j|hoJ71OjmM#ju89QDL zaT7$6+DAp!5VUXTJN&-uRYbh814v29!)+V-WFm{4J^QOBEa-!|tkT2L+xCOrv+}Z1 zkx2?|9(s7nWH!pfm3TZ@din3 zi^zv~GajaCXH`~G(sqJ2F-aP|GxLhl5PwHE<;iO38$45b67-lGja3txs_^QR#~hpZ zB4=&RXDsk+`7=!Z2wpM|i5#~bOro}Uh6#OPH$rz?C^tEX+$?%>e} z!Zmzn8SC|7?e}-3nIAjCg+P_(nxjry8m^JE3H1zB^}oSpWaSu4LK~XTvL1Zn4U>I> z-)-9ss~{YiVgcKBH&?la&zethaG@1pb@zn2z>^aJFv%SImpQ;{ujH>vZ zUTx;x$Kda$+C5ZT@ix7PZpUA>KqYm@8G2H#`}>&A{=?nmS~M|@zb#Dp$tjfFJr{7Z z9^gB9Kdy3BwDJ2I!`#4g7dbol<+;3{Ul6~7WwEkHssqHzh&-I)-v?5PQwTrIZ}|@X zk?}&-Pdon*FUxAuvpsywO5K=^yXZHqT=Y6k*`HJ8+PGU*Lf0l&@Es;C6$vi-QKvyU z8M<&1IN0+}O_MAf3Y?k-9>4kGDL%7On8(%oGpk%@fc44YD%S~qPXT)knEiH>v4{IN ziq)JkaprMA>Gd)zN=2@^`&f7btz&pzluAvgi_*=;uHH|50)6j?PQjnMqu)$;xf=cO#@@_1if-^cuS~c_p4CgK*C( zTIIU;U0Hhc|K9)Rp>ru|nnW0PuYv9~8(PK=9whP+Np+ zQIgfGK?Lkv0`fO#*QV@|(L~3muBCgnkD^59KhZB;K<2#e36k1Q2*Ox{SGJqBA7MI~fVZLT zGHo@Vo0BIVhM^X3*v*|I_&G=uCM`a}f!l#(qTb(`TtS_4CRU?}e?klbq)LlcXs17= zJxOq(xjku@{G2C?t9C52W_Be;>0-rQwRZCxE9Dp~VaN6pU|nY=i9lj>m^TJ)^#KNL z;{kJ=Q=9bU>xEIxu1d!AZRT($b@9u*@7_L|&UcP5!DtKv7(^B%z)2dwOq6(EC}Y?4 zMA??Hl;>9i_BM6ypub}cdgGwsT+DDc*{K`ox;Hf^rFiOo=G|5MZ@`n$VKu(C!)}r4 z>oLc>NRPu=X{+s|wI?;m@G%Sr7=|W243P?HaJ;P=%Zy#AVA1d-L7?pyTh&aJjN4(! zm~b#rubs7{R&o7nTPuMx&Za?hkoaagEhEIR7zcwmy;?L8zXjR+aPjC2WlmHV1z}C+ zPR!su-ArFLP6n)l&1NQO>NQ%S-!+Xk7JSXe)zXajtIJ-M%_njx$HBg+>&GV<{a8LL zM@>^Tn|j%+2VjHX~m zjvbsTi*A!m0@BgT2Em4q$>0Cy8v={|b7ruIP3DIOKqJ=hsXeq17NMMde$ngvLZ!;O z`F4zN@3Ymh_hd*fcJciU+Sg-WMyjMV@vk}9Z`-tRsWg^<`$!S?f;~#$z1CnN+jcQg zFqwne4A#i@k-X~_lgQgwFal^Aia`7ukai*xk3-rfnr!FdmY}B6i&1a04fI_$SZ|{) z*I6qNq-|g(9!<%7$Xu~W9sG9Q&Sy!K7n;)0xkx9hJUSPw_%Obf&dc81GmdjLIBKh2 zl~c3ZM5P}J=h!vne9hEU;kAQylW(f|Sa6pb8tr*a1JtQ*3d^YzMS|!9JL^{R(?9gD z0e9Q(wv&-`E8*(Dwtf8WZj~!!OugIKUH4tGCHNh3#^`P;2qdY>)PCsj6x$_5HnW1n=C;3*=h(yTe_9UY zhs_EK0|(kpHd{HQz)%V_58WLoZEiarNt7bI{FXeOw@9`77#4v{;;^<8$OZz*W~*W_ z%qr!>U-{74))Dzj`=L&;ec(qLSAK325(2JROV0x3=zN<#p4$z(H12n?0?lm=ZATAJ zxr9c)+jefx9^_+RytXY5%80h@K6G>-t?g)Amw@Oy)W#X_=Yfmc8jhr24KPUqAZh;e zZL|Xa?EJAsdbiO7TjV4%XTNcpzfR6L=HG|g*I+Y(FouiJ_9|z4a&U)V{4FGPiZO2d zlvI7!u%y5RRmP)BXifFL#Ojaw|8RZ8QT5XG7gmKHT`Em{M*hC^V`;}#?CbzSOaZiwQaIsCk)+fef0Cu#NMI1{Ycw4^ZxE`a8*`peDXOf%lUW*f~^jujHdjH+q1}! zfn<>nED%p^2scGTVF6xi<=W0ua+CVY20^bhWCc}3jM#)6vF!)W-DiP+Ls0j~QC50K zTbB@$wlCY;n&BoLaFdXQ;GRuY?9It--=CP=%*_n4fMku^%}0_RqtWKGsOAZ?sTlyj zy*;s+l;H89$i1VRLUSi3^J)xrJ+Ujb@n|aVj!@df!&giU?iebUJvP2J8*?W*2f@Hk z1PRSmH8Usbc3&~^W`s?SiB+?By`+l0)StzA(+_FeIA7Wnm%7oLo7*I(EV0aqK;Z0S zLXE(VoSWvKWwv+O0N~37USM1daJB{%Wc-;WrW=smTyjEWH%~nfxM3h^ z3{%RBh$bs4+S^1rnR_H%Q5$yIj`2}odzGR%e)x@uRmk`A@$ zR#Erew*pp0mZ0SpsE{IoQZkz&ujiN}UACg)(0*f=DT}=@-VyP7pTkZw+5&f%OHzhO zKXYIJWR%(vI%l_|E@jD1xfG3GzG_t})|gTo-s2*$=y+bVOjMSP0w*`kNbA%m%^c4N zndGYFLWj_xqrx{h-TOy1)HV8VupTEg@}RFl){c}<6Bi#{z>ypS>*S93Mx3esFI??;+A>m30C+ePKUnraIN~$4^Ng18?MK8UNN&;9pMCm%)0COk9GC0Jc<;sbX@S_sWQ#fy zcYq=6i@4N#Zk_yfvz5E*-lxQhYUz62dQwrd$wUwIznB+xyHK5N&b4c>wsw5a?q~( z6?v#UeT)8HZ|_8wE(S&e_9K^m&zvUHgZfJRBAbCHz6M!akC1)AXmKwmGW7x{CTvCM zpXQ+|nxngc-2}K4cDyDmj0dMV&!Xl4K8s?SoGinmZQ&c8?ludN%|{UV#sNg;6NtQS zwS~yb2M}3*@Ti?caxxLQ=v+jehNY4khHel$76_}SBfu59+_vh5Fc#o>wnT=+pS~!v z7@+h1rGFQl`~PVWIuCZ@AR71C=-Y1uU$Auh;btb*y|W^`GC>>-85<^w@(40`e95hI zhBizTQ<2HyVMVetSh11fB5%-0g&DnYrY*kYZ~E$zA7d@~g{x@V5g`=f2fM|tm%a7T zqaNBRWJEg!pQ1nOrQgib&pRw-WT7xrLIE;;305m)vZ73uu>l1j?M${zlzD_g+y+LO zHej+)dWteQSKItExJi>jP#jz=x$bY`H*a@IiP-Cn9w<9GR#pp$Iv*udIP;o#C;tXr z``(Y}WFP7mx3#34P1jy{jRr}$7yq|gQgr89q;rISCv+a;%t#CIinafV29v@`zrfkR zwH}YRj8;yJo3{l}c6((BD3RA)s-BYve7N3ze1Noldb^1WS|f0Dq@hebAekZu^xn&P zP4wQ-(|){-)vtBIO_kJh?)*LKcXA5dK^XRPjDceJN>(88K!6KEY(6hikB%9z6nqGa zS`_4>o7i2no5=UsQhbHWd^hLrzXkoRp;hjdRk(C)UhBjn-St8jw7yG+{A^j3D#^(@ zxdCU7;{1`|EM5Lx=zlHaW^!q6<1O5|fEU_D0U~c<0SC6R46WV_KB&e+jD)r;OEGn# zE>>qo4>a*J{1k1MCUzP?K(V(hW|%eGS6D$q-@TcJ=An5e4Q;X-+Dk)wCAJO8G_+}; zp}1~mPOq)P&UsfPk5G)-9#oABfJF;VyIzn&;ad{1oE=6IG#>km@ETo+-u3$b?0VsC zl5$&@$$)D;=LKCc&95fmXjW9OL^}H{`h3d4I`$>J_(yrhYB9Q^>tr8h5wc z`+Pj_?+5Y<`19o563<&VkXITpC@&X|#I5=#A^lv5;xvrV7NS`bs_a$2BNf#&SKYr0 z$w7-w6~$5{u8NV>04(u8d%!=9AnH4}WM4Zna53u8!?%INWQ z8yG{TG=X*A98{Ln(?+?xh8f9_c@A8-HYYys2%lZryV9X5W8tX$PE;)l96RYU!Hu^= z6hc#tz-je_eljf_WBS~CvAd7$(AY<+pODAs$~(+-;*m{eG*o$7y+f*=)bV;!dp&Ap zEG0vyFwI+HDgBIAbh@5~zy23>kC8_d*IN0BX8n{s63tv!?H|Z?N4g}=G_odQ6$jfk zFEncx33Rh6f6NH6lylzEG*gck2|h^}v2`6k!h_^C5h0l&m9uBE)zD|qsW5aP!BXG# z(QACs6$gQba(2unHjVhdm?J0Gmm{#?CtGwpCGQ#snI{7}mU)@fA-SFSx{&Ni@|!I~ z`cHl4koKw)>*=&wpr6daEtUV&>g};V0tYpJsPg-6Lv0roxDJ8U+Ut> zlou^sA$Qd9nAnv^%>nVK#@OVt75qtxMT&#H;{%1!=OmX(d{w3mW*pB6YVGg&d}*oq zDXc>vpo_mL2ElLlMh=&$5^@>+6=oxhp4_gUcSm(k=z$~-Ll*2u8#RM2RYa1sTPCj> zM}EOg(@yxhW#*nGu4>y+oOtn{`=eXe>zN5m!99}L8*5*6vBWebrl(!eB*_%>&VhED zP3@p)Geveu5tGR2Jr7&MF7>+u)KhfY^*riJT8&uCBhRCfa8^uv;csy>pHJB))6Km0gg1R~lSCWiyx!jLfxrzMV97LJ^ckjLs)u!g z8sZ-vRLQ2(MYN;QY>>+NsWpG@Gk>b}kKXWE6vK*a)Rt!7OeI;5OkRSJELhm?a^cu}CK|Fek?yhuf=)_Rf3)mrOC>Q+8pP>A|3p@R+1X5SSn zX2>wE2*Ys^ko4fV%3Z%ts9*2_G~4G~=I+^)?Vlblj!GZL>z-aFe*@n^n$e%?zc|?M z!cL+;bE7-hKVs80UiBf<9^B!G6sbp{Zumj3JQ(xc{uA&#n&(wXG?W0!yCK34HnO`7 zSB|WK-7We&M#lST+SR*h1vW3i+uyKZ!jp;{vIQj++_K<<;O$3jJB!}ehL>2*^EGpj zxAwe@H}{YUJ|M%u(fg6S19BkzX;Wx%YyIN)u}{7f(N-m`L_)tM}#=#9`Ei8-07{`eFfS+EOz z(7XoqJnWUZ4k1cfUEP17$rBPGT@1xXnJzGvT^O^=xdrit_H6-bzMa=ym4CHgJN`!J z^%OdDt-0^Om?0ZZ4BrI*WO)@o&P?wyA!P}q@sU58!X|A*<@Ca#rjsRIBruo43giLl z5>^G}FX9`%U$Ae9d}w+z*G)=LZ{YC5G%DI9&W?6!>&VjFlg6Pk<8wmx1xC=2>u~N7 z-lQ9H1>U~{$0L)@P8~`r6aH~R;G?<&v?hRZ5@nXv9lpg?w~AR1NSFc>?cL`=6j|6` z9(hnVN8Kn57~gppnRI6=J155;$?q<5t`V0wmCd6XdJYXRz|-Pe1DTMkat0JvK$)uV zf>?ig@nO{YXBJGUh&N^!?-~18N#X)&!x4PXFZEqsj!yDv-}Um-Esc?Yx~Dz(r0*YV zS)mLM7ajC)s=h`&1|T@vh%3C{AZMy;R56zVut7+3g%hd+^Khe-e_h}y5DTOvHqeHy z+-5v{aM{^lZ#hU;V^SFHA7@kasF~;*8!{v=AedB`+XA=b-nAylmsTEG=_Q7ry-mWBXHkI` zCPn?jIj;)Ceg_-hgt1Qaq zzKOlc{xh?C4z2J|^C%=p6PiMGj{!Vf_Z$9V7FKkZ7UWp($RiOXWZfn*n=YeHS|u*H zr?5aumFQAXhtW%tc5V8AWQ)5=x!!9|7bdZ}&c@FZeOHFUj{u>fDnERP-@vG<{67iT z?4Lr4JOqZ2azs)_5ogS7m*iylFN`5!;C{1hh?BBrP@(Ti311{Fs|frjn^%Fu(6!_? zHTEXDce!epLR(gp9GhdyZS*;?x!mGW4}4Fr?9MqcvQvd5`kVgY^0UOBDnHly#Y_u* z)dJIPyaXmTHahb+Vgkg6RXDv1zzi(dkb&c^ z$Q!xWHAWL_s4u!{?FXfVoEd$6DR}?y>|X;VmPRr{$>FqZVaG#annpm8ZqVq@z(*K@ zVWYX|Yl6Ux3fxy01E24L!xxO|@PDlj^tWIyKJ3;PnSpM$R=dGN` zSl9C<36P6Oy1Qj{`c5-hbPGy&$B|z7h?Iw9Tx&K(RkhULhS;n<|*``tG_dBWX6`- z^gdumGM*x&u%zTj3ef6nhskh7QtBVk4~6c1s~RH}zF&lYCh5lO<(!D?I)G*0Z|CV4 zPsrqgy(8BS)sVx5Igty4f0Fc(Ylnp$!>Z?x%n28E)T4A=f3cy9ny>`)_JOnBO(hnw z6F;Zg7h+~~s)*})1*wkN`yU?L6K}+EuSLD!Zb?dX_=ncM(6af!X zuxu~Z%T%qIf9gr2SH!8o%WUdV=>-uE+@}I#RN|1>3BWj2rk?l@){y2fWz|+=1`tS6 z57h#cOJ-uKxEix>#643{M$I}McEgXer1|QHQmRE{KQ;pgcNs8F^XKy$3taxoSm5%X zhsCG^7mZw3Ypw~m!7qLxjvCW2BzD!_E#v|R2)4(MU<#n!199A3Cq$}YIRWFkCHT_@ z%m2^4;#&f@WNW{JG1S`ma5PKRZ3HC+=A(0I5PpkDmJ*d|xVpRyX{i;+B{|@#={Ezp zc-8N>O5SDjjZu(~9QmS&zxe4-|S|5idh4bo`OM zD)b{pGD#@bL#OdGkR+t-0YnaJ^`mUWV)gT-8fR`nJCg)L0$xpw z=tUN>$r-#NnSVsJ%Fk%&Yk|NpuX=|UBA<4OGdZ|b#vUf+SpGwgeTFG;?ZEB`^wdyP8>+IC0Lv8nL*;p%4@4!BV&Hg@@^Zz+WE_;X#)Um&FE zA~Y}=z10_Px%VNmIp>ZTIotJoVS>AL&0io=cyA2sHHwZA6~YOKVAQc{TPa;{DV9q} zoBE~p7+^ISt`$piUvl_?CjfL;r z9Ls%o{}<%2By(7gaIBl=QTb#sZ(q0t^uVw8m6dw=jmhtljra1Ra@WKq$OCOig%HWYUo3LE9xRA4%paK(g)?qrUz*fs+S>?@DTT0fg0>ipYox?i^ zquiZb^A=Dq^iZsexoBPY5BVegH%6z`s4;*b?Xt z1)s++V<;%Bx*#3!6Z*vAzcqq6RWG6NrqxHh6nE9V1)laC5~}NgyLa8w%zF)Z7`@&V ze1T`513x5Q6Iic$Tm$RXz;Im2cR8pDxX_Y%haL;Y(N$Z`m%;8x@eWs<=#l0)1cHvA zMW(mu*7^#eBxQEu7Gc$iBOm|!06NX2;e*gg?7(C21Cw;-Kk3XGpSO!<^e96wV zwB+vE|9OdrQ@OfqKSnA~wkM6>|^j7evH#}d?LifDRJ0<`ce_rJoWW>Xy1>iOl zfVdicoNv@^d_l$37Ft53dI&ZCXtre6*{5weYNHZSD0tMXUgqo&!y`aIqPX#I{9X)^ z@WXq$Ae>e#5}3mNI4YTVR2##i3AVHFXa_(AkJ3mUgh$UvGI%ujT4D5m#PF!Z@+E;J zth0_@VZ7Rs@A3}`7dQ%u6&>i2D=yB3YDm1vw+E5!drFOWbKf&ugRjt7DBOpMvFhQ6 z^r6q;R##FEYzWSDV~i{j@B5RoJ6*sD7QBCU5>&zf&5XpB?D6ntc-uu}1p)d@heQdSC-0(CF#dxe6KV<8%tYK!Tn3j#{V|&aH%RHuQdJ^v-Qv47H|DCkI{O) zs@zE{SZIVEQ5)fwDm2Y$-YP4>ophV^1+g_>BrPsLoh3xp=#hcH9F~uxvGB|Xm&H!U z_*viLu+N<3znJ}h1Y$Qif4AlK5bw3;T}!H}-y)xyM=yl3v!n_W=9D**MqI>%>JD579PK{a}gYzek_qwx7_WjCYF$RGV4p=`q4Z)lhxc0 zO{NYv-|nPZ+`ae-(Dv!iWJrrM+)4FTN{5+}=}x-OO4)0sWV@3duu@(&Q%1X!erl!s z%1p^|Cp~1PJY=R!bSFJxrEE4+X1J4{wNm_M%1n3CAFY&I&6EOn(l#r_W2Ve?C%tT? zTxX`tcPBMiDOZ>&-*G4Huu?9Tl$hHbw3>vH=k4~ELF_`6qUxG&{07VpT$FD-E59z| zbK=#$vX0`N-+~zWV7S$~2L-c{tZl)&eDm3$yjtE$vRn+#nvT%6|dWtG8Fi}KkM zhsc98vMbn_K~jk?6IVqZ6(%_qv29lNde0a#GF@XR1S>UI5d}XmOwebR1dVDv z)47w@TPe9_iqoA`ZKaGfQ>Nng*Gfq-Q>M9-eq*J4_J7VpBycDx6r$*Oeo#|}i}Hh- zQn(DUrZ*{s7Y-_~yV&RPhEUij0Sr5`_Un~`hdkl#4c!q4gN!jETIVmADGpd=A)MH4 zka|T6fPgT4>YsVbYp5vb6hoWPb@?wzwXWJlyisr;XB=FvanquTtzxd)`^iDk&~>1t zq4WEOX*y7MklZGDaPY0f=hDePB-vVYPLD66OxSsISucuznd$+Eh3B(Kj-%)_4{)q6 z6Z98B(Mi&HeKWJ*bhJWVo_s)R?=4Y}$b%eABIvN49zf5320ibHqo=W<3#_961T}?)nG_G+-X&ovpZz0kECXx6rQ<65M}o%-oZQu16{=azgqQnLZU&V?i%+A+f-Xgm zFJ)PrIfTR>m#=R96&zqwDG2^RJSFwH>R`*5Sf_8s(qO|1 z-HSflRi;srRt9&bS>>txi~VGk)&Y+SH5z_Inlz{{N!EJ2u6?8vl->NK8#>U8Kk6c8 zGq~z2wpv2ffv`xKH$Nnhe3NyvskT<<4{v@%Cx0WB`~xdlRApni>7>_6_UL3YH_6wN zOqH~K^J5y$*chBiR)HsUa!xFHn3epLB(Jb%Fvr#$oNkpahc^oe@vImU`@$af4qvQF zWT|_6WA*lP+@l(-GUYnitb|rQZ6z;}_QH<=Kr=|SG2&&xolWg5J6UMx zx0VrXeSdF!%2-}_0P~hr`ip)ubZGw_=lcq{s>9vX?kIlyic0h6U!W^9)29#a1OS$gBX-6&qq+fq66 zRv4Rgdm50b^Ln92eQ%2(fMyVGI3<%~Y}Sp8=a?7I@qUlwh^|?$u8t>O#-kL|-D&U_ z3E%=_^8++uiU^B6Dv2D%=AZKXs=&@|;rtVlBq1X5c8s^^^8!G%@d%3*eO~uZBv}={ z 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 OUkprGkLkqOOD$IeUZE#w&Gfi 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 literal 0 HcmV?d00001 From 634aefdb27173df5bfe147ba32974dc60fa00308 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 20 Jun 2018 09:44:33 +0200 Subject: [PATCH 11/21] Setup POCO_BASE on Windows --- env.bat | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 env.bat diff --git a/env.bat b/env.bat new file mode 100644 index 000000000..2725391e1 --- /dev/null +++ b/env.bat @@ -0,0 +1,2 @@ +@echo off +set POCO_BASE=%CD% From 416a99e61f43c1e468d82e7395d7e2566ff2dfe5 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 20 Jun 2018 09:45:26 +0200 Subject: [PATCH 12/21] Helper for regenerating VS projects --- ProGen/progen32.bat | 47 +++++++++++++++++++++++++++++++++++++++++++++ ProGen/progen64.bat | 47 +++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 94 insertions(+) create mode 100644 ProGen/progen32.bat create mode 100644 ProGen/progen64.bat diff --git a/ProGen/progen32.bat b/ProGen/progen32.bat new file mode 100644 index 000000000..385cb6489 --- /dev/null +++ b/ProGen/progen32.bat @@ -0,0 +1,47 @@ +setlocal +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\CppUnit\CppUnit.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Foundation\Foundation.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Encodings\Encodings.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\XML\XML.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\JSON\JSON.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Util\Util.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Net\Net.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Crypto\Crypto.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\NetSSL_OpenSSL\NetSSL_OpenSSL.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\NetSSL_Win\NetSSL_Win.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\Data.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\SQLite\SQLite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\ODBC\ODBC.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\MySQL\MySQL.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\PostgreSQL\PostgreSQL.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Zip\Zip.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\PageCompiler\PageCompiler.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\PageCompiler\File2Page\File2Page.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\PDF\PDF.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\CppParser\CppParser.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\MongoDB\MongoDB.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Redis\Redis.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\ProGen\ProGen.progen + + +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Foundation\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Encodings\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\XML\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\JSON\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Util\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Net\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Crypto\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\NetSSL_OpenSSL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\NetSSL_Win\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\SQLite\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\ODBC\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\MySQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Data\PostgreSQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Zip\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\PageCompiler\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\PDF\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\CppParser\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\MongoDB\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=Win32 %POCO_BASE%\Redis\testsuite\TestSuite.progen +endlocal diff --git a/ProGen/progen64.bat b/ProGen/progen64.bat new file mode 100644 index 000000000..2a688a02b --- /dev/null +++ b/ProGen/progen64.bat @@ -0,0 +1,47 @@ +setlocal +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\CppUnit\CppUnit.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Foundation\Foundation.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Encodings\Encodings.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\XML\XML.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\JSON\JSON.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Util\Util.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Net\Net.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Crypto\Crypto.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\NetSSL_OpenSSL\NetSSL_OpenSSL.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\NetSSL_Win\NetSSL_Win.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\Data.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\SQLite\SQLite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\ODBC\ODBC.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\MySQL\MySQL.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\PostgreSQL\PostgreSQL.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Zip\Zip.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\PageCompiler\PageCompiler.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\PageCompiler\File2Page\File2Page.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\PDF\PDF.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\CppParser\CppParser.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\MongoDB\MongoDB.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Redis\Redis.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\ProGen\ProGen.progen + + +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Foundation\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Encodings\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\XML\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\JSON\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Util\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Net\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Crypto\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\NetSSL_OpenSSL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\NetSSL_Win\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\SQLite\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\ODBC\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\MySQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Data\PostgreSQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Zip\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\PageCompiler\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\PDF\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\CppParser\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\MongoDB\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=x64 %POCO_BASE%\Redis\testsuite\TestSuite.progen +endlocal From 5dbb9cc3de7682730175b0d849cf3f8d22edc40b Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 20 Jun 2018 09:47:40 +0200 Subject: [PATCH 13/21] Regenerating VisualStudio projects --- CppParser/CppParser_CE_vs90.vcproj | 12 +- CppParser/CppParser_vs100.vcxproj | 21 +- CppParser/CppParser_vs100.vcxproj.filters | 18 +- CppParser/CppParser_vs110.vcxproj | 18 +- CppParser/CppParser_vs110.vcxproj.filters | 18 +- CppParser/CppParser_vs120.vcxproj | 18 +- CppParser/CppParser_vs120.vcxproj.filters | 18 +- CppParser/CppParser_vs140.vcxproj | 18 +- CppParser/CppParser_vs140.vcxproj.filters | 18 +- CppParser/CppParser_vs150.vcxproj | 18 +- CppParser/CppParser_vs150.vcxproj.filters | 18 +- CppParser/CppParser_vs90.vcproj | 16 +- CppParser/CppParser_x64_vs100.vcxproj | 26 +- CppParser/CppParser_x64_vs100.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs110.vcxproj | 22 +- CppParser/CppParser_x64_vs110.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs120.vcxproj | 22 +- CppParser/CppParser_x64_vs120.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs140.vcxproj | 22 +- CppParser/CppParser_x64_vs140.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs150.vcxproj | 22 +- CppParser/CppParser_x64_vs150.vcxproj.filters | 18 +- CppParser/CppParser_x64_vs90.vcproj | 16 +- CppParser/testsuite/TestSuite.progen | 4 +- CppParser/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs110.vcxproj | 10 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs120.vcxproj | 6 + .../testsuite/TestSuite_vs120.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs140.vcxproj | 6 + .../testsuite/TestSuite_vs140.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs150.vcxproj | 6 + .../testsuite/TestSuite_vs150.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_vs90.vcproj | 12 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 22 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 22 +- CppParser/testsuite/TestSuite_x64_vs90.vcproj | 12 +- CppUnit/CppUnit_CE_vs90.vcproj | 16 +- CppUnit/CppUnit_WEC2013_vs110.vcxproj | 8 +- CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_WEC2013_vs120.vcxproj | 8 +- CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_vs100.vcxproj | 21 +- CppUnit/CppUnit_vs100.vcxproj.filters | 4 +- CppUnit/CppUnit_vs110.vcxproj | 18 +- CppUnit/CppUnit_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_vs120.vcxproj | 18 +- CppUnit/CppUnit_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_vs140.vcxproj | 18 +- CppUnit/CppUnit_vs140.vcxproj.filters | 4 +- CppUnit/CppUnit_vs150.vcxproj | 18 +- CppUnit/CppUnit_vs150.vcxproj.filters | 4 +- CppUnit/CppUnit_vs90.vcproj | 434 ++++++++++++------ CppUnit/CppUnit_x64_vs100.vcxproj | 26 +- CppUnit/CppUnit_x64_vs100.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs110.vcxproj | 22 +- CppUnit/CppUnit_x64_vs110.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs120.vcxproj | 22 +- CppUnit/CppUnit_x64_vs120.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs140.vcxproj | 22 +- CppUnit/CppUnit_x64_vs140.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs150.vcxproj | 22 +- CppUnit/CppUnit_x64_vs150.vcxproj.filters | 4 +- CppUnit/CppUnit_x64_vs90.vcproj | 16 +- Crypto/Crypto_CE_VS90.vcproj | 12 +- Crypto/Crypto_VS90.vcproj | 12 +- Crypto/Crypto_WEC2013_vs110.vcxproj | 8 +- Crypto/Crypto_WEC2013_vs110.vcxproj.filters | 36 +- Crypto/Crypto_WEC2013_vs120.vcxproj | 56 +-- Crypto/Crypto_WEC2013_vs120.vcxproj.filters | 36 +- Crypto/Crypto_vs100.vcxproj | 21 +- Crypto/Crypto_vs100.vcxproj.filters | 36 +- Crypto/Crypto_vs110.vcxproj | 18 +- Crypto/Crypto_vs110.vcxproj.filters | 36 +- Crypto/Crypto_vs120.vcxproj | 66 +-- Crypto/Crypto_vs120.vcxproj.filters | 36 +- Crypto/Crypto_vs140.vcxproj | 20 +- Crypto/Crypto_vs140.vcxproj.filters | 36 +- Crypto/Crypto_vs150.vcxproj | 20 +- Crypto/Crypto_vs150.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs100.vcxproj | 26 +- Crypto/Crypto_x64_vs100.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs110.vcxproj | 22 +- Crypto/Crypto_x64_vs110.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs120.vcxproj | 70 +-- Crypto/Crypto_x64_vs120.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs140.vcxproj | 24 +- Crypto/Crypto_x64_vs140.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs150.vcxproj | 24 +- Crypto/Crypto_x64_vs150.vcxproj.filters | 36 +- Crypto/Crypto_x64_vs90.vcproj | 12 +- .../testsuite/TestSuite_WEC2013_vs110.vcxproj | 2 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 18 +- .../testsuite/TestSuite_WEC2013_vs120.vcxproj | 8 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 18 +- Crypto/testsuite/TestSuite_vs100.vcxproj | 100 ++-- .../testsuite/TestSuite_vs100.vcxproj.filters | 18 +- Crypto/testsuite/TestSuite_vs110.vcxproj | 24 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 18 +- Crypto/testsuite/TestSuite_vs120.vcxproj | 16 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_vs150.vcxproj | 10 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs100.vcxproj | 24 +- .../TestSuite_x64_vs100.vcxproj.filters | 18 +- Crypto/testsuite/TestSuite_x64_vs110.vcxproj | 24 +- .../TestSuite_x64_vs110.vcxproj.filters | 18 +- Crypto/testsuite/TestSuite_x64_vs120.vcxproj | 16 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- Crypto/testsuite/TestSuite_x64_vs150.vcxproj | 10 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- Data/Data_CE_vs90.vcproj | 16 +- Data/Data_VS90.vcproj | 16 +- Data/Data_WEC2013_vs110.vcxproj | 8 +- Data/Data_WEC2013_vs110.vcxproj.filters | 18 +- Data/Data_WEC2013_vs120.vcxproj | 8 +- Data/Data_WEC2013_vs120.vcxproj.filters | 18 +- Data/Data_vs100.vcxproj | 21 +- Data/Data_vs100.vcxproj.filters | 18 +- Data/Data_vs110.vcxproj | 18 +- Data/Data_vs110.vcxproj.filters | 18 +- Data/Data_vs120.vcxproj | 18 +- Data/Data_vs120.vcxproj.filters | 18 +- Data/Data_vs140.vcxproj | 18 +- Data/Data_vs140.vcxproj.filters | 18 +- Data/Data_vs150.vcxproj | 18 +- Data/Data_vs150.vcxproj.filters | 18 +- Data/Data_x64_vs100.vcxproj | 26 +- Data/Data_x64_vs100.vcxproj.filters | 18 +- Data/Data_x64_vs110.vcxproj | 22 +- Data/Data_x64_vs110.vcxproj.filters | 18 +- Data/Data_x64_vs120.vcxproj | 22 +- Data/Data_x64_vs120.vcxproj.filters | 18 +- Data/Data_x64_vs140.vcxproj | 22 +- Data/Data_x64_vs140.vcxproj.filters | 18 +- Data/Data_x64_vs150.vcxproj | 22 +- Data/Data_x64_vs150.vcxproj.filters | 18 +- Data/Data_x64_vs90.vcproj | 16 +- Data/MySQL/MySQL_VS90.vcproj | 16 +- Data/MySQL/MySQL_vs100.vcxproj | 21 +- Data/MySQL/MySQL_vs110.vcxproj | 18 +- Data/MySQL/MySQL_vs120.vcxproj | 18 +- Data/MySQL/MySQL_vs140.vcxproj | 18 +- Data/MySQL/MySQL_vs150.vcxproj | 18 +- Data/MySQL/MySQL_x64_vs100.vcxproj | 26 +- Data/MySQL/MySQL_x64_vs110.vcxproj | 22 +- Data/MySQL/MySQL_x64_vs120.vcxproj | 22 +- Data/MySQL/MySQL_x64_vs140.vcxproj | 22 +- Data/MySQL/MySQL_x64_vs150.vcxproj | 22 +- Data/MySQL/MySQL_x64_vs90.vcproj | 16 +- Data/MySQL/testsuite/TestSuite.progen | 4 +- Data/MySQL/testsuite/TestSuite_VS90.vcproj | 24 +- Data/MySQL/testsuite/TestSuite_vs100.vcxproj | 28 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs110.vcxproj | 22 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/MySQL/testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 28 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 22 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../MySQL/testsuite/TestSuite_x64_vs90.vcproj | 24 +- Data/ODBC/ODBC_VS90.vcproj | 12 +- Data/ODBC/ODBC_vs100.vcxproj | 21 +- Data/ODBC/ODBC_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs110.vcxproj | 18 +- Data/ODBC/ODBC_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs120.vcxproj | 18 +- Data/ODBC/ODBC_vs120.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs140.vcxproj | 18 +- Data/ODBC/ODBC_vs140.vcxproj.filters | 6 +- Data/ODBC/ODBC_vs150.vcxproj | 18 +- Data/ODBC/ODBC_vs150.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs100.vcxproj | 26 +- Data/ODBC/ODBC_x64_vs100.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs110.vcxproj | 22 +- Data/ODBC/ODBC_x64_vs110.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs120.vcxproj | 22 +- Data/ODBC/ODBC_x64_vs120.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs140.vcxproj | 22 +- Data/ODBC/ODBC_x64_vs140.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs150.vcxproj | 22 +- Data/ODBC/ODBC_x64_vs150.vcxproj.filters | 6 +- Data/ODBC/ODBC_x64_vs90.vcproj | 12 +- Data/ODBC/testsuite/TestSuite.progen | 2 +- Data/ODBC/testsuite/TestSuite_VS90.vcproj | 4 +- Data/ODBC/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs110.vcxproj | 16 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_vs150.vcxproj | 12 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 16 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 12 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj | 4 +- Data/PostgreSQL/PostgreSQL_VS90.vcproj | 16 +- Data/PostgreSQL/PostgreSQL_vs100.vcxproj | 21 +- Data/PostgreSQL/PostgreSQL_vs110.vcxproj | 18 +- Data/PostgreSQL/PostgreSQL_vs120.vcxproj | 18 +- Data/PostgreSQL/PostgreSQL_vs140.vcxproj | 18 +- Data/PostgreSQL/PostgreSQL_vs150.vcxproj | 18 +- Data/PostgreSQL/PostgreSQL_x64_vs100.vcxproj | 26 +- Data/PostgreSQL/PostgreSQL_x64_vs110.vcxproj | 22 +- Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj | 22 +- Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj | 22 +- Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj | 22 +- Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj | 16 +- Data/PostgreSQL/testsuite/TestSuite.progen | 2 +- .../testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../testsuite/TestSuite_VS90.vcproj | 24 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 16 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs100.vcxproj | 28 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs110.vcxproj | 22 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs120.vcxproj | 18 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs140.vcxproj | 18 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_vs150.vcxproj | 18 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 28 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 22 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 18 +- .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 18 +- .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 18 +- .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs90.vcproj | 24 +- Data/SQLite/SQLite_CE_vs90.vcproj | 16 +- Data/SQLite/SQLite_VS90.vcproj | 16 +- Data/SQLite/SQLite_WEC2013_vs110.vcxproj | 8 +- .../SQLite_WEC2013_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_WEC2013_vs120.vcxproj | 8 +- .../SQLite_WEC2013_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs100.vcxproj | 21 +- Data/SQLite/SQLite_vs100.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs110.vcxproj | 18 +- Data/SQLite/SQLite_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs120.vcxproj | 18 +- Data/SQLite/SQLite_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs140.vcxproj | 18 +- Data/SQLite/SQLite_vs140.vcxproj.filters | 12 +- Data/SQLite/SQLite_vs150.vcxproj | 18 +- Data/SQLite/SQLite_vs150.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs100.vcxproj | 26 +- Data/SQLite/SQLite_x64_vs100.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs110.vcxproj | 22 +- Data/SQLite/SQLite_x64_vs110.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs120.vcxproj | 22 +- Data/SQLite/SQLite_x64_vs120.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs140.vcxproj | 22 +- Data/SQLite/SQLite_x64_vs140.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs150.vcxproj | 22 +- Data/SQLite/SQLite_x64_vs150.vcxproj.filters | 12 +- Data/SQLite/SQLite_x64_vs90.vcproj | 16 +- Data/SQLite/testsuite/TestSuite.progen | 1 + .../SQLite/testsuite/TestSuite_CE_vs90.vcproj | 12 +- Data/SQLite/testsuite/TestSuite_VS90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 16 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs110.vcxproj | 10 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs120.vcxproj | 6 + .../testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs140.vcxproj | 6 + .../testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Data/SQLite/testsuite/TestSuite_vs150.vcxproj | 6 + .../testsuite/TestSuite_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 16 +- .../testsuite/TestSuite_x64_vs90.vcproj | 12 +- Data/testsuite/TestSuite.progen | 3 + Data/testsuite/TestSuite_CE_vs90.vcproj | 12 +- Data/testsuite/TestSuite_VS90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 28 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs110.vcxproj | 10 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs120.vcxproj | 6 + .../testsuite/TestSuite_vs120.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs140.vcxproj | 6 + .../testsuite/TestSuite_vs140.vcxproj.filters | 28 +- Data/testsuite/TestSuite_vs150.vcxproj | 6 + .../testsuite/TestSuite_vs150.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 28 +- Data/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Encodings/Encodings_CE_vs90.vcproj | 16 +- Encodings/Encodings_WEC2013_vs110.vcxproj | 8 +- .../Encodings_WEC2013_vs110.vcxproj.filters | 6 +- Encodings/Encodings_WEC2013_vs120.vcxproj | 8 +- .../Encodings_WEC2013_vs120.vcxproj.filters | 6 +- Encodings/Encodings_vs100.vcxproj | 21 +- Encodings/Encodings_vs100.vcxproj.filters | 6 +- Encodings/Encodings_vs110.vcxproj | 18 +- Encodings/Encodings_vs110.vcxproj.filters | 6 +- Encodings/Encodings_vs120.vcxproj | 18 +- Encodings/Encodings_vs120.vcxproj.filters | 6 +- Encodings/Encodings_vs140.vcxproj | 18 +- Encodings/Encodings_vs140.vcxproj.filters | 6 +- Encodings/Encodings_vs150.vcxproj | 18 +- Encodings/Encodings_vs150.vcxproj.filters | 6 +- Encodings/Encodings_vs90.vcproj | 17 +- Encodings/Encodings_x64_vs100.vcxproj | 26 +- Encodings/Encodings_x64_vs100.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs110.vcxproj | 22 +- Encodings/Encodings_x64_vs110.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs120.vcxproj | 22 +- Encodings/Encodings_x64_vs120.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs140.vcxproj | 22 +- Encodings/Encodings_x64_vs140.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs150.vcxproj | 22 +- Encodings/Encodings_x64_vs150.vcxproj.filters | 6 +- Encodings/Encodings_x64_vs90.vcproj | 16 +- Encodings/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 4 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs100.vcxproj | 4 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs110.vcxproj | 4 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_vs90.vcproj | 12 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 4 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 4 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- Encodings/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Foundation/Foundation.progen | 2 +- Foundation/Foundation_CE_vs90.vcproj | 12 +- Foundation/Foundation_WEC2013_vs110.vcxproj | 8 +- .../Foundation_WEC2013_vs110.vcxproj.filters | 124 ++--- Foundation/Foundation_WEC2013_vs120.vcxproj | 8 +- .../Foundation_WEC2013_vs120.vcxproj.filters | 124 ++--- Foundation/Foundation_vs100.vcxproj | 27 +- Foundation/Foundation_vs100.vcxproj.filters | 124 ++--- Foundation/Foundation_vs110.vcxproj | 24 +- Foundation/Foundation_vs110.vcxproj.filters | 124 ++--- Foundation/Foundation_vs120.vcxproj | 24 +- Foundation/Foundation_vs120.vcxproj.filters | 124 ++--- Foundation/Foundation_vs140.vcxproj | 24 +- Foundation/Foundation_vs140.vcxproj.filters | 124 ++--- Foundation/Foundation_vs150.vcxproj | 24 +- Foundation/Foundation_vs150.vcxproj.filters | 124 ++--- Foundation/Foundation_vs90.vcproj | 20 +- Foundation/Foundation_x64_vs100.vcxproj | 24 +- .../Foundation_x64_vs100.vcxproj.filters | 124 ++--- Foundation/Foundation_x64_vs110.vcxproj | 22 +- .../Foundation_x64_vs110.vcxproj.filters | 124 ++--- Foundation/Foundation_x64_vs120.vcxproj | 22 +- .../Foundation_x64_vs120.vcxproj.filters | 124 ++--- Foundation/Foundation_x64_vs140.vcxproj | 22 +- .../Foundation_x64_vs140.vcxproj.filters | 124 ++--- Foundation/Foundation_x64_vs150.vcxproj | 22 +- .../Foundation_x64_vs150.vcxproj.filters | 124 ++--- Foundation/Foundation_x64_vs90.vcproj | 28 +- Foundation/testsuite/TestApp_CE_vs90.vcproj | 8 +- .../testsuite/TestLibrary_CE_vs90.vcproj | 8 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 118 ++--- .../TestSuite_WEC2013_vs120.vcxproj.filters | 118 ++--- Foundation/testsuite/TestSuite_vs100.vcxproj | 4 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 118 ++--- Foundation/testsuite/TestSuite_vs110.vcxproj | 4 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 118 ++--- .../testsuite/TestSuite_vs120.vcxproj.filters | 118 ++--- .../testsuite/TestSuite_vs140.vcxproj.filters | 118 ++--- .../testsuite/TestSuite_vs150.vcxproj.filters | 118 ++--- .../testsuite/TestSuite_x64_vs100.vcxproj | 4 +- .../TestSuite_x64_vs100.vcxproj.filters | 118 ++--- .../testsuite/TestSuite_x64_vs110.vcxproj | 4 +- .../TestSuite_x64_vs110.vcxproj.filters | 118 ++--- .../TestSuite_x64_vs120.vcxproj.filters | 118 ++--- .../TestSuite_x64_vs140.vcxproj.filters | 118 ++--- .../TestSuite_x64_vs150.vcxproj.filters | 118 ++--- JSON/JSON_CE_vs90.vcproj | 16 +- JSON/JSON_WEC2013_vs110.vcxproj | 8 +- JSON/JSON_WEC2013_vs110.vcxproj.filters | 4 +- JSON/JSON_WEC2013_vs120.vcxproj | 8 +- JSON/JSON_WEC2013_vs120.vcxproj.filters | 4 +- JSON/JSON_vs100.vcxproj | 21 +- JSON/JSON_vs100.vcxproj.filters | 4 +- JSON/JSON_vs110.vcxproj | 18 +- JSON/JSON_vs110.vcxproj.filters | 4 +- JSON/JSON_vs120.vcxproj | 18 +- JSON/JSON_vs120.vcxproj.filters | 4 +- JSON/JSON_vs140.vcxproj | 18 +- JSON/JSON_vs140.vcxproj.filters | 4 +- JSON/JSON_vs150.vcxproj | 18 +- JSON/JSON_vs150.vcxproj.filters | 4 +- JSON/JSON_vs90.vcproj | 16 +- JSON/JSON_x64_vs100.vcxproj | 26 +- JSON/JSON_x64_vs100.vcxproj.filters | 4 +- JSON/JSON_x64_vs110.vcxproj | 22 +- JSON/JSON_x64_vs110.vcxproj.filters | 4 +- JSON/JSON_x64_vs120.vcxproj | 22 +- JSON/JSON_x64_vs120.vcxproj.filters | 4 +- JSON/JSON_x64_vs140.vcxproj | 22 +- JSON/JSON_x64_vs140.vcxproj.filters | 4 +- JSON/JSON_x64_vs150.vcxproj | 22 +- JSON/JSON_x64_vs150.vcxproj.filters | 4 +- JSON/JSON_x64_vs90.vcproj | 16 +- JSON/testsuite/TestSuite.progen | 4 + JSON/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 4 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs110.vcxproj | 10 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs120.vcxproj | 6 + .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs140.vcxproj | 6 + .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs150.vcxproj | 6 + .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_vs90.vcproj | 12 +- JSON/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 4 +- JSON/testsuite/TestSuite_x64_vs90.vcproj | 12 +- MongoDB/MongoDB_CE_vs90.vcproj | 12 +- MongoDB/MongoDB_vs100.vcxproj | 21 +- MongoDB/MongoDB_vs100.vcxproj.filters | 4 +- MongoDB/MongoDB_vs110.vcxproj | 18 +- MongoDB/MongoDB_vs110.vcxproj.filters | 4 +- MongoDB/MongoDB_vs120.vcxproj | 18 +- MongoDB/MongoDB_vs120.vcxproj.filters | 4 +- MongoDB/MongoDB_vs140.vcxproj | 18 +- MongoDB/MongoDB_vs140.vcxproj.filters | 4 +- MongoDB/MongoDB_vs150.vcxproj | 18 +- MongoDB/MongoDB_vs150.vcxproj.filters | 4 +- MongoDB/MongoDB_vs90.vcproj | 16 +- MongoDB/MongoDB_x64_vs100.vcxproj | 26 +- MongoDB/MongoDB_x64_vs100.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs110.vcxproj | 22 +- MongoDB/MongoDB_x64_vs110.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs120.vcxproj | 22 +- MongoDB/MongoDB_x64_vs120.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs140.vcxproj | 22 +- MongoDB/MongoDB_x64_vs140.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs150.vcxproj | 22 +- MongoDB/MongoDB_x64_vs150.vcxproj.filters | 4 +- MongoDB/MongoDB_x64_vs90.vcproj | 16 +- MongoDB/testsuite/TestSuite_vs100.vcxproj | 4 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_vs110.vcxproj | 4 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs100.vcxproj | 4 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- MongoDB/testsuite/TestSuite_x64_vs110.vcxproj | 4 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- Net/Net_CE_vs90.vcproj | 12 +- Net/Net_WEC2013_vs110.vcxproj | 8 +- Net/Net_WEC2013_vs110.vcxproj.filters | 102 ++-- Net/Net_WEC2013_vs120.vcxproj | 8 +- Net/Net_WEC2013_vs120.vcxproj.filters | 102 ++-- Net/Net_vs100.vcxproj | 21 +- Net/Net_vs100.vcxproj.filters | 102 ++-- Net/Net_vs110.vcxproj | 18 +- Net/Net_vs110.vcxproj.filters | 102 ++-- Net/Net_vs120.vcxproj | 18 +- Net/Net_vs120.vcxproj.filters | 102 ++-- Net/Net_vs140.vcxproj | 18 +- Net/Net_vs140.vcxproj.filters | 102 ++-- Net/Net_vs150.vcxproj | 18 +- Net/Net_vs150.vcxproj.filters | 102 ++-- Net/Net_vs90.vcproj | 12 +- Net/Net_x64_vs100.vcxproj | 26 +- Net/Net_x64_vs100.vcxproj.filters | 102 ++-- Net/Net_x64_vs110.vcxproj | 22 +- Net/Net_x64_vs110.vcxproj.filters | 102 ++-- Net/Net_x64_vs120.vcxproj | 22 +- Net/Net_x64_vs120.vcxproj.filters | 102 ++-- Net/Net_x64_vs140.vcxproj | 22 +- Net/Net_x64_vs140.vcxproj.filters | 102 ++-- Net/Net_x64_vs150.vcxproj | 22 +- Net/Net_x64_vs150.vcxproj.filters | 102 ++-- Net/Net_x64_vs90.vcproj | 12 +- Net/testsuite/TestSuite.progen | 7 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 112 ++--- .../TestSuite_WEC2013_vs120.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_vs100.vcxproj | 16 +- Net/testsuite/TestSuite_vs100.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_vs110.vcxproj | 16 +- Net/testsuite/TestSuite_vs110.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_vs120.vcxproj | 12 +- Net/testsuite/TestSuite_vs120.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_vs140.vcxproj | 12 +- Net/testsuite/TestSuite_vs140.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_vs150.vcxproj | 12 +- Net/testsuite/TestSuite_vs150.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_x64_vs110.vcxproj | 16 +- .../TestSuite_x64_vs110.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_x64_vs120.vcxproj | 12 +- .../TestSuite_x64_vs120.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 112 ++--- Net/testsuite/TestSuite_x64_vs150.vcxproj | 12 +- .../TestSuite_x64_vs150.vcxproj.filters | 112 ++--- NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj | 12 +- .../NetSSL_OpenSSL_WEC2013_vs110.vcxproj | 8 +- ...tSSL_OpenSSL_WEC2013_vs110.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_WEC2013_vs120.vcxproj | 8 +- ...tSSL_OpenSSL_WEC2013_vs120.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj | 21 +- .../NetSSL_OpenSSL_vs100.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj | 18 +- .../NetSSL_OpenSSL_vs110.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj | 18 +- .../NetSSL_OpenSSL_vs120.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj | 18 +- .../NetSSL_OpenSSL_vs140.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj | 18 +- .../NetSSL_OpenSSL_vs150.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj | 12 +- .../NetSSL_OpenSSL_x64_vs100.vcxproj | 26 +- .../NetSSL_OpenSSL_x64_vs100.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs110.vcxproj | 22 +- .../NetSSL_OpenSSL_x64_vs110.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs120.vcxproj | 22 +- .../NetSSL_OpenSSL_x64_vs120.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs140.vcxproj | 22 +- .../NetSSL_OpenSSL_x64_vs140.vcxproj.filters | 24 +- .../NetSSL_OpenSSL_x64_vs150.vcxproj | 22 +- .../NetSSL_OpenSSL_x64_vs150.vcxproj.filters | 24 +- NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 40 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs100.vcxproj | 4 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs110.vcxproj | 4 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 4 +- .../TestSuite_x64_vs100.vcxproj.filters | 40 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 4 +- .../TestSuite_x64_vs110.vcxproj.filters | 40 +- .../TestSuite_x64_vs120.vcxproj.filters | 40 +- .../TestSuite_x64_vs140.vcxproj.filters | 40 +- .../TestSuite_x64_vs150.vcxproj.filters | 40 +- NetSSL_Win/NetSSL_Win_CE_vs90.vcproj | 12 +- NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj | 8 +- .../NetSSL_Win_WEC2013_vs110.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj | 8 +- .../NetSSL_Win_WEC2013_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs100.vcxproj | 21 +- NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs110.vcxproj | 18 +- NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs120.vcxproj | 18 +- NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs140.vcxproj | 18 +- NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs150.vcxproj | 18 +- NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_vs90.vcproj | 12 +- NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj | 26 +- .../NetSSL_Win_x64_vs100.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj | 22 +- .../NetSSL_Win_x64_vs110.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj | 22 +- .../NetSSL_Win_x64_vs120.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj | 22 +- .../NetSSL_Win_x64_vs140.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj | 22 +- .../NetSSL_Win_x64_vs150.vcxproj.filters | 24 +- NetSSL_Win/NetSSL_Win_x64_vs90.vcproj | 12 +- NetSSL_Win/testsuite/TestSuite.progen | 14 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 34 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs110.vcxproj | 16 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs120.vcxproj | 12 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs140.vcxproj | 12 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 34 +- NetSSL_Win/testsuite/TestSuite_vs150.vcxproj | 12 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs110.vcxproj | 16 +- .../TestSuite_x64_vs110.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs120.vcxproj | 12 +- .../TestSuite_x64_vs120.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs140.vcxproj | 12 +- .../TestSuite_x64_vs140.vcxproj.filters | 34 +- .../testsuite/TestSuite_x64_vs150.vcxproj | 12 +- .../TestSuite_x64_vs150.vcxproj.filters | 34 +- PDF/PDF_vs100.vcxproj | 21 +- PDF/PDF_vs100.vcxproj.filters | 24 +- PDF/PDF_vs110.vcxproj | 18 +- PDF/PDF_vs110.vcxproj.filters | 24 +- PDF/PDF_vs120.vcxproj | 18 +- PDF/PDF_vs120.vcxproj.filters | 24 +- PDF/PDF_vs140.vcxproj | 18 +- PDF/PDF_vs140.vcxproj.filters | 24 +- PDF/PDF_vs150.vcxproj | 18 +- PDF/PDF_vs150.vcxproj.filters | 24 +- PDF/PDF_vs90.vcproj | 16 +- PDF/PDF_x64_vs100.vcxproj | 26 +- PDF/PDF_x64_vs100.vcxproj.filters | 24 +- PDF/PDF_x64_vs110.vcxproj | 22 +- PDF/PDF_x64_vs110.vcxproj.filters | 24 +- PDF/PDF_x64_vs120.vcxproj | 22 +- PDF/PDF_x64_vs120.vcxproj.filters | 24 +- PDF/PDF_x64_vs140.vcxproj | 22 +- PDF/PDF_x64_vs140.vcxproj.filters | 24 +- PDF/PDF_x64_vs150.vcxproj | 22 +- PDF/PDF_x64_vs150.vcxproj.filters | 24 +- PDF/PDF_x64_vs90.vcproj | 16 +- PDF/testsuite/TestSuite.progen | 1 + PDF/testsuite/TestSuite_vs100.vcxproj | 16 +- PDF/testsuite/TestSuite_vs100.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs110.vcxproj | 10 +- PDF/testsuite/TestSuite_vs110.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs120.vcxproj | 6 + PDF/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs140.vcxproj | 6 + PDF/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs150.vcxproj | 6 + PDF/testsuite/TestSuite_vs150.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_vs90.vcproj | 12 +- PDF/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 16 +- PDF/testsuite/TestSuite_x64_vs90.vcproj | 12 +- .../File2Page/File2Page_vs100.vcxproj.filters | 4 +- .../File2Page/File2Page_vs110.vcxproj | 2 +- .../File2Page/File2Page_vs110.vcxproj.filters | 4 +- .../File2Page/File2Page_vs120.vcxproj.filters | 4 +- .../File2Page/File2Page_vs140.vcxproj | 2 +- .../File2Page/File2Page_vs140.vcxproj.filters | 4 +- .../File2Page/File2Page_vs150.vcxproj | 2 +- .../File2Page/File2Page_vs150.vcxproj.filters | 4 +- .../File2Page_x64_vs100.vcxproj.filters | 4 +- .../File2Page/File2Page_x64_vs110.vcxproj | 2 +- .../File2Page_x64_vs110.vcxproj.filters | 4 +- .../File2Page_x64_vs120.vcxproj.filters | 4 +- .../File2Page/File2Page_x64_vs140.vcxproj | 2 +- .../File2Page_x64_vs140.vcxproj.filters | 4 +- .../File2Page/File2Page_x64_vs150.vcxproj | 2 +- .../File2Page_x64_vs150.vcxproj.filters | 4 +- .../PageCompiler_vs100.vcxproj.filters | 6 +- PageCompiler/PageCompiler_vs110.vcxproj | 2 +- .../PageCompiler_vs110.vcxproj.filters | 6 +- .../PageCompiler_vs120.vcxproj.filters | 6 +- PageCompiler/PageCompiler_vs140.vcxproj | 2 +- .../PageCompiler_vs140.vcxproj.filters | 6 +- PageCompiler/PageCompiler_vs150.vcxproj | 2 +- .../PageCompiler_vs150.vcxproj.filters | 6 +- .../PageCompiler_x64_vs100.vcxproj.filters | 6 +- PageCompiler/PageCompiler_x64_vs110.vcxproj | 2 +- .../PageCompiler_x64_vs110.vcxproj.filters | 6 +- .../PageCompiler_x64_vs120.vcxproj.filters | 6 +- PageCompiler/PageCompiler_x64_vs140.vcxproj | 2 +- .../PageCompiler_x64_vs140.vcxproj.filters | 6 +- PageCompiler/PageCompiler_x64_vs150.vcxproj | 2 +- .../PageCompiler_x64_vs150.vcxproj.filters | 6 +- ProGen/ProGen_vs100.vcxproj.filters | 6 +- ProGen/ProGen_vs110.vcxproj | 2 +- ProGen/ProGen_vs110.vcxproj.filters | 6 +- ProGen/ProGen_vs120.vcxproj.filters | 6 +- ProGen/ProGen_vs140.vcxproj | 2 +- ProGen/ProGen_vs140.vcxproj.filters | 6 +- ProGen/ProGen_vs150.vcxproj | 2 +- ProGen/ProGen_vs150.vcxproj.filters | 6 +- ProGen/ProGen_x64_vs100.vcxproj.filters | 6 +- ProGen/ProGen_x64_vs110.vcxproj | 2 +- ProGen/ProGen_x64_vs110.vcxproj.filters | 6 +- ProGen/ProGen_x64_vs120.vcxproj.filters | 6 +- ProGen/ProGen_x64_vs140.vcxproj | 2 +- ProGen/ProGen_x64_vs140.vcxproj.filters | 6 +- ProGen/ProGen_x64_vs150.vcxproj | 2 +- ProGen/ProGen_x64_vs150.vcxproj.filters | 6 +- ProGen/progen.bat | 96 ++-- ProGen/progen.properties | 8 +- ProGen/rebuildall32.bat | 23 +- ProGen/rebuildall64.bat | 23 +- .../Win32/library/debug_static_md.template | 5 +- .../Win32/library/debug_static_mt.template | 3 +- .../vs100/Win32/library/project.properties | 8 +- .../Win32/library/release_static_md.template | 2 +- .../Win32/library/release_static_mt.template | 3 +- .../x64/library/debug_static_md.template | 5 +- .../x64/library/debug_static_mt.template | 3 +- .../vs100/x64/library/project.properties | 8 +- .../x64/library/release_static_md.template | 3 +- .../x64/library/release_static_mt.template | 3 +- .../Win32/library/debug_static_md.template | 4 +- .../Win32/library/debug_static_mt.template | 2 +- .../vs110/Win32/library/project.properties | 8 +- .../Win32/library/release_static_md.template | 2 +- .../Win32/library/release_static_mt.template | 2 +- .../WinCE/library/debug_static_md.template | 4 +- .../WinCE/library/debug_static_mt.template | 2 +- .../vs110/WinCE/library/project.properties | 8 +- .../WinCE/library/release_static_md.template | 2 +- .../WinCE/library/release_static_mt.template | 2 +- .../x64/library/debug_static_md.template | 4 +- .../x64/library/debug_static_mt.template | 2 +- .../vs110/x64/library/project.properties | 8 +- .../x64/library/release_static_md.template | 2 +- .../x64/library/release_static_mt.template | 2 +- .../Win32/library/debug_static_md.template | 4 +- .../Win32/library/debug_static_mt.template | 2 +- .../vs120/Win32/library/project.properties | 8 +- .../Win32/library/release_static_md.template | 2 +- .../Win32/library/release_static_mt.template | 2 +- .../WinCE/library/debug_static_md.template | 4 +- .../WinCE/library/debug_static_mt.template | 2 +- .../vs120/WinCE/library/project.properties | 8 +- .../WinCE/library/release_static_md.template | 2 +- .../WinCE/library/release_static_mt.template | 2 +- .../x64/library/debug_static_md.template | 4 +- .../x64/library/debug_static_mt.template | 2 +- .../vs120/x64/library/project.properties | 8 +- .../x64/library/release_static_md.template | 2 +- .../x64/library/release_static_mt.template | 2 +- .../Win32/library/debug_static_md.template | 4 +- .../Win32/library/debug_static_mt.template | 2 +- .../vs140/Win32/library/project.properties | 8 +- .../Win32/library/release_static_md.template | 2 +- .../Win32/library/release_static_mt.template | 2 +- .../x64/library/debug_static_md.template | 4 +- .../x64/library/debug_static_mt.template | 2 +- .../vs140/x64/library/project.properties | 8 +- .../x64/library/release_static_md.template | 2 +- .../x64/library/release_static_mt.template | 2 +- .../Win32/library/debug_static_md.template | 4 +- .../Win32/library/debug_static_mt.template | 2 +- .../vs150/Win32/library/project.properties | 8 +- .../Win32/library/release_static_md.template | 2 +- .../Win32/library/release_static_mt.template | 2 +- .../x64/library/debug_static_md.template | 4 +- .../x64/library/debug_static_mt.template | 2 +- .../vs150/x64/library/project.properties | 8 +- .../x64/library/release_static_md.template | 2 +- .../x64/library/release_static_mt.template | 2 +- .../Win32/executable/debug_shared.template | 87 ---- .../Win32/executable/debug_static_md.template | 87 ---- .../Win32/executable/debug_static_mt.template | 87 ---- .../vs90/Win32/executable/project.properties | 1 - .../vs90/Win32/executable/project.template | 26 -- .../Win32/executable/release_shared.template | 89 ---- .../executable/release_static_md.template | 89 ---- .../executable/release_static_mt.template | 89 ---- .../vs90/Win32/library/debug_shared.template | 88 ---- .../Win32/library/debug_static_md.template | 73 --- .../Win32/library/debug_static_mt.template | 73 --- .../vs90/Win32/library/project.properties | 1 - .../vs90/Win32/library/project.template | 26 -- .../Win32/library/release_shared.template | 91 ---- .../Win32/library/release_static_md.template | 74 --- .../Win32/library/release_static_mt.template | 74 --- .../vs90/Win32/plugin/debug_shared.template | 87 ---- .../vs90/Win32/plugin/project.properties | 1 - .../vs90/Win32/plugin/project.template | 26 -- .../vs90/Win32/plugin/release_shared.template | 90 ---- .../Win32/testsuite/debug_shared.template | 88 ---- .../Win32/testsuite/debug_static_md.template | 88 ---- .../Win32/testsuite/debug_static_mt.template | 89 ---- .../vs90/Win32/testsuite/project.properties | 1 - .../vs90/Win32/testsuite/project.template | 26 -- .../Win32/testsuite/release_shared.template | 90 ---- .../testsuite/release_static_md.template | 90 ---- .../testsuite/release_static_mt.template | 91 ---- .../WinCE/executable/debug_shared.template | 92 ---- .../WinCE/executable/debug_static_md.template | 92 ---- .../WinCE/executable/debug_static_mt.template | 92 ---- .../vs90/WinCE/executable/project.properties | 4 - .../vs90/WinCE/executable/project.template | 26 -- .../WinCE/executable/release_shared.template | 93 ---- .../executable/release_static_md.template | 96 ---- .../executable/release_static_mt.template | 96 ---- .../vs90/WinCE/library/debug_shared.template | 97 ---- .../WinCE/library/debug_static_md.template | 84 ---- .../WinCE/library/debug_static_mt.template | 84 ---- .../vs90/WinCE/library/project.properties | 4 - .../vs90/WinCE/library/project.template | 26 -- .../WinCE/library/release_shared.template | 98 ---- .../WinCE/library/release_static_md.template | 85 ---- .../WinCE/library/release_static_mt.template | 85 ---- .../vs90/WinCE/plugin/debug_shared.template | 95 ---- .../vs90/WinCE/plugin/project.properties | 4 - .../vs90/WinCE/plugin/project.template | 26 -- .../vs90/WinCE/plugin/release_shared.template | 96 ---- .../WinCE/testsuite/debug_shared.template | 92 ---- .../WinCE/testsuite/debug_static_md.template | 92 ---- .../WinCE/testsuite/debug_static_mt.template | 92 ---- .../vs90/WinCE/testsuite/project.properties | 5 - .../vs90/WinCE/testsuite/project.template | 26 -- .../WinCE/testsuite/release_shared.template | 93 ---- .../testsuite/release_static_md.template | 96 ---- .../testsuite/release_static_mt.template | 96 ---- .../vs90/x64/executable/debug_shared.template | 87 ---- .../x64/executable/debug_static_md.template | 87 ---- .../x64/executable/debug_static_mt.template | 87 ---- .../vs90/x64/executable/project.properties | 2 - .../vs90/x64/executable/project.template | 26 -- .../x64/executable/release_shared.template | 89 ---- .../x64/executable/release_static_md.template | 89 ---- .../x64/executable/release_static_mt.template | 89 ---- .../vs90/x64/library/debug_shared.template | 88 ---- .../vs90/x64/library/debug_static_md.template | 74 --- .../vs90/x64/library/debug_static_mt.template | 74 --- .../vs90/x64/library/project.properties | 2 - .../vs90/x64/library/project.template | 26 -- .../vs90/x64/library/release_shared.template | 92 ---- .../x64/library/release_static_md.template | 75 --- .../x64/library/release_static_mt.template | 75 --- .../vs90/x64/plugin/debug_shared.template | 87 ---- .../vs90/x64/plugin/project.properties | 2 - .../vs90/x64/plugin/project.template | 26 -- .../vs90/x64/plugin/release_shared.template | 91 ---- .../vs90/x64/testsuite/debug_shared.template | 88 ---- .../x64/testsuite/debug_static_md.template | 88 ---- .../x64/testsuite/debug_static_mt.template | 89 ---- .../vs90/x64/testsuite/project.properties | 2 - .../vs90/x64/testsuite/project.template | 26 -- .../x64/testsuite/release_shared.template | 90 ---- .../x64/testsuite/release_static_md.template | 90 ---- .../x64/testsuite/release_static_mt.template | 91 ---- Redis/Redis_vs100.vcxproj | 22 +- Redis/Redis_vs100.vcxproj.filters | 10 +- Redis/Redis_vs110.vcxproj | 20 +- Redis/Redis_vs110.vcxproj.filters | 10 +- Redis/Redis_vs120.vcxproj | 20 +- Redis/Redis_vs120.vcxproj.filters | 10 +- Redis/Redis_vs140.vcxproj | 20 +- Redis/Redis_vs140.vcxproj.filters | 10 +- Redis/Redis_vs150.vcxproj | 20 +- Redis/Redis_vs150.vcxproj.filters | 10 +- Redis/Redis_vs90.vcproj | 18 +- Redis/Redis_x64_vs100.vcxproj | 27 +- Redis/Redis_x64_vs100.vcxproj.filters | 10 +- Redis/Redis_x64_vs110.vcxproj | 24 +- Redis/Redis_x64_vs110.vcxproj.filters | 10 +- Redis/Redis_x64_vs120.vcxproj | 24 +- Redis/Redis_x64_vs120.vcxproj.filters | 10 +- Redis/Redis_x64_vs140.vcxproj | 24 +- Redis/Redis_x64_vs140.vcxproj.filters | 10 +- Redis/Redis_x64_vs150.vcxproj | 24 +- Redis/Redis_x64_vs150.vcxproj.filters | 10 +- Redis/Redis_x64_vs90.vcproj | 18 +- Redis/testsuite/TestSuite_vs100.vcxproj | 4 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_vs110.vcxproj | 4 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs120.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs140.vcxproj.filters | 4 +- .../testsuite/TestSuite_vs150.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs100.vcxproj | 4 +- .../TestSuite_x64_vs100.vcxproj.filters | 4 +- Redis/testsuite/TestSuite_x64_vs110.vcxproj | 4 +- .../TestSuite_x64_vs110.vcxproj.filters | 4 +- .../TestSuite_x64_vs120.vcxproj.filters | 4 +- .../TestSuite_x64_vs140.vcxproj.filters | 4 +- .../TestSuite_x64_vs150.vcxproj.filters | 4 +- SevenZip/SevenZip_CE_vs90.vcproj | 12 +- SevenZip/SevenZip_vs90.vcproj | 12 +- SevenZip/SevenZip_x64_vs90.vcproj | 12 +- Util/Util_CE_vs90.vcproj | 16 +- Util/Util_WEC2013_vs110.vcxproj | 8 +- Util/Util_WEC2013_vs110.vcxproj.filters | 36 +- Util/Util_WEC2013_vs120.vcxproj | 8 +- Util/Util_WEC2013_vs120.vcxproj.filters | 36 +- Util/Util_vs100.vcxproj | 21 +- Util/Util_vs100.vcxproj.filters | 36 +- Util/Util_vs110.vcxproj | 18 +- Util/Util_vs110.vcxproj.filters | 36 +- Util/Util_vs120.vcxproj | 18 +- Util/Util_vs120.vcxproj.filters | 36 +- Util/Util_vs140.vcxproj | 18 +- Util/Util_vs140.vcxproj.filters | 36 +- Util/Util_vs150.vcxproj | 18 +- Util/Util_vs150.vcxproj.filters | 36 +- Util/Util_vs90.vcproj | 16 +- Util/Util_x64_vs100.vcxproj | 26 +- Util/Util_x64_vs100.vcxproj.filters | 36 +- Util/Util_x64_vs110.vcxproj | 22 +- Util/Util_x64_vs110.vcxproj.filters | 36 +- Util/Util_x64_vs120.vcxproj | 22 +- Util/Util_x64_vs120.vcxproj.filters | 36 +- Util/Util_x64_vs140.vcxproj | 22 +- Util/Util_x64_vs140.vcxproj.filters | 36 +- Util/Util_x64_vs150.vcxproj | 22 +- Util/Util_x64_vs150.vcxproj.filters | 36 +- Util/Util_x64_vs90.vcproj | 16 +- Util/testsuite/TestSuite.progen | 3 + Util/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 40 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs100.vcxproj | 16 +- .../testsuite/TestSuite_vs100.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs110.vcxproj | 10 +- .../testsuite/TestSuite_vs110.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs120.vcxproj | 6 + .../testsuite/TestSuite_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs140.vcxproj | 6 + .../testsuite/TestSuite_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs150.vcxproj | 6 + .../testsuite/TestSuite_vs150.vcxproj.filters | 40 +- Util/testsuite/TestSuite_vs90.vcproj | 12 +- Util/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 40 +- Util/testsuite/TestSuite_x64_vs90.vcproj | 12 +- XML/XML_CE_vs90.vcproj | 16 +- XML/XML_WEC2013_vs110.vcxproj | 8 +- XML/XML_WEC2013_vs110.vcxproj.filters | 24 +- XML/XML_WEC2013_vs120.vcxproj | 8 +- XML/XML_WEC2013_vs120.vcxproj.filters | 24 +- XML/XML_vs100.vcxproj | 21 +- XML/XML_vs100.vcxproj.filters | 24 +- XML/XML_vs110.vcxproj | 18 +- XML/XML_vs110.vcxproj.filters | 24 +- XML/XML_vs120.vcxproj | 18 +- XML/XML_vs120.vcxproj.filters | 24 +- XML/XML_vs140.vcxproj | 18 +- XML/XML_vs140.vcxproj.filters | 24 +- XML/XML_vs150.vcxproj | 18 +- XML/XML_vs150.vcxproj.filters | 24 +- XML/XML_vs90.vcproj | 16 +- XML/XML_x64_vs100.vcxproj | 26 +- XML/XML_x64_vs100.vcxproj.filters | 24 +- XML/XML_x64_vs110.vcxproj | 22 +- XML/XML_x64_vs110.vcxproj.filters | 24 +- XML/XML_x64_vs120.vcxproj | 22 +- XML/XML_x64_vs120.vcxproj.filters | 24 +- XML/XML_x64_vs140.vcxproj | 22 +- XML/XML_x64_vs140.vcxproj.filters | 24 +- XML/XML_x64_vs150.vcxproj | 22 +- XML/XML_x64_vs150.vcxproj.filters | 24 +- XML/XML_x64_vs90.vcproj | 16 +- XML/testsuite/TestSuite.progen | 1 + XML/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 28 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs100.vcxproj | 16 +- XML/testsuite/TestSuite_vs100.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs110.vcxproj | 10 +- XML/testsuite/TestSuite_vs110.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs120.vcxproj | 6 + XML/testsuite/TestSuite_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs140.vcxproj | 6 + XML/testsuite/TestSuite_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs150.vcxproj | 6 + XML/testsuite/TestSuite_vs150.vcxproj.filters | 28 +- XML/testsuite/TestSuite_vs90.vcproj | 12 +- XML/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 28 +- XML/testsuite/TestSuite_x64_vs90.vcproj | 12 +- Zip/Zip_CE_vs90.vcproj | 12 +- Zip/Zip_WEC2013_vs110.vcxproj | 8 +- Zip/Zip_WEC2013_vs110.vcxproj.filters | 12 +- Zip/Zip_WEC2013_vs120.vcxproj | 8 +- Zip/Zip_WEC2013_vs120.vcxproj.filters | 12 +- Zip/Zip_vs100.vcxproj | 21 +- Zip/Zip_vs100.vcxproj.filters | 12 +- Zip/Zip_vs110.vcxproj | 18 +- Zip/Zip_vs110.vcxproj.filters | 12 +- Zip/Zip_vs120.vcxproj | 18 +- Zip/Zip_vs120.vcxproj.filters | 12 +- Zip/Zip_vs140.vcxproj | 18 +- Zip/Zip_vs140.vcxproj.filters | 12 +- Zip/Zip_vs150.vcxproj | 18 +- Zip/Zip_vs150.vcxproj.filters | 12 +- Zip/Zip_vs90.vcproj | 12 +- Zip/Zip_x64_vs100.vcxproj | 26 +- Zip/Zip_x64_vs100.vcxproj.filters | 12 +- Zip/Zip_x64_vs110.vcxproj | 22 +- Zip/Zip_x64_vs110.vcxproj.filters | 12 +- Zip/Zip_x64_vs120.vcxproj | 22 +- Zip/Zip_x64_vs120.vcxproj.filters | 12 +- Zip/Zip_x64_vs140.vcxproj | 22 +- Zip/Zip_x64_vs140.vcxproj.filters | 12 +- Zip/Zip_x64_vs150.vcxproj | 22 +- Zip/Zip_x64_vs150.vcxproj.filters | 12 +- Zip/Zip_x64_vs90.vcproj | 12 +- Zip/testsuite/TestSuite.progen | 2 + Zip/testsuite/TestSuite_CE_vs90.vcproj | 12 +- .../TestSuite_WEC2013_vs110.vcxproj.filters | 16 +- .../TestSuite_WEC2013_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs100.vcxproj | 16 +- Zip/testsuite/TestSuite_vs100.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs110.vcxproj | 10 +- Zip/testsuite/TestSuite_vs110.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs120.vcxproj | 6 + Zip/testsuite/TestSuite_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs140.vcxproj | 6 + Zip/testsuite/TestSuite_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs150.vcxproj | 6 + Zip/testsuite/TestSuite_vs150.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_vs90.vcproj | 12 +- Zip/testsuite/TestSuite_x64_vs100.vcxproj | 16 +- .../TestSuite_x64_vs100.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs110.vcxproj | 10 +- .../TestSuite_x64_vs110.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs120.vcxproj | 6 + .../TestSuite_x64_vs120.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs140.vcxproj | 6 + .../TestSuite_x64_vs140.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs150.vcxproj | 6 + .../TestSuite_x64_vs150.vcxproj.filters | 16 +- Zip/testsuite/TestSuite_x64_vs90.vcproj | 12 +- 1112 files changed, 11085 insertions(+), 15462 deletions(-) delete mode 100644 ProGen/templates/vs90/Win32/executable/debug_shared.template delete mode 100644 ProGen/templates/vs90/Win32/executable/debug_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/executable/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/Win32/executable/project.properties delete mode 100644 ProGen/templates/vs90/Win32/executable/project.template delete mode 100644 ProGen/templates/vs90/Win32/executable/release_shared.template delete mode 100644 ProGen/templates/vs90/Win32/executable/release_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/executable/release_static_mt.template delete mode 100644 ProGen/templates/vs90/Win32/library/debug_shared.template delete mode 100644 ProGen/templates/vs90/Win32/library/debug_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/library/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/Win32/library/project.properties delete mode 100644 ProGen/templates/vs90/Win32/library/project.template delete mode 100644 ProGen/templates/vs90/Win32/library/release_shared.template delete mode 100644 ProGen/templates/vs90/Win32/library/release_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/library/release_static_mt.template delete mode 100644 ProGen/templates/vs90/Win32/plugin/debug_shared.template delete mode 100644 ProGen/templates/vs90/Win32/plugin/project.properties delete mode 100644 ProGen/templates/vs90/Win32/plugin/project.template delete mode 100644 ProGen/templates/vs90/Win32/plugin/release_shared.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/debug_shared.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/debug_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/project.properties delete mode 100644 ProGen/templates/vs90/Win32/testsuite/project.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/release_shared.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/release_static_md.template delete mode 100644 ProGen/templates/vs90/Win32/testsuite/release_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/debug_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/debug_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/project.properties delete mode 100644 ProGen/templates/vs90/WinCE/executable/project.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/release_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/release_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/executable/release_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/library/debug_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/library/debug_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/library/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/library/project.properties delete mode 100644 ProGen/templates/vs90/WinCE/library/project.template delete mode 100644 ProGen/templates/vs90/WinCE/library/release_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/library/release_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/library/release_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/plugin/debug_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/plugin/project.properties delete mode 100644 ProGen/templates/vs90/WinCE/plugin/project.template delete mode 100644 ProGen/templates/vs90/WinCE/plugin/release_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/debug_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/project.properties delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/project.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/release_shared.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/release_static_md.template delete mode 100644 ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/executable/debug_shared.template delete mode 100644 ProGen/templates/vs90/x64/executable/debug_static_md.template delete mode 100644 ProGen/templates/vs90/x64/executable/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/executable/project.properties delete mode 100644 ProGen/templates/vs90/x64/executable/project.template delete mode 100644 ProGen/templates/vs90/x64/executable/release_shared.template delete mode 100644 ProGen/templates/vs90/x64/executable/release_static_md.template delete mode 100644 ProGen/templates/vs90/x64/executable/release_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/library/debug_shared.template delete mode 100644 ProGen/templates/vs90/x64/library/debug_static_md.template delete mode 100644 ProGen/templates/vs90/x64/library/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/library/project.properties delete mode 100644 ProGen/templates/vs90/x64/library/project.template delete mode 100644 ProGen/templates/vs90/x64/library/release_shared.template delete mode 100644 ProGen/templates/vs90/x64/library/release_static_md.template delete mode 100644 ProGen/templates/vs90/x64/library/release_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/plugin/debug_shared.template delete mode 100644 ProGen/templates/vs90/x64/plugin/project.properties delete mode 100644 ProGen/templates/vs90/x64/plugin/project.template delete mode 100644 ProGen/templates/vs90/x64/plugin/release_shared.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/debug_shared.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/debug_static_md.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/debug_static_mt.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/project.properties delete mode 100644 ProGen/templates/vs90/x64/testsuite/project.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/release_shared.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/release_static_md.template delete mode 100644 ProGen/templates/vs90/x64/testsuite/release_static_mt.template diff --git a/CppParser/CppParser_CE_vs90.vcproj b/CppParser/CppParser_CE_vs90.vcproj index 5d1fa5932..f7a0bd5f8 100644 --- a/CppParser/CppParser_CE_vs90.vcproj +++ b/CppParser/CppParser_CE_vs90.vcproj @@ -196,7 +196,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParsermtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCppParserMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -211,7 +211,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppParserMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppParserMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppParserMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppParserMD.lib"/> ..\lib\ obj\CppParser\$(Configuration)\ PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoCppParsermtd.lib + %(AdditionalDependencies) + ..\lib\PocoCppParserMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoCppParsermt.lib + %(AdditionalDependencies) + ..\lib\PocoCppParserMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoCppParsermdd.pdb + ..\lib\PocoCppParserMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoCppParsermdd.lib + %(AdditionalDependencies) + ..\lib\PocoCppParserMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoCppParsermd.lib + ..\lib\PocoCppParserMD.lib diff --git a/CppParser/CppParser_vs100.vcxproj.filters b/CppParser/CppParser_vs100.vcxproj.filters index f5e694da5..309c06c14 100644 --- a/CppParser/CppParser_vs100.vcxproj.filters +++ b/CppParser/CppParser_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {0eb97c38-4dbf-45af-9442-7b8278de256b} + {e9db8561-fe54-4f9c-8471-d0f38709c9d3} - {949bb527-b465-411b-aa5a-d1a013a0bc6b} + {5b4617eb-06c6-491f-ad73-70e4b6e26a47} - {b210495a-be06-4b02-bbd9-83b2bdb8bc2b} + {d7b3b50c-a788-4a83-8730-0150a7d40be5} - {a991fd89-4895-4187-bc24-b02f46db425f} + {7c7aef02-dd72-45de-85bd-0891afb2fe6c} - {a07dff1a-3cca-447f-b569-075990fbe249} + {aad8ff69-599d-41ac-967f-4c21ea7287b2} - {9e713466-c18a-4cee-8dbd-9fc88c9039aa} + {733b9a29-8a73-469f-8246-72a64de0fdc8} - {f549edba-353e-4ff7-8864-185c7cd62838} + {80e89104-e8fb-4ae1-b80a-da7645597f68} - {14935db5-dc75-4472-87a2-df05a258e3b7} + {7bab415b-348b-492c-9fd3-a0299e3b50ee} - {40a88f96-ed97-4650-8884-e6eea55757fa} + {0f0752ce-6782-4658-adad-6786b5a112a0} diff --git a/CppParser/CppParser_vs110.vcxproj b/CppParser/CppParser_vs110.vcxproj index 218694fd1..14799a657 100644 --- a/CppParser/CppParser_vs110.vcxproj +++ b/CppParser/CppParser_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppParsermtd.lib + ..\lib\PocoCppParserMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppParsermt.lib + ..\lib\PocoCppParserMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppParsermdd.pdb + ..\lib\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppParsermdd.lib + ..\lib\PocoCppParserMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppParsermd.lib + ..\lib\PocoCppParserMD.lib diff --git a/CppParser/CppParser_vs110.vcxproj.filters b/CppParser/CppParser_vs110.vcxproj.filters index a5ed25604..a8165de32 100644 --- a/CppParser/CppParser_vs110.vcxproj.filters +++ b/CppParser/CppParser_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {78a27494-64ed-47f9-a691-1bda07c9dd94} + {3e411f2b-5599-497b-a06c-18388e9a1a44} - {5db5a208-dd5a-41f8-b50e-7342cd4d70e1} + {7a1162eb-6e5f-4e84-bd15-d9c0662d3639} - {ae7e8b17-3d54-4fb8-a862-c423b5abfe63} + {e0c3bc59-a73f-43fd-b2d5-91c1a37932de} - {bb5e1fad-f6df-4f1e-9273-45d2e2f619cb} + {967cf829-5e0f-4bed-8882-eb90f527fabc} - {7ccf016f-c8e1-40aa-8779-6216cbf8e6e1} + {a947392b-4c50-4a44-abfd-1c491999c517} - {2924fcf1-e290-406c-b954-072fa33a45ac} + {f798e677-9e17-485c-b3ee-af72c663f085} - {ab97c710-df13-4ec3-aa5a-76eec940ad54} + {44e616a3-6c0e-423b-ad42-110b66b47ebf} - {16412b8e-83bd-4ea6-a15b-3a3400046c7a} + {a4793c73-35c9-4de2-9bc1-19e7e75ae01a} - {b35137ca-29f0-4409-ae85-ebd098dce99e} + {5cda45f3-ed34-4d76-8d42-78a1641c53e0} diff --git a/CppParser/CppParser_vs120.vcxproj b/CppParser/CppParser_vs120.vcxproj index 109da4a31..1565c1aca 100644 --- a/CppParser/CppParser_vs120.vcxproj +++ b/CppParser/CppParser_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppParsermtd.lib + ..\lib\PocoCppParserMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppParsermt.lib + ..\lib\PocoCppParserMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppParsermdd.pdb + ..\lib\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppParsermdd.lib + ..\lib\PocoCppParserMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppParsermd.lib + ..\lib\PocoCppParserMD.lib diff --git a/CppParser/CppParser_vs120.vcxproj.filters b/CppParser/CppParser_vs120.vcxproj.filters index dd33951b3..a4667938e 100644 --- a/CppParser/CppParser_vs120.vcxproj.filters +++ b/CppParser/CppParser_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {9b60e8e0-d465-4411-982c-bcaa524afdc3} + {c30d21f3-6e5d-489f-b5c1-248aaef0a33f} - {43bb19cc-e598-4965-9153-0cca28299b72} + {e6ea3d57-17c0-48fc-b5a7-b851835feca8} - {c8b11ad1-e653-4482-adf2-a3e218780c98} + {dabc95b9-f3de-457f-b097-39b5f1074d55} - {d74ed20e-3de5-4b9f-b2d6-adfff5f3b723} + {97ad2f6d-102d-47fb-aec1-0d45094f417f} - {203dd30f-0f27-4e23-97ff-5c3fdc243e7f} + {2489705d-2e0a-4f43-8638-35d57f9dde12} - {8ce7aac3-184b-4416-a08d-dd084e35b004} + {b6b05436-f262-4782-8beb-f119704e5772} - {41fa7ce8-411d-4095-a876-bfa85d49aa58} + {a325e88d-d91b-4869-8254-3ad3b9d681d9} - {03ad2a9f-e4da-4567-95e6-e0d41111c549} + {38a63d48-0c74-4cce-aac4-cac078e8ab40} - {156241b8-f780-43be-a5b5-ace7932fc9ac} + {228f7417-0e14-4860-8b28-413e1dad045e} diff --git a/CppParser/CppParser_vs140.vcxproj b/CppParser/CppParser_vs140.vcxproj index bd3a2d6bc..0bc1ec23b 100644 --- a/CppParser/CppParser_vs140.vcxproj +++ b/CppParser/CppParser_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppParsermtd.lib + ..\lib\PocoCppParserMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppParsermt.lib + ..\lib\PocoCppParserMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppParsermdd.pdb + ..\lib\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppParsermdd.lib + ..\lib\PocoCppParserMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppParsermd.lib + ..\lib\PocoCppParserMD.lib diff --git a/CppParser/CppParser_vs140.vcxproj.filters b/CppParser/CppParser_vs140.vcxproj.filters index 5c13b8725..59a0b87b1 100644 --- a/CppParser/CppParser_vs140.vcxproj.filters +++ b/CppParser/CppParser_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {9c1f2752-16b7-40e5-afa1-b73079f8fcd5} + {744224af-ba95-4e13-b72f-882bfe19a8a7} - {a46a53b6-ca33-4819-958a-b662fb7bb577} + {80ea9a99-2786-45f1-82ab-704b1a2973b0} - {cc7e10e3-33cb-4b78-83d1-e24c2960f537} + {3752753e-88f9-4973-8e17-37f480d8c0ca} - {8def99f7-23bd-4fa3-bf1b-b39187386f55} + {541927ca-63d6-4303-ad58-008d96ca5ea8} - {d554025a-a7d0-4413-b184-addcf68d6c05} + {a14c2e0d-34aa-4f4a-bc72-4b6a299a6de0} - {6e9bb1e7-4d83-454f-89e2-b5dec1ac74fc} + {46522e3e-79f0-47ae-8162-a81331adc456} - {b9887352-55d3-42e7-94c8-dcbf58092651} + {04f270cd-5515-46ec-a795-c8dce2691caf} - {43a1f1a5-c08e-4bff-b055-9b65c8b1f0fd} + {607d47ac-73b7-4967-b97c-f5de7f5ac809} - {ebe03907-717b-4270-b9cb-f150cc137032} + {13c12d14-3e64-4604-83b0-535dd88ccd00} diff --git a/CppParser/CppParser_vs150.vcxproj b/CppParser/CppParser_vs150.vcxproj index 55bec284b..96cbe67e2 100644 --- a/CppParser/CppParser_vs150.vcxproj +++ b/CppParser/CppParser_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoCppParserd - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppParsermtd.lib + ..\lib\PocoCppParserMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppParsermt.lib + ..\lib\PocoCppParserMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppParsermdd.pdb + ..\lib\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppParsermdd.lib + ..\lib\PocoCppParserMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppParsermd.lib + ..\lib\PocoCppParserMD.lib diff --git a/CppParser/CppParser_vs150.vcxproj.filters b/CppParser/CppParser_vs150.vcxproj.filters index 715c29af2..c32042656 100644 --- a/CppParser/CppParser_vs150.vcxproj.filters +++ b/CppParser/CppParser_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {78eacddc-f529-454b-acdb-b801bd3aedbd} + {bd817bc1-b938-4b25-a4bd-c4a26a4dbeda} - {d941d576-14f6-4843-a4c9-59a517d77cce} + {e8917ece-34a8-45cf-9357-a666ed0d66a0} - {339e073d-4572-4152-808e-b13e60cd406d} + {ad2825f5-f318-4425-b922-696d7e5d617c} - {2351d6b9-dea8-4605-818f-bad799794faa} + {bbc5f3c6-d8b5-4289-a9ad-142fba2e8d48} - {b1e9e71d-f8ac-4a75-b879-423d9e18aecc} + {97cd4b96-3fdd-463a-8c37-e9225b57b3d1} - {c28b6fe0-e217-440f-8d33-072fcac04f88} + {32db35e5-e8f6-485e-ab17-4251a3713ac6} - {ca54d561-99db-4061-b1bf-6995713f9e1e} + {79e468cb-7fd8-4b6e-ae06-70591f1eb857} - {ee137253-2409-48ca-971b-9170ffc38e05} + {89bc6bd1-e6f7-4320-a8f0-cb6f2164e890} - {5d50efde-7aa8-4c88-89c6-cc12e82af293} + {8634ec3b-09c0-4241-b033-8744386ddd20} diff --git a/CppParser/CppParser_vs90.vcproj b/CppParser/CppParser_vs90.vcproj index 44bd9baad..5c838495a 100644 --- a/CppParser/CppParser_vs90.vcproj +++ b/CppParser/CppParser_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoCppParserMTd.lib"/> + OutputFile="..\lib\PocoCppParserMT.lib"/> + OutputFile="..\lib\PocoCppParserMDd.lib"/> + OutputFile="..\lib\PocoCppParserMD.lib"/> ..\lib64\ obj64\CppParser\$(Configuration)\ PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser64 - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppParsermtd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppParserMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppParsermt.lib + %(AdditionalDependencies) + ..\lib64\PocoCppParserMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoCppParsermdd.pdb + ..\lib64\PocoCppParserMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppParsermdd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppParserMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppParsermd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppParserMD.lib + MachineX64 diff --git a/CppParser/CppParser_x64_vs100.vcxproj.filters b/CppParser/CppParser_x64_vs100.vcxproj.filters index 74f283a65..8eaca5504 100644 --- a/CppParser/CppParser_x64_vs100.vcxproj.filters +++ b/CppParser/CppParser_x64_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {a006d611-c65e-4b56-bca3-80868363d6a4} + {869d674d-68df-4337-90f0-b8989834a4c7} - {81fd3102-97fd-41f0-a379-c673c2c5e960} + {0845a4fc-3045-4ed0-9333-8b7b8d495556} - {6b5636fa-a89d-47b2-a7a0-1daf40db9f88} + {9e9d3c2e-e5c1-4df7-87e8-a7c20b8b54d1} - {588efe86-0fe0-4e32-a98c-16ece36e592e} + {d95c345c-e99b-4179-8aeb-d28a06c706dd} - {bfe38019-4410-44ad-9d4f-bece79bf39f6} + {e86ddce5-2874-4051-8acc-73dfe683170c} - {b6002fb0-f25a-4632-840a-1593d508b557} + {ff69552c-977c-4be8-b96c-8bdab1dc3f39} - {fac5a3e1-f114-4d29-b16c-0cca9f9e3abc} + {06f78127-fa4d-4b44-9c5c-233e6e9f5c6b} - {38c96733-8fd8-41ab-83a2-b92e73ad0c66} + {3cc41636-99fb-4824-893c-d52c33f02e76} - {c733d58f-d7d1-4810-8622-46f3b6c038f5} + {97d94cd3-6a06-4d5b-8a9c-8f0d5504dd4e} diff --git a/CppParser/CppParser_x64_vs110.vcxproj b/CppParser/CppParser_x64_vs110.vcxproj index d3f58a120..1f18b609c 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj +++ b/CppParser/CppParser_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser64 - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppParsermtd.lib + ..\lib64\PocoCppParserMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppParsermt.lib + ..\lib64\PocoCppParserMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppParsermdd.pdb + ..\lib64\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppParsermdd.lib + ..\lib64\PocoCppParserMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppParsermd.lib + ..\lib64\PocoCppParserMD.lib + MachineX64 diff --git a/CppParser/CppParser_x64_vs110.vcxproj.filters b/CppParser/CppParser_x64_vs110.vcxproj.filters index f60d52976..4e15ed783 100644 --- a/CppParser/CppParser_x64_vs110.vcxproj.filters +++ b/CppParser/CppParser_x64_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {b67970ae-88cb-42d3-9a29-86ddae5af3f9} + {99032cfe-bd54-4382-ab22-f327faaa17e0} - {81016236-b836-43f5-a1e3-91e2660d3458} + {7fcb4b8a-04e2-445e-b070-204a3264b390} - {23ea0ac5-a548-4a79-a226-d087c0e12b58} + {51a87067-3de6-4d03-b20a-24bfa8f8d385} - {753f0972-dd37-419e-811a-66f09e90624d} + {796f4535-a8cc-49e1-9faf-a9617f41a998} - {6581798a-bb6f-42b8-b742-5e698cccae22} + {b98c7146-f42c-4ee6-875a-d2d462b24f02} - {173b74f2-e786-424b-ba34-e1708d49c7da} + {8e2f61f5-b66f-4985-9096-d0d7af4cd5b9} - {c6e08665-af75-4f20-a81b-3a10ce8fc6ad} + {3fe06e47-3383-442f-9665-423aa840b393} - {9534bd03-3b81-4ca9-bb4d-5c11a9f2d2cc} + {4687af42-19f2-4957-85a8-b0fd34cdac4c} - {e2086eea-21f7-4b6f-b2e8-227847fd8fbd} + {4de97361-5484-48ca-bf6e-bf8097e8173a} diff --git a/CppParser/CppParser_x64_vs120.vcxproj b/CppParser/CppParser_x64_vs120.vcxproj index 80bfc609e..9086035fb 100644 --- a/CppParser/CppParser_x64_vs120.vcxproj +++ b/CppParser/CppParser_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser64 - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppParsermtd.lib + ..\lib64\PocoCppParserMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppParsermt.lib + ..\lib64\PocoCppParserMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppParsermdd.pdb + ..\lib64\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppParsermdd.lib + ..\lib64\PocoCppParserMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppParsermd.lib + ..\lib64\PocoCppParserMD.lib + MachineX64 diff --git a/CppParser/CppParser_x64_vs120.vcxproj.filters b/CppParser/CppParser_x64_vs120.vcxproj.filters index 20621defe..7140558d7 100644 --- a/CppParser/CppParser_x64_vs120.vcxproj.filters +++ b/CppParser/CppParser_x64_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {cf39614f-e54c-4665-8403-fd1c818700a9} + {12aabadb-667b-4634-8c88-f78d44003326} - {7fa40b2b-2660-4da8-b71c-4ed9d8b0c931} + {7188c321-f04b-4db8-989d-a177559360c2} - {88c21f24-b449-41af-8693-f571bb2b9f60} + {7abe2283-33d1-4789-920e-73aac8dda204} - {cf25fd71-a42c-4e5e-a5d0-82445b676db4} + {9723bb13-ec3f-4125-927b-3d90d107890e} - {a59d6ded-69aa-4e56-abbb-e9cdb4f96a20} + {9efe6f35-5824-4584-b21a-3fa70382375b} - {1733c477-4c54-4991-8282-074671acac72} + {0caca9e0-74db-4b03-a969-7ccbac5dbfec} - {a853a432-0de4-4de3-bdc3-f2649f0e9d07} + {2928d071-5053-4bf7-a4a1-8899c7321c0a} - {396ea917-131a-4ceb-a1c4-68c8ec24bf7e} + {dd1f52d6-0034-427a-9834-e7bb70d30c43} - {399c47eb-66b6-4bbf-9047-c0d111eff5ec} + {cee8424c-a032-4977-92b3-667b86d4f590} diff --git a/CppParser/CppParser_x64_vs140.vcxproj b/CppParser/CppParser_x64_vs140.vcxproj index e7dcfe2b4..bcb767cf4 100644 --- a/CppParser/CppParser_x64_vs140.vcxproj +++ b/CppParser/CppParser_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser64 - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppParsermtd.lib + ..\lib64\PocoCppParserMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppParsermt.lib + ..\lib64\PocoCppParserMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppParsermdd.pdb + ..\lib64\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppParsermdd.lib + ..\lib64\PocoCppParserMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppParsermd.lib + ..\lib64\PocoCppParserMD.lib + MachineX64 diff --git a/CppParser/CppParser_x64_vs140.vcxproj.filters b/CppParser/CppParser_x64_vs140.vcxproj.filters index bde64b4af..b4f00132f 100644 --- a/CppParser/CppParser_x64_vs140.vcxproj.filters +++ b/CppParser/CppParser_x64_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {ba7a771e-76c6-4f3f-b809-99a2bc4dd4c2} + {674841c3-01eb-46cf-a831-51e16fcf4647} - {d91ffdcb-400f-4a0c-aeb6-3586afeeb30e} + {38f3c8fa-623f-460e-8c17-f99bb5e5aec5} - {3130d802-06fc-437e-afe4-dd7827e70528} + {60f35884-8f9f-4385-9a92-12418ff24aab} - {5f8a6985-c457-418f-a3b4-47e6e0586b0e} + {3e4afad2-51f9-4195-b60f-5550ab43dc93} - {02bf932c-57a8-4321-8346-e0789f568488} + {166ba5f5-7261-4f7a-905b-0ac912eff1ad} - {cf20ad15-775d-4f0e-aef3-059cb8f2c192} + {69744f7c-05d6-4161-9555-2406dfe3f6b1} - {fc23fc43-f0c0-4671-89be-14fb737b18a3} + {84704d22-8cee-4382-a624-8c872be6f722} - {bf5c728e-c0e9-44e2-89ab-0321d5762469} + {57bc489d-17b2-4041-85ab-d3de6e87a9cd} - {df4401f3-4a2e-4aed-8dec-88b8ce75a488} + {85e3f4c8-cfea-4b09-b112-0700588e8220} diff --git a/CppParser/CppParser_x64_vs150.vcxproj b/CppParser/CppParser_x64_vs150.vcxproj index 4a298bf5d..e194d1650 100644 --- a/CppParser/CppParser_x64_vs150.vcxproj +++ b/CppParser/CppParser_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoCppParser64d - PocoCppParsermdd - PocoCppParsermtd + PocoCppParserMDd + PocoCppParserMTd PocoCppParser64 - PocoCppParsermd - PocoCppParsermt + PocoCppParserMD + PocoCppParserMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppParsermtd.lib + ..\lib64\PocoCppParserMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppParsermt.lib + ..\lib64\PocoCppParserMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppParsermdd.pdb + ..\lib64\PocoCppParserMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppParsermdd.lib + ..\lib64\PocoCppParserMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppParsermd.lib + ..\lib64\PocoCppParserMD.lib + MachineX64 diff --git a/CppParser/CppParser_x64_vs150.vcxproj.filters b/CppParser/CppParser_x64_vs150.vcxproj.filters index c4dcffc8c..1607b1bb1 100644 --- a/CppParser/CppParser_x64_vs150.vcxproj.filters +++ b/CppParser/CppParser_x64_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {78c28e04-25f8-4ab4-971b-92f2a32fa68f} + {b606ce17-75a8-44f3-8edb-98142c57885a} - {187fb0ba-6650-4656-b0b8-994801914bbb} + {61afe1d4-6305-4e47-b8d8-f2e4dcbe0fbb} - {712a514f-4d45-440a-b3dc-ec39a23fc967} + {ba9bc589-da0d-4844-bdc0-f37ca486eb72} - {40349073-db77-4396-98ad-4dfb275c62b9} + {3ac7fc5f-845f-419a-98d8-3bdd73734ef8} - {226ef096-8e48-4cab-be75-690cabfed8e6} + {7156c4dc-8d07-4e17-98a8-32bb16066b97} - {7a61c8d0-1001-420f-9623-dd6a153703d5} + {9abf52c6-8372-474b-8efb-2f2ddb74ff9e} - {f036e4c3-3f08-491a-b79a-03e1454cb2db} + {c372fd80-5d3d-4245-b71c-6f38c8c0b859} - {1cb4f22e-9342-4a0f-8275-235e2b8b82c5} + {ce1aa0e3-0a33-47e4-8296-7d63bb7bdfce} - {063b864d-f218-46b8-a270-127ab690d8d4} + {0b3cc089-4096-4d4b-804c-5cca415be49d} diff --git a/CppParser/CppParser_x64_vs90.vcproj b/CppParser/CppParser_x64_vs90.vcproj index 54a27bedc..4f3d7de49 100644 --- a/CppParser/CppParser_x64_vs90.vcproj +++ b/CppParser/CppParser_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoCppParsermdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoCppParserMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/CppParser/testsuite/TestSuite.progen b/CppParser/testsuite/TestSuite.progen index 4b8b72a4a..eed00e597 100644 --- a/CppParser/testsuite/TestSuite.progen +++ b/CppParser/testsuite/TestSuite.progen @@ -7,6 +7,4 @@ vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.linker.dependencies.Win32 = -vc.project.linker.dependencies.x64 = -vc.project.linker.dependencies.WinCE = +vc.project.linker.dependencies = iphlpapi.lib diff --git a/CppParser/testsuite/TestSuite_vs100.vcxproj b/CppParser/testsuite/TestSuite_vs100.vcxproj index fd1b7d801..d5bcdc1de 100644 --- a/CppParser/testsuite/TestSuite_vs100.vcxproj +++ b/CppParser/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters index 558ed4139..5e0bbd784 100644 --- a/CppParser/testsuite/TestSuite_vs100.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,37 +2,37 @@ - {12525684-4e3b-4f46-af7b-08935724f322} + {1782c871-e5b6-4fd8-9293-42091213331c} - {dfa870e9-8223-430a-b2da-fb6c18fbcf00} + {5cf3374f-b6e2-4700-8214-017b1892977c} - {49de42d9-0b63-45af-b123-01179fa05ba4} + {08e44046-5545-48a9-88f6-5f59d4ea002c} - {7bc41ad3-9d4f-45b1-a0db-a28f11ec9614} + {234d873d-b47e-4861-a4b7-5500041ba602} - {98afe064-74cb-49fe-aa8f-5862c7e39c16} + {cc871da5-9d62-4608-81ff-ced166953721} - {a4cc9f15-a263-4315-89eb-4791d94b2a3a} + {c349b66a-b788-44bb-948f-d68663e46305} - {626eac99-adb6-4912-aca7-f5b65054745d} + {ebb75f5a-5b7d-41d6-a725-d38dba7ed695} - {c0deff20-ecc8-438a-9991-582541a73a28} + {861fe710-1401-4378-84af-1431758204f6} - {c8f7a51d-3179-4c21-8983-56a300b9932c} + {5c6ad2a6-534f-4f28-a5ff-5a2e77518b0f} - {4a8249b4-3b5c-4e9e-9549-bb9b5c573aee} + {ab14b0ad-5dd7-4062-b076-fce1653806b2} - {7e063fe3-0f77-4ae6-b04e-697f4eecd9d2} + {462ad2f3-cd1e-48d6-9c69-ce3ab89b8d04} diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj b/CppParser/testsuite/TestSuite_vs110.vcxproj index d8663cd26..71ec70b86 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters index 211365a6d..c3299f155 100644 --- a/CppParser/testsuite/TestSuite_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,37 +2,37 @@ - {31204117-5493-45fd-9845-fa8c470d0047} + {0f03e69c-4e9f-4a80-bb52-bb0b2c6ba358} - {27658e81-5c18-4ec3-9fde-1ededdff34e1} + {b3cb89fb-225a-4b5d-b098-31759deef20c} - {d426c76a-c133-46f8-8275-158a652fb98a} + {7c9bfed9-26cc-45f2-88d6-8ebdadf73e35} - {f97caf6d-40c1-4e73-a817-090789cc90fe} + {f6354db9-0e8c-4fd1-b694-1c7840ebec34} - {3776a08e-ab13-46f8-bd94-d28eb38dd884} + {ad7ceb63-06fb-4f05-ad46-22205c0450c2} - {2736152c-29d7-4526-8cda-27d9cc9fec9f} + {c2739198-5971-4198-b6f9-4603533be677} - {13ae5a5b-0173-41d0-89f4-98081b39e300} + {7ce63a58-1ef0-4cbd-8f8b-c0aabdf7543a} - {3a75fcad-c9b6-4d68-80bb-3b586c883fe8} + {6d92de72-1cbf-48a4-af60-9df7cbdef43b} - {6cd323ee-f31e-494f-ba07-a5182d945e91} + {ebbfcdd9-0ec4-4f70-84bc-69e6617de716} - {90b38fb2-6b13-4462-b235-2c7a42958ee7} + {1c304e95-d4a9-4e55-9da9-ab11aa4752d9} - {dd73cc9d-f3cd-4508-87f5-6373c2abdde3} + {5ed749e5-5603-4885-ada8-39e91758c3eb} diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj b/CppParser/testsuite/TestSuite_vs120.vcxproj index 8d37db440..26733566a 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters index 382a2b6a9..9a734e00c 100644 --- a/CppParser/testsuite/TestSuite_vs120.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,37 +2,37 @@ - {fa030816-76c1-4cba-82ab-02de8a24ca2c} + {af615c04-0c8b-48dc-99db-6834e2dc7117} - {3a928e5e-8709-4272-aecf-28c74a91a766} + {4d25bdaf-0474-4e1f-83b8-d81065399c74} - {5f73425d-aebe-4616-8dfe-a0a891abab32} + {7f3b613c-dfef-420e-b6e2-7dc9c3b2be7d} - {5247bd7c-eee1-42ed-97be-2c9801ee8758} + {673d8d23-1f23-49da-ad65-f5930428d0d6} - {f818596a-5858-4d27-88e8-6295ce9f4a85} + {bac7cff8-985b-440b-a435-8b0c5f1ca521} - {57f15327-55c0-4d6a-8191-1cc6d15e6fcb} + {8269a955-5a82-4b1f-a37c-6278b89de8c9} - {532d9c91-5465-4740-abea-e4cd3c1de246} + {0b78c544-151d-494b-92d2-9dad432d6aac} - {b396d7eb-4389-44b0-a2ee-1853582e18cf} + {d76c5b10-346d-4216-a6c0-b69de3ae9076} - {572c427d-02de-42f6-9ab4-81f850667829} + {71a345de-02ef-4a36-aae7-275452f1894c} - {7821b69c-a7bb-47c2-82f3-7262e3e9ae8c} + {7dad95f7-1654-4d62-89f4-c6fc6a939c7c} - {3a5b95a6-7271-44c0-8cf6-34ebe0be04cc} + {e69c45c7-4a22-4941-9e1f-2bc8260c9bef} diff --git a/CppParser/testsuite/TestSuite_vs140.vcxproj b/CppParser/testsuite/TestSuite_vs140.vcxproj index c87d130c5..f419cef40 100644 --- a/CppParser/testsuite/TestSuite_vs140.vcxproj +++ b/CppParser/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs140.vcxproj.filters b/CppParser/testsuite/TestSuite_vs140.vcxproj.filters index 6dad707e1..94e87d55b 100644 --- a/CppParser/testsuite/TestSuite_vs140.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,37 +2,37 @@ - {cf45e2eb-4521-4be4-a5ec-b0e433cb577f} + {63c84ca3-8743-4329-96b0-4efcabbb6427} - {94e5bd07-914e-46c2-82df-ee5abccc7074} + {7c55d3a1-0f1d-4bc0-8679-f26999ebb6af} - {0bf7a40d-187a-47fa-b58e-4b5bdf73b527} + {8759c402-6fa4-4c50-b5f0-3713944ec316} - {479fe752-9ed2-4514-ac00-9cce1f5f3991} + {7363be96-1dba-40d5-9327-c7fd8ff8761a} - {7bf60f5c-57d4-42bc-aeb2-1e0c2aa8fee5} + {ca0ea26d-76b5-4f16-bcfd-f7be2eb7ac59} - {aa937c24-c553-415b-b78a-c9f32e9e8140} + {4aaf3d40-c139-43b8-b79e-925a5f247a56} - {1fa9e911-a7a0-45a0-809a-1a4bd8b789d6} + {3e2a47e8-33f8-4634-90f4-0f8a7bd7c42f} - {8b13c9b8-bcad-4100-8661-c5dc78a60ae6} + {b58c3048-6e6d-4d4d-801d-b9adacc2068e} - {f0673a6f-919d-42ef-80c9-3588daf07ee2} + {e9da6066-589f-46e9-9016-fb2182f2981e} - {afd810cd-5ccf-46a3-b6f8-7cd169d47796} + {7f56ee04-dff4-4566-b4b5-1f2ff1516ca7} - {18f749fd-c462-418b-a5ff-550e95026bd9} + {ce09733e-8ead-4f60-9d52-1c4622d26a23} diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj b/CppParser/testsuite/TestSuite_vs150.vcxproj index 3e6c6c25f..a91074c15 100644 --- a/CppParser/testsuite/TestSuite_vs150.vcxproj +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters index 18a0244e9..2a7bc993f 100644 --- a/CppParser/testsuite/TestSuite_vs150.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,37 +2,37 @@ - {bd9026ce-be93-4974-9d7e-9f94cfd91884} + {bb0003d9-221b-4fd2-b429-49544150cc19} - {a17b3dad-a785-488f-a79c-6d1d8e4befb6} + {8150dc67-9d1b-44a6-9b18-c63633f17fa4} - {a5052ae4-90e9-4b39-b9b7-b7d205533939} + {c73c9879-7ed8-4925-96c0-d3222ca4dd96} - {a390ba4f-12e5-49bb-8109-af6c77cf6ee4} + {c7497bda-44ff-4110-9415-e4407a586c87} - {ea9daa19-202f-4e72-815f-c0ea12fb8276} + {747b805f-f6c5-4718-824d-6395ec23be46} - {da6604d5-94b8-4087-99f6-2875533bc122} + {a735c143-9235-49d3-ac7b-040bf2783f6f} - {25a94f4f-e0d5-45ae-843c-067eefa64de3} + {9cd62d52-2126-4e91-ae7b-53e194c19fa3} - {3c67425f-f9d5-482f-b2f4-377d80114515} + {c0e6047d-71c4-42b6-96a2-6196c94eee20} - {cbae641e-67a9-4070-847d-7f643076375b} + {0a7aa098-d7e0-43d2-8685-d67da1933b20} - {68d29e25-6f90-487a-9cfa-56220e1ee925} + {1550e5b3-0ca3-4546-a6e5-36744e43e232} - {5a705ccd-a18e-4004-9588-303c83b0c0d9} + {9d3a481e-19a6-4a75-aa86-f9e2c4cee51a} diff --git a/CppParser/testsuite/TestSuite_vs90.vcproj b/CppParser/testsuite/TestSuite_vs90.vcproj index 6db8498fc..48630e2fc 100644 --- a/CppParser/testsuite/TestSuite_vs90.vcproj +++ b/CppParser/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters index a52d573a0..4fe11eae5 100644 --- a/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,37 +2,37 @@ - {317cef4e-52a4-45ba-b01d-21aa85dbf662} + {c27808e8-1892-4f46-8260-d0caf498e454} - {0dcd625b-d1ac-4b15-a7e4-6e22a4fc0728} + {904bb92b-5bc5-4188-a69c-6a8c9a1b4e5c} - {7c6dd3ed-e2ce-494e-8f5c-f50bbe52bf37} + {510eed1f-b00c-464f-b5c9-4102113d7883} - {a1007277-9c86-402d-a434-29f56c5de503} + {560df6fe-f34d-4ab6-a237-cd7c7afdf7c7} - {eec64439-a2bd-49a2-8d56-f006c9ee12ba} + {50748501-a19c-4845-8abf-fce2a0372139} - {1fc7cb63-9594-40df-a64f-fb76fc670438} + {1d981131-f5e9-45aa-b4f4-030cef0ec359} - {af131a8b-2543-49bd-9049-8aaedb8f056e} + {17845e29-6c17-47c1-96c0-1130b5847021} - {e33249e6-bcfa-4896-bcb4-62c321b78b4c} + {95f8db13-6247-4778-ba04-cc3fcd765d74} - {76e27865-a1a8-4038-8f0a-51ca00aca43a} + {17fbf9b7-42bb-4c0f-820f-3ed2688219ce} - {198d4414-402d-4dcd-8e66-8a78ce046001} + {e9f731e0-3511-49dc-afe6-c67f4743b7e2} - {c7ba0d9a-6b08-488a-a09a-c64b6d9b7e06} + {67b6a22c-f122-4765-a1c0-869e88644d71} diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj index ed8a29ef3..75a542e8f 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters index 88db7cac9..90b40f9ca 100644 --- a/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,37 +2,37 @@ - {ae20d8de-c0ba-4878-baf6-8046bcd1a984} + {36dab7f1-4f9e-4704-987d-02232d0f3587} - {ba1a9ffc-2327-4368-9af2-a73a5a93b111} + {9ab19acc-b7d3-44cb-8646-e753d2c72c73} - {47c73566-518b-4ae7-a566-e881267edc2b} + {df2746ef-d232-4433-8e8d-af1b4aa3ccee} - {283921fb-392d-4da8-82db-76589f379246} + {ad0bf026-58c2-4c74-a5d7-0216ce206345} - {edc3296b-0f2a-4871-ae40-c085cf0c4dc4} + {3618e0c8-e438-4430-aed4-2c1161965472} - {efe991f8-30f9-4029-9f7b-6056eca4d2cb} + {d4c7ce05-7514-4fd2-8f49-2470a963bdf3} - {6006fef9-c607-4d0d-9e9c-afda48861bea} + {de615dde-5020-4438-a6c5-d51d97bfb797} - {85af86e3-5ece-44bf-99c5-47bf8de34baf} + {360a3e44-1cc7-4c31-a29a-57667d0b58c5} - {1ce69f68-b503-4c4c-85fc-66693b1f1060} + {0225ed89-63f2-4089-b324-4a429486f76f} - {9687d5d6-4ce9-4914-ba47-c732b5f1989b} + {e0ea0985-1513-420a-b63e-72f3cd67da73} - {75274cc8-35e7-4530-b2e0-944f838196a8} + {a5bb8e0b-e41c-45d4-82a6-a6fd8ddc1de2} diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj index 2f0a4fa79..0ac392ecf 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters index bb48ed2ef..d1872a5d6 100644 --- a/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,37 +2,37 @@ - {d10dae84-f59f-4849-9969-4bef048d95b0} + {c3fbf3ec-29f1-4e6e-b87f-1ff263a8fe5e} - {1692ebb1-1648-4fb5-af36-aecec6ead337} + {68849bde-e630-4f44-bbb1-be9e80cc3593} - {ad5f7657-0408-4610-a9aa-8f3eb8a6117c} + {92aea1f2-8717-41ff-a1c8-c5484a006bc3} - {9aadd6f1-b1fa-4ca1-a23f-9511ab4049a7} + {e88479d6-87c3-4a3a-80db-39f3c2d2a0c8} - {8af6ade5-2c51-4a28-902a-a0b6ada9d60a} + {a7689e7a-7a04-4a44-aac6-1b9dc00f0cdf} - {674b1f23-d356-412c-9d3c-7f576f0c8094} + {aea03994-2aa7-4291-9ded-617c495dd321} - {9297bb9c-e75f-4334-b3d7-cd8dd0d5b2f3} + {7d1752be-10fc-445b-8686-868743949d1f} - {cd5a025d-8bc4-424f-9e5e-fcf9860ecf1f} + {9b5d3686-1669-4c30-aeb8-c66a265a9422} - {292bb15e-2afe-4a2b-b7e8-065daca05e78} + {cc12ed94-fd26-413d-b698-9ad447396620} - {ff59f28a-0e74-464b-a5ae-5bc1bbd09cd8} + {3304ab0e-d05a-4066-be23-775297cdacf1} - {b0c16590-2be9-4270-8c08-74d144dff493} + {7fdac0e8-9ea6-455b-b20a-6bc1654e3a70} diff --git a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj index 50c81648e..aaaee6218 100644 --- a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters index 4f9445fd3..22e0f620b 100644 --- a/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,37 +2,37 @@ - {ec486185-12dd-4cdc-a393-7e61032f8d7e} + {17824569-c1a8-4720-b96a-aea3f19b5212} - {4f7c8842-74b8-495f-aa31-b0b8ba576b37} + {21047e93-4f95-4ab1-81d3-81eecdb97a51} - {7552bb24-7f6a-407d-ac98-2cec0df4894f} + {03dacc3b-ecd6-413d-87de-a160dbdc9226} - {ede5dccf-6c1f-4f30-a938-49fcd1a492ac} + {ae13e7ba-5008-43ff-9d0c-c756b29bad96} - {0fb7fc50-4bd5-4cc9-ab46-fdc84b88080f} + {d20e920e-5a1e-4bb5-a9c5-c27b65e3a49a} - {a28a0f56-77bf-4eb5-af7d-bf8a5469c166} + {cd690ac9-c94d-4bec-bd6a-257b022a5f9e} - {403a9f20-ae3a-47ac-a73f-25545a343670} + {a9ae879a-7af2-43d7-b7bd-b903826be4e4} - {82bb008c-40b7-4f85-889f-66a00335d85a} + {7ec72b2f-ebe7-49e4-a796-3447fdf9ffff} - {dbb04a6e-3817-4b95-8da3-e1f448e2f57e} + {ca4e970b-de38-4381-a7f0-66907e93b881} - {41f605b8-a256-4d9b-875c-c3e473afecf6} + {699b4096-c416-44af-877a-14e0abe176fe} - {9e7c6fb7-847d-436e-9e29-3e408efdb6b5} + {96457c2c-8d15-4290-b59f-3f762f94904a} diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj index e129cc49f..54aeb42a8 100644 --- a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters index 7ea305d77..1a9638f34 100644 --- a/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,37 +2,37 @@ - {0f88bcde-5b08-45a4-8f5e-20c74793c04c} + {067aca2f-20c6-410e-bccc-29585188fbc2} - {95a00fea-8391-4808-8bbc-b8ebc7656950} + {9e6c244d-a76e-49b8-988a-095eb92a2198} - {fbcb37da-495e-49bc-a21d-b6988346feaa} + {cd2c8078-4e88-40af-9c8b-a2840d43ecac} - {ef0109d9-f0bb-493f-b6f8-bd12cd8c774f} + {78790d77-dc94-40f4-85c0-1a909d2cb388} - {baedb689-2f84-477f-901f-a72fc40aaa4c} + {4d393927-bfde-4868-a44b-34a374f822c4} - {62b91e00-bd26-4e4c-bebf-4ad5618089e2} + {361e6608-0cb4-4b4e-90c1-651ea2f09401} - {f16982c1-6832-4dc9-ba25-174b9b894f1c} + {c733ead4-072f-4779-b371-671b7a1f1b49} - {7bf3a84d-3848-4d6c-a07e-038efdec63ea} + {284cd35e-346a-4625-8661-06cc0928745b} - {a05fcc7a-6275-43f2-a25e-c7ef7bcb5b43} + {0a707802-f7b2-4911-9471-87567f1857a4} - {f4be8a8e-93a4-48e0-809a-73da57b44a20} + {2a0c7ccf-a158-410e-a149-417d6fb60a9d} - {0af612cc-a7b6-4df7-85c4-623cdc49d142} + {14123e95-49c9-44a9-a249-0a1f69b7b14f} diff --git a/CppParser/testsuite/TestSuite_x64_vs90.vcproj b/CppParser/testsuite/TestSuite_x64_vs90.vcproj index e981c0b5c..2623383ad 100644 --- a/CppParser/testsuite/TestSuite_x64_vs90.vcproj +++ b/CppParser/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCppUnitMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT diff --git a/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters b/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters index a722f51f3..51b6d3124 100644 --- a/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_WEC2013_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {5068bf7a-e3f9-4b5b-81a6-bf6c73715c19} + {08afbb4d-aed2-4396-b5a2-fa89e561035f} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {bdf568a1-2f3b-4ee0-ba60-f453c50a1977} + {5bbe914e-d4a9-4a61-9d15-dd4d7a5ec314} *.h diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj b/CppUnit/CppUnit_WEC2013_vs120.vcxproj index 4e4cb0040..a5d745a60 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj @@ -26,11 +26,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT diff --git a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters index 43a156fd8..f4be58582 100644 --- a/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_WEC2013_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {7ff65f52-aacb-41be-a14f-08e3abe42247} + {ec490e01-dc0a-4e7e-aa6c-6c8d3ffa9868} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {402d14bd-2120-42c2-bcdd-1f2e1d3e77cd} + {813d33b0-17fd-414c-be83-2de23d4d8c7b} *.h diff --git a/CppUnit/CppUnit_vs100.vcxproj b/CppUnit/CppUnit_vs100.vcxproj index 39d115b4f..4a4c9aa02 100644 --- a/CppUnit/CppUnit_vs100.vcxproj +++ b/CppUnit/CppUnit_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\CppUnit\$(Configuration)\ PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoCppUnitmtd.lib + %(AdditionalDependencies) + ..\lib\PocoCppUnitMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoCppUnitmt.lib + %(AdditionalDependencies) + ..\lib\PocoCppUnitMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoCppUnitmdd.lib + %(AdditionalDependencies) + ..\lib\PocoCppUnitMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoCppUnitmd.lib + ..\lib\PocoCppUnitMD.lib diff --git a/CppUnit/CppUnit_vs100.vcxproj.filters b/CppUnit/CppUnit_vs100.vcxproj.filters index 119b02977..b2aa49316 100644 --- a/CppUnit/CppUnit_vs100.vcxproj.filters +++ b/CppUnit/CppUnit_vs100.vcxproj.filters @@ -2,11 +2,11 @@ - {c1387c65-ac26-4385-bc07-a168aceff7dd} + {77b1dd2b-23d6-43d3-bd4d-dacc38f051f4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {e9bba7e5-dbf4-476e-9045-ec955d7fd638} + {c0e48999-5726-406a-a695-42b127573db0} *.h diff --git a/CppUnit/CppUnit_vs110.vcxproj b/CppUnit/CppUnit_vs110.vcxproj index 609135e4c..59aef23d9 100644 --- a/CppUnit/CppUnit_vs110.vcxproj +++ b/CppUnit/CppUnit_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppUnitmtd.lib + ..\lib\PocoCppUnitMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppUnitmt.lib + ..\lib\PocoCppUnitMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppUnitmdd.lib + ..\lib\PocoCppUnitMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppUnitmd.lib + ..\lib\PocoCppUnitMD.lib diff --git a/CppUnit/CppUnit_vs110.vcxproj.filters b/CppUnit/CppUnit_vs110.vcxproj.filters index f10f81f9a..6c4f8c835 100644 --- a/CppUnit/CppUnit_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {dc6bdd9f-52ec-4d7a-b5ac-3e937dc94b79} + {c131efed-ff99-4edf-970c-6168c03d21e7} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {01ac17bd-90ef-4154-a30a-968ae65c19fe} + {7867e234-8c4c-42b6-a1da-71be15b3314b} *.h diff --git a/CppUnit/CppUnit_vs120.vcxproj b/CppUnit/CppUnit_vs120.vcxproj index 8e58030f8..494788e46 100644 --- a/CppUnit/CppUnit_vs120.vcxproj +++ b/CppUnit/CppUnit_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppUnitmtd.lib + ..\lib\PocoCppUnitMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppUnitmt.lib + ..\lib\PocoCppUnitMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppUnitmdd.lib + ..\lib\PocoCppUnitMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppUnitmd.lib + ..\lib\PocoCppUnitMD.lib diff --git a/CppUnit/CppUnit_vs120.vcxproj.filters b/CppUnit/CppUnit_vs120.vcxproj.filters index a2d754c4c..1c18ab946 100644 --- a/CppUnit/CppUnit_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {9bedd994-f514-4478-a961-61d76b24983d} + {7de7449c-558b-4c8f-84df-22f3c123e5b4} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {4df2bafe-a87c-46c6-9b2b-fbedbb52a416} + {09162ecb-b60d-474a-a3fe-ff12ff95e381} *.h diff --git a/CppUnit/CppUnit_vs140.vcxproj b/CppUnit/CppUnit_vs140.vcxproj index ef3bad070..e378c29d6 100644 --- a/CppUnit/CppUnit_vs140.vcxproj +++ b/CppUnit/CppUnit_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppUnitmtd.lib + ..\lib\PocoCppUnitMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppUnitmt.lib + ..\lib\PocoCppUnitMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppUnitmdd.lib + ..\lib\PocoCppUnitMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppUnitmd.lib + ..\lib\PocoCppUnitMD.lib diff --git a/CppUnit/CppUnit_vs140.vcxproj.filters b/CppUnit/CppUnit_vs140.vcxproj.filters index ae1df4716..7a3be232c 100644 --- a/CppUnit/CppUnit_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {5e0763e0-80b2-4c07-99ca-adb783b8ef87} + {7346a666-f2f4-444f-9e22-2a39eeed86d1} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {4ca676c2-95bb-4610-87a7-559295f0c313} + {090d05e8-258d-413f-813e-1e701cddbbe5} *.h diff --git a/CppUnit/CppUnit_vs150.vcxproj b/CppUnit/CppUnit_vs150.vcxproj index fa1979939..e90adf642 100644 --- a/CppUnit/CppUnit_vs150.vcxproj +++ b/CppUnit/CppUnit_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoCppUnitd - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoCppUnitmtd.lib + ..\lib\PocoCppUnitMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoCppUnitmt.lib + ..\lib\PocoCppUnitMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoCppUnitmdd.pdb + ..\lib\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCppUnitmdd.lib + ..\lib\PocoCppUnitMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoCppUnitmd.lib + ..\lib\PocoCppUnitMD.lib diff --git a/CppUnit/CppUnit_vs150.vcxproj.filters b/CppUnit/CppUnit_vs150.vcxproj.filters index 4cf16f85d..44bab381c 100644 --- a/CppUnit/CppUnit_vs150.vcxproj.filters +++ b/CppUnit/CppUnit_vs150.vcxproj.filters @@ -2,11 +2,11 @@ - {ea13b8c9-03c8-4651-8d7b-f5ac04f481cf} + {158a00d5-a3e3-4bdf-acad-a12c3f1f49eb} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {3bb62e45-30ce-4ff7-ab69-684fe0460244} + {86da2e9d-0458-4d58-b1b9-b5a30830ef3a} *.h diff --git a/CppUnit/CppUnit_vs90.vcproj b/CppUnit/CppUnit_vs90.vcproj index 7bf73d222..3dc596733 100644 --- a/CppUnit/CppUnit_vs90.vcproj +++ b/CppUnit/CppUnit_vs90.vcproj @@ -1,35 +1,46 @@ + Keyword="Win32Proj" + TargetFrameworkVersion="0" + > + Name="Win32" + /> - + + + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + /> + Name="VCALinkTool" + /> + Name="VCManifestTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCAppVerifierTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCppUnitMTd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCppUnitMT.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCppUnitMDd.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> + CharacterSet="2" + > + Name="VCPreBuildEventTool" + /> + Name="VCCustomBuildTool" + /> + Name="VCXMLDataGeneratorTool" + /> + Name="VCWebServiceProxyGeneratorTool" + /> + Name="VCMIDLTool" + /> + /> + Name="VCManagedResourceCompilerTool" + /> + Name="VCResourceCompilerTool" + /> + Name="VCPreLinkEventTool" + /> + OutputFile="..\lib\PocoCppUnitMD.lib" + /> + Name="VCALinkTool" + /> + Name="VCXDCMakeTool" + /> + Name="VCBscMakeTool" + /> + Name="VCFxCopTool" + /> + Name="VCPostBuildEventTool" + /> - + + + Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat" + > + RelativePath=".\src\CppUnitException.cpp" + > + + RelativePath="src\TestCase.cpp" + > + + RelativePath="src\TestDecorator.cpp" + > + + RelativePath="src\TestFailure.cpp" + > + + RelativePath="src\TestResult.cpp" + > + + RelativePath=".\src\TestRunner.cpp" + > + + RelativePath="src\TestSuite.cpp" + > + + RelativePath="src\TextTestResult.cpp" + > + + Filter="*.h" + > + RelativePath=".\include\CppUnit\CppUnit.h" + > + + RelativePath=".\include\CppUnit\CppUnitException.h" + > + + RelativePath=".\include\CppUnit\estring.h" + > + + RelativePath=".\include\CppUnit\Guards.h" + > + + RelativePath=".\include\CppUnit\Orthodox.h" + > + + RelativePath=".\include\CppUnit\RepeatedTest.h" + > + + RelativePath=".\include\CppUnit\Test.h" + > + + RelativePath=".\include\CppUnit\TestCaller.h" + > + + RelativePath=".\include\CppUnit\TestCase.h" + > + + RelativePath=".\include\CppUnit\TestDecorator.h" + > + + RelativePath=".\include\CppUnit\TestFailure.h" + > + + RelativePath=".\include\CppUnit\TestResult.h" + > + + RelativePath=".\include\CppUnit\TestRunner.h" + > + + RelativePath=".\include\CppUnit\TestSetup.h" + > + + RelativePath=".\include\CppUnit\TestSuite.h" + > + + RelativePath=".\include\CppUnit\TextTestResult.h" + > + - + + diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj b/CppUnit/CppUnit_x64_vs100.vcxproj index 37e1b95e5..9406f5a42 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj +++ b/CppUnit/CppUnit_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib64\ obj64\CppUnit\$(Configuration)\ PocoCppUnit64d - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit64 - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppUnitmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppUnitMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppUnitmt.lib + %(AdditionalDependencies) + ..\lib64\PocoCppUnitMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppUnitmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppUnitMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoCppUnitmd.lib + %(AdditionalDependencies) + ..\lib64\PocoCppUnitMD.lib + MachineX64 diff --git a/CppUnit/CppUnit_x64_vs100.vcxproj.filters b/CppUnit/CppUnit_x64_vs100.vcxproj.filters index 2624fecd0..25d2bb1d1 100644 --- a/CppUnit/CppUnit_x64_vs100.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs100.vcxproj.filters @@ -2,11 +2,11 @@ - {b27f67de-af6f-4c4e-b126-877d373bc66b} + {e741377c-4d05-4576-a1ef-10445a3e501f} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {2dcafb5d-0650-44a9-aaee-b4b717d80180} + {11b1e717-1573-4092-9f67-63d6d9dacb1a} *.h diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj b/CppUnit/CppUnit_x64_vs110.vcxproj index bf8aacaac..589f6b229 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj +++ b/CppUnit/CppUnit_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCppUnit64d - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit64 - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\PocoCppUnitMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppUnitmt.lib + ..\lib64\PocoCppUnitMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\PocoCppUnitMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppUnitmd.lib + ..\lib64\PocoCppUnitMD.lib + MachineX64 diff --git a/CppUnit/CppUnit_x64_vs110.vcxproj.filters b/CppUnit/CppUnit_x64_vs110.vcxproj.filters index 4312f2f8d..fa6a67734 100644 --- a/CppUnit/CppUnit_x64_vs110.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs110.vcxproj.filters @@ -2,11 +2,11 @@ - {f848470e-6c13-4424-a4bd-64c8235ac88a} + {75fc7ff0-9a33-47e6-92b1-8be7059a5646} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {4edfde9d-f960-4343-9c8c-78334d60fab2} + {eb0853ab-e67f-404b-adf2-327a90a33506} *.h diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj b/CppUnit/CppUnit_x64_vs120.vcxproj index 2ddb88184..3d2837af1 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj +++ b/CppUnit/CppUnit_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoCppUnit64d - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit64 - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\PocoCppUnitMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppUnitmt.lib + ..\lib64\PocoCppUnitMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\PocoCppUnitMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppUnitmd.lib + ..\lib64\PocoCppUnitMD.lib + MachineX64 diff --git a/CppUnit/CppUnit_x64_vs120.vcxproj.filters b/CppUnit/CppUnit_x64_vs120.vcxproj.filters index 31a7be9f0..85887f28e 100644 --- a/CppUnit/CppUnit_x64_vs120.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs120.vcxproj.filters @@ -2,11 +2,11 @@ - {f05a4ed2-2720-4c63-b6e2-0e0fc1c9547b} + {e9dfc58a-9503-4e32-a448-285ef17b1b54} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {5c594ed2-ab6c-41b1-8def-b77591e54dfa} + {0995ca0c-cd55-43e4-b440-df648b0e689f} *.h diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj b/CppUnit/CppUnit_x64_vs140.vcxproj index 53499bad0..2e7f9e2e6 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj +++ b/CppUnit/CppUnit_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoCppUnit64d - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit64 - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\PocoCppUnitMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppUnitmt.lib + ..\lib64\PocoCppUnitMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\PocoCppUnitMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppUnitmd.lib + ..\lib64\PocoCppUnitMD.lib + MachineX64 diff --git a/CppUnit/CppUnit_x64_vs140.vcxproj.filters b/CppUnit/CppUnit_x64_vs140.vcxproj.filters index 0b544f612..473e83def 100644 --- a/CppUnit/CppUnit_x64_vs140.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs140.vcxproj.filters @@ -2,11 +2,11 @@ - {38b4f1a7-f6c4-456a-ba2b-669fcb2d8c1e} + {2541f91f-819e-43d0-9a34-9c342aab7cf9} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {44179780-6c7b-40ce-9087-348dcb717cad} + {bd494a04-d57a-45f7-9db1-743970cc7be1} *.h diff --git a/CppUnit/CppUnit_x64_vs150.vcxproj b/CppUnit/CppUnit_x64_vs150.vcxproj index 051c3d754..d8513b427 100644 --- a/CppUnit/CppUnit_x64_vs150.vcxproj +++ b/CppUnit/CppUnit_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoCppUnit64d - PocoCppUnitmdd - PocoCppUnitmtd + PocoCppUnitMDd + PocoCppUnitMTd PocoCppUnit64 - PocoCppUnitmd - PocoCppUnitmt + PocoCppUnitMD + PocoCppUnitMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoCppUnitmtd.lib + ..\lib64\PocoCppUnitMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoCppUnitmt.lib + ..\lib64\PocoCppUnitMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoCppUnitmdd.pdb + ..\lib64\PocoCppUnitMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCppUnitmdd.lib + ..\lib64\PocoCppUnitMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoCppUnitmd.lib + ..\lib64\PocoCppUnitMD.lib + MachineX64 diff --git a/CppUnit/CppUnit_x64_vs150.vcxproj.filters b/CppUnit/CppUnit_x64_vs150.vcxproj.filters index b671c5a45..da6a3a2a6 100644 --- a/CppUnit/CppUnit_x64_vs150.vcxproj.filters +++ b/CppUnit/CppUnit_x64_vs150.vcxproj.filters @@ -2,11 +2,11 @@ - {02e6adf3-c6ba-40fa-ab87-b1c0d2cf0710} + {27c95e03-1d9b-4e68-8eb3-e3dcd7751aea} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {970a5156-f1e4-4bb7-91b1-01a85cde02f3} + {4186157c-c891-4997-8c07-1db9c572793c} *.h diff --git a/CppUnit/CppUnit_x64_vs90.vcproj b/CppUnit/CppUnit_x64_vs90.vcproj index 3d280d06c..b5579bed2 100644 --- a/CppUnit/CppUnit_x64_vs90.vcproj +++ b/CppUnit/CppUnit_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoCppUnitmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoCppUnitMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Crypto/Crypto_CE_VS90.vcproj b/Crypto/Crypto_CE_VS90.vcproj index 97e897802..098222315 100644 --- a/Crypto/Crypto_CE_VS90.vcproj +++ b/Crypto/Crypto_CE_VS90.vcproj @@ -201,7 +201,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptomtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoCryptoMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -217,7 +217,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoCryptoMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCryptoMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCryptoMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoCryptoMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT diff --git a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters index 5c58d5a79..170cc31a1 100644 --- a/Crypto/Crypto_WEC2013_vs110.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {52bb1c07-0123-4d4b-a865-972edee36722} + {bd2595ba-dad3-4d2c-83b6-d4ca776dc006} - {31e969ac-36b0-418a-bd14-accd7e08ed11} + {90679fee-968a-4e5b-b9b8-c7cf1ce12eba} - {27741481-3aaf-4c1b-aabc-c1a2d32d7cf1} + {7308f9da-8f1f-4c23-a962-3d7ad12ee789} - {32596489-b14d-452c-a7eb-75e61e185a64} + {fea1f359-cceb-4ce1-b26d-98525e7b903a} - {c1481ba9-ef59-405a-a98f-886317fe5add} + {070ff7f5-97e8-4fdf-8fed-417d565a5eec} - {a0382ae9-023c-4255-9ddb-c68ef7d10b76} + {c03ae187-78bf-4f57-91d7-e6e455df1b3b} - {d5e3f158-b1df-4f77-8c1e-28f3de00a5ec} + {eb7f57af-d6ba-4a87-af1d-79c16af4a004} - {31d45802-cfba-41ea-b431-259ee2b2670c} + {01c5a56f-455c-4d7e-b57b-1f3a97cf14e3} - {59aec99a-3482-4837-8e27-5c54472b532e} + {cd426bb5-8034-4e52-896f-3878557107e5} - {bb2b0746-80fe-4ec8-9ae1-549ac7858c12} + {4360a4a8-0114-4f40-aab1-c50149bcb8a8} - {0183a41c-99b5-405b-95ed-34088095ed92} + {f8fc0ac0-b495-4953-b05c-63373fd0e5f6} - {04d9f7ea-b8cc-40a6-89e4-1e3ffbc042bb} + {2ad97b79-3fe7-4096-86cc-206c42965b89} - {4446f563-5337-4b3c-9c5c-1d0111a78726} + {835af9cc-0a52-4112-8400-4f23a42d9629} - {93b6e2fd-6373-4cea-a477-9a2221b055f8} + {67518be8-5575-4310-a8dc-2abe3ff90c02} - {ae040b15-9d99-4bde-9603-47888c692bf1} + {ceef7475-0614-47a7-b2d1-d1351f64958d} - {d3c021db-071f-47fd-aa29-6ecc60314d96} + {9cf01597-9ef5-466c-a65d-4e1d2c935c2c} - {f5df0fa6-8945-48f2-ad4b-b5d491c6926a} + {2a7a2512-1135-42f2-9a12-0270e2fde076} - {157f6fca-8ffe-4dbd-8e93-ea0edc418d7b} + {411086fb-01bc-429d-aad2-4a7dce8234c2} diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj b/Crypto/Crypto_WEC2013_vs120.vcxproj index 7b460737c..ebd061f71 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj @@ -6,24 +6,24 @@ - - - - - - - - - - - - + + + + + + + + + + + + Crypto @@ -39,13 +39,13 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT @@ -54,23 +54,23 @@ + - - - - - - - - - - - + + + + + + + + + + diff --git a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters index 1ec4ecdfa..880fcca27 100644 --- a/Crypto/Crypto_WEC2013_vs120.vcxproj.filters +++ b/Crypto/Crypto_WEC2013_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {e45ec053-cca3-4a79-8175-33f573c34cea} + {6669ffe8-45fa-471f-b372-26c35af9113a} - {1ee823f3-ec90-4f2b-b716-fd77409e31e6} + {5c50ef69-7554-4875-8383-e2deaa4a9d89} - {3cd5a7b7-18a2-4bb9-a142-4f9e1bb7974d} + {98791313-af05-49be-9b54-6c3755cf8af5} - {eaa74ab9-2fef-49bb-bbc0-445d2a535ba1} + {7b896f47-d630-4469-aaeb-d168b981d33b} - {6738ec6f-45d0-4601-9ee8-d6afb75b1b50} + {7e4e8388-f396-4630-acc6-535e2d80ca49} - {9a55b152-e285-465f-a49c-0ebcbf0fc259} + {c978a415-f72e-4dac-ad60-157fb89cadb3} - {62e7c920-2331-4bce-8577-5baaf4869ca4} + {ef269604-df1c-457a-bdeb-39eab19d0a3e} - {d0990178-9b62-432b-b1b0-52e00aad4eed} + {6cf10b0f-8ca0-4cf6-84ef-a7e068939344} - {5afde061-0635-4ee5-bb37-49373abb8047} + {775fa246-f00e-49ab-aac9-eb2ea19bb320} - {7dd2ac5e-077e-4d46-9ed6-9e027e249177} + {dba93d19-3c18-4692-9773-23a7afda9461} - {0e5bb8da-d3ad-466d-9401-ecbbfc368736} + {27a1bbce-16b1-4c77-9d9d-21e42b65ea2b} - {f0a0d9e9-a7a9-405b-9d5d-bc9e8dc20c88} + {ace36cc6-db13-4555-93e0-a17dbd7ee689} - {0fb3924f-abaf-4684-861a-2ac829f6a4eb} + {4f97a4ef-9c18-4815-9948-d6f0c3519390} - {662bd85d-7bc0-4b25-886a-5871a40c86a1} + {78eb4565-ff99-4dc4-b1ef-bb787625319d} - {be859ee4-5319-447d-be53-649a16f1efec} + {cf1b0935-5ba9-404b-bc45-a766af1f668e} - {ec747982-0297-414a-a843-306e09dbffd8} + {7a0150b0-5cf3-406b-b0d6-4e3d8a3e756c} - {b7ba2bdd-d975-48f6-9a3d-322d9d8ef6d2} + {cfe6c8b6-d883-42f3-9bd4-061d5718ffba} - {68842c89-396c-434f-b488-3843884e3c2d} + {a87a956c-8b72-4ef1-a6c7-6c3524b7ebe4} diff --git a/Crypto/Crypto_vs100.vcxproj b/Crypto/Crypto_vs100.vcxproj index 187353475..74bed4c42 100644 --- a/Crypto/Crypto_vs100.vcxproj +++ b/Crypto/Crypto_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Crypto\$(Configuration)\ PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT @@ -208,7 +208,8 @@ exit 0 %(AdditionalOptions) - ..\lib\PocoCryptomtd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoCryptoMTd.lib @@ -238,7 +239,8 @@ exit 0 %(AdditionalOptions) - ..\lib\PocoCryptomt.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoCryptoMT.lib @@ -261,7 +263,7 @@ exit 0 true true - ..\lib\PocoCryptomdd.pdb + ..\lib\PocoCryptoMDd.pdb Level3 ProgramDatabase Default @@ -269,7 +271,8 @@ exit 0 %(AdditionalOptions) - ..\lib\PocoCryptomdd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoCryptoMDd.lib @@ -302,7 +305,7 @@ exit 0 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib + ..\lib\PocoCryptoMD.lib diff --git a/Crypto/Crypto_vs100.vcxproj.filters b/Crypto/Crypto_vs100.vcxproj.filters index dceb93209..59e25293c 100644 --- a/Crypto/Crypto_vs100.vcxproj.filters +++ b/Crypto/Crypto_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {a977af9e-1bac-4b93-bf5c-c4ec4336c136} + {6dd81731-f0b6-41d2-aeac-b14efc941c32} - {fab3ca62-e839-4b6c-aa0f-c4b3f427598e} + {919476d3-1a26-4da5-b74b-926762c6f4d4} - {86cb5ae4-5b64-466e-9764-bcd6f8c94973} + {0dabc76b-f8fb-48c1-9cd2-3599f17fb6d6} - {f962d40a-4a1d-4fee-910e-a55e6fb07d04} + {903714b9-414e-44a7-a620-cb6b32ad7ed3} - {77a658e6-c5e9-43a8-a712-7711465d0e6e} + {5fc10cb2-e486-4e0e-9802-d34d3fa49880} - {92be13a7-e1cd-441a-af3f-2213de352df9} + {75819d8a-22fa-47ec-8500-4f09874293ef} - {2f013d91-b647-47c0-9b16-166f34d6e07e} + {59af2894-edf3-4b61-8849-8dc469beca58} - {1ab44f5d-3842-4534-bba5-e99c03ec8b31} + {3fec5ec6-4c78-4f6f-add5-045b0cd7691a} - {d7a265f0-8e93-48ca-9077-62e306cefa03} + {f01655c0-8778-44f8-b7a8-d0b487c1b6cc} - {97818cfb-3c5a-404e-b3cf-946ff4a42fc5} + {f4bef4ec-3ead-44ac-942e-aa3cc16a49ec} - {cbf07881-058d-430d-a131-b82bad353d6d} + {eaf229a5-ea4a-4557-bc36-641f3c50d395} - {8b6d93ad-d49c-4967-a3e8-904ff2ffcd5f} + {1aa37bcc-3a3a-4063-b530-5c3e0eaa9852} - {c4673106-d048-4fea-9f0a-3e5d9046f7b8} + {ae05cb0f-a978-41ce-b64a-500f74247bae} - {b84c5c96-499f-42b7-93c2-6aaccdd6b41d} + {da23243b-d6a7-407e-b314-ad316b6c8b74} - {d71d4744-074c-43d4-9285-98d5b8cc8f33} + {2a3dab90-0528-4749-816f-409dfe0a1d6a} - {a23bc548-a67b-4bbe-8d0d-a874fe85e556} + {0893fce9-adf8-4452-b55b-37c239798e45} - {18d042a9-4ff8-46a4-8c7f-78ec4a2aeaef} + {32d0126a-593a-42b7-b207-28a2a0bdc36a} - {98146d05-6b2b-4e70-a58d-5a3cb0612b0a} + {ad1aedcc-32d5-4091-b87e-b47c5729e53a} diff --git a/Crypto/Crypto_vs110.vcxproj b/Crypto/Crypto_vs110.vcxproj index 6fbda8ecc..92e3928bc 100644 --- a/Crypto/Crypto_vs110.vcxproj +++ b/Crypto/Crypto_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin\ @@ -218,7 +218,7 @@ exit 0 Default - ..\lib\PocoCryptomtd.lib + ..\lib\PocoCryptoMTd.lib @@ -246,7 +246,7 @@ exit 0 Default - ..\lib\PocoCryptomt.lib + ..\lib\PocoCryptoMT.lib @@ -269,13 +269,13 @@ exit 0 true true - ..\lib\PocoCryptomdd.pdb + ..\lib\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCryptomdd.lib + ..\lib\PocoCryptoMDd.lib @@ -306,7 +306,7 @@ exit 0 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib + ..\lib\PocoCryptoMD.lib diff --git a/Crypto/Crypto_vs110.vcxproj.filters b/Crypto/Crypto_vs110.vcxproj.filters index 1dfdddd1c..0441d8b81 100644 --- a/Crypto/Crypto_vs110.vcxproj.filters +++ b/Crypto/Crypto_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {0707f04b-926c-40e9-bb29-7c375b19f825} + {1f3b32fe-06b3-42f1-b862-2f7e93bb2008} - {cabd421d-fb63-4995-bfad-1431a4c74a10} + {c21e7b9d-6bec-4ff2-b11d-787062233953} - {69b0240e-fa49-4236-9ba1-9531cd8f4a90} + {a9732f8a-5898-451f-903e-12e990d1f818} - {0fd96c3b-6595-4969-8d49-397e0c7229f7} + {1c604635-a4fd-4e6b-b8d8-44e770d76bd5} - {e4235854-697b-4de0-8f88-f1b87b820cc4} + {bd6a84db-f15d-4019-a010-6da5aed7424a} - {663012ce-b771-4112-a74c-356594d52bce} + {399e3401-5d51-41af-af01-ef400ff552f5} - {c58ffd91-543d-4086-8cd9-3fe51da9c2f8} + {8fa9be54-03d8-4bd3-b455-f363698c1d38} - {b33cd251-ff70-43e4-b12d-a6d1966e4f6f} + {2cfecbac-4388-4460-9c3f-db096dcc6b32} - {9ec6eced-eab2-412b-8cbf-82235b8718f4} + {6ba56e2c-fb5e-4000-b8ee-e278559f3f7b} - {0570468f-f298-4bf4-a031-c10f06e52995} + {53f9adbc-ed7c-4e35-b070-18e0692e265f} - {fca6f3f2-7afb-433c-afc7-a20690ff50f9} + {5f79920e-1c5f-4ef4-a48c-80a8a144afd9} - {a818f0fd-24f9-4ba2-bea5-1edb0a6b6d4e} + {20693de3-adec-4500-8ee7-d9f508694bb1} - {7d9e0ed8-e804-4b3c-a810-06b8d4fe56ad} + {98132ebd-a31d-4afc-905d-2dcce210c785} - {8c538cf5-06e5-449f-977e-41ef5d52538a} + {6307bd54-0fa6-4243-ac82-272aa9031345} - {b599d6db-86a6-43af-a284-b53dda015875} + {4de69e4e-5058-499f-9982-a362d57efd80} - {5ddfc64c-cf0c-45d0-a6d4-1f56ad3a95b0} + {fb31ca1b-58d1-40cb-9b7a-c29c26db82a5} - {e49b21f4-33c9-457f-843f-ad0690264fb2} + {14778bdd-a8b8-428c-a3ef-a864e6552095} - {72fba5c6-c2da-4a64-b0d3-a0b43f44201c} + {346d4b58-03f7-483b-ad9a-8d0795e01c48} diff --git a/Crypto/Crypto_vs120.vcxproj b/Crypto/Crypto_vs120.vcxproj index 8e4c13962..7da555493 100644 --- a/Crypto/Crypto_vs120.vcxproj +++ b/Crypto/Crypto_vs120.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin\ @@ -218,7 +218,7 @@ exit 0 Default - ..\lib\PocoCryptomtd.lib + ..\lib\PocoCryptoMTd.lib @@ -246,7 +246,7 @@ exit 0 Default - ..\lib\PocoCryptomt.lib + ..\lib\PocoCryptoMT.lib @@ -269,13 +269,13 @@ exit 0 true true - ..\lib\PocoCryptomdd.pdb + ..\lib\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCryptomdd.lib + ..\lib\PocoCryptoMDd.lib @@ -306,7 +306,7 @@ exit 0 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib + ..\lib\PocoCryptoMD.lib @@ -315,24 +315,24 @@ exit 0 - - - - - - - - - - - - + + + + + + + + + + + + @@ -340,23 +340,23 @@ exit 0 + - - - - - - - - - - - + + + + + + + + + + diff --git a/Crypto/Crypto_vs120.vcxproj.filters b/Crypto/Crypto_vs120.vcxproj.filters index 72f90e840..832cc614e 100644 --- a/Crypto/Crypto_vs120.vcxproj.filters +++ b/Crypto/Crypto_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {3931bea2-66cf-4920-ba6a-326c7ae5b7e7} + {ea97621d-4d55-4af1-a8b3-de4c3c24b922} - {c3b1a20f-48a6-4667-9b2c-4c6e78c9a76f} + {c80d133e-1529-47ab-8aec-bae6440c9159} - {19d80d89-53e5-428c-b9a6-a89f46f67c0f} + {d011f077-99a8-419e-bb0a-e86a8f8509a7} - {732e1ee7-339f-4643-823a-03225c19c472} + {3b706b58-6a64-4257-b8f7-dbba732e8b9d} - {738ab6ed-4d25-45f3-affa-7923c359433f} + {e96cd875-c31c-4f5e-b0bb-93732108025b} - {03dfc2e9-6221-4649-854f-bfa5d462bc2d} + {24efcbc0-09d6-45c3-a4f5-4034a52bcbfc} - {255eaddd-972d-4bdb-9d0f-f9781db59297} + {e61c6d60-4ecd-49b5-896b-f2c38bfd65e9} - {c68fd959-ec4a-481a-b9b2-6eccfc1c1e95} + {379a477c-1469-4fc8-8427-5ca83eb016b9} - {0fa639ee-9bb6-408f-94e8-b115695f2a23} + {b3a871c9-32fb-4d5b-8098-3be4dc046a7c} - {ec85d216-0deb-4f38-aa5a-1e1d97661a3c} + {48a48e24-7716-4c27-be32-8e1ad5922e78} - {08e0bf2a-1628-4866-a2f2-0f3d77149ea1} + {a62e53c7-6368-46ae-af02-ceac6b8c8c2a} - {233c991b-6ad7-41e2-8ad3-f898849e072a} + {16de56d2-7784-416e-bf14-db2b9aadd328} - {e447b31c-8e8e-4410-873f-4d08ea3e6449} + {648717c1-0ea0-4041-be0b-fdc022ec6aca} - {000007ec-80f8-4fe3-aa46-eae6e4a60b82} + {0a08b2bf-9623-4b4f-9cac-9a9ed1f8fed9} - {1f3cb5dc-984e-46cb-9dd8-7fd5bc7b4287} + {1a3101d3-428b-4cfc-bacd-2c6c0df7a8eb} - {4d5180db-e285-4119-b5e5-92f9d43b783b} + {eaecf0f5-faf7-4d11-a3c7-d854fef0ffb0} - {ae16be50-c4f8-4339-895f-67d61a58a09b} + {3cdc69eb-1e7e-4b8b-b1c4-fe2212f877c9} - {1b001a04-c9c0-4163-bca9-e09d34b2ddd3} + {37899ba7-a729-41bf-9e79-faba6c9320b3} diff --git a/Crypto/Crypto_vs140.vcxproj b/Crypto/Crypto_vs140.vcxproj index 8374b5c73..2d30e3463 100644 --- a/Crypto/Crypto_vs140.vcxproj +++ b/Crypto/Crypto_vs140.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin\ @@ -218,7 +218,7 @@ exit 0 Default - ..\lib\PocoCryptomtd.lib + ..\lib\PocoCryptoMTd.lib @@ -246,7 +246,7 @@ exit 0 Default - ..\lib\PocoCryptomt.lib + ..\lib\PocoCryptoMT.lib @@ -269,13 +269,13 @@ exit 0 true true - ..\lib\PocoCryptomdd.pdb + ..\lib\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCryptomdd.lib + ..\lib\PocoCryptoMDd.lib @@ -306,7 +306,7 @@ exit 0 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib + ..\lib\PocoCryptoMD.lib diff --git a/Crypto/Crypto_vs140.vcxproj.filters b/Crypto/Crypto_vs140.vcxproj.filters index 5e5606334..d3509ae88 100644 --- a/Crypto/Crypto_vs140.vcxproj.filters +++ b/Crypto/Crypto_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {4c50e169-8ef3-4900-8b79-8c2ddc091f8b} + {65e19db7-0654-4832-8999-73681d3ff8c2} - {9617c1f6-6600-4294-a71a-5c8107f4c2c4} + {95794276-19a2-4c38-aebb-e3d1dd761517} - {ede4c7e4-b31e-4769-a096-568920cba6b8} + {440153a3-4aa9-492f-9fbe-d564a782d735} - {dd118673-399e-4283-94e7-595e3605c5a7} + {8aa982b1-701f-44e0-8104-3123bb08aecb} - {74978693-b0b2-4850-9393-f35f66377108} + {eae15f6a-7d08-4a07-b988-5857715c0c2a} - {6833a505-96c1-4b9b-b9d3-a6c189e28df8} + {4c75e24f-553e-4013-8150-c26161eec9dd} - {684a010f-7d52-4b12-8bd3-35f3867577a2} + {2e0a9f83-0066-41fe-9f7d-9cd3cd3a2158} - {c146560c-e0f9-46da-95d7-65006aafdf99} + {3755f2b8-8526-45d0-9817-9f8e367c6bbf} - {765044ed-6cab-4241-b791-f40226637a35} + {dbdee508-5537-4a03-8cc7-326fe61c6ddb} - {cf83236f-1e21-4657-bc3a-8ee015da5b03} + {5512ed02-1a29-4e1c-b6ad-0fd6709f7b8d} - {a4b2c506-4140-4f98-b606-35a94051583d} + {a4ce585a-31c0-498f-8439-48cdcb6514e0} - {b2bbe5c4-44ba-49d5-b086-5e723c9cc18b} + {e17103c3-ad90-481d-9856-fe29f4ecf16c} - {f502de52-76bc-4f7b-a36b-245c6821a0e4} + {cbbc4c35-acfd-4586-b3b2-e6462c2ad017} - {6774cd98-a457-43cd-8620-00f3195b6cd6} + {61d717d4-943c-4ef1-ae0d-f233d0d89c39} - {b02c4292-e944-4956-b2a8-540f8748d2b1} + {b79307df-4301-4f57-940f-3b0929fc21a7} - {cf5537c5-7e99-4755-8912-09b87ee6a8b9} + {15ab8d44-c058-46dc-abf5-5f1aaccfdf8b} - {79be748b-8c8b-47ab-99de-d9ca3a9eb031} + {ef276345-f447-4863-8a6f-737f83d7d0cd} - {684d4fb6-01da-4e98-9cc1-190543f13c0d} + {d90b8288-53fe-48dc-93fd-9af287e0f95a} diff --git a/Crypto/Crypto_vs150.vcxproj b/Crypto/Crypto_vs150.vcxproj index c8b190a40..90e98e61f 100644 --- a/Crypto/Crypto_vs150.vcxproj +++ b/Crypto/Crypto_vs150.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 PocoCryptod - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin\ @@ -218,7 +218,7 @@ exit 0 Default - ..\lib\PocoCryptomtd.lib + ..\lib\PocoCryptoMTd.lib @@ -246,7 +246,7 @@ exit 0 Default - ..\lib\PocoCryptomt.lib + ..\lib\PocoCryptoMT.lib @@ -269,13 +269,13 @@ exit 0 true true - ..\lib\PocoCryptomdd.pdb + ..\lib\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoCryptomdd.lib + ..\lib\PocoCryptoMDd.lib @@ -306,7 +306,7 @@ exit 0 ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoCryptomd.lib + ..\lib\PocoCryptoMD.lib diff --git a/Crypto/Crypto_vs150.vcxproj.filters b/Crypto/Crypto_vs150.vcxproj.filters index a073b1904..1d66af965 100644 --- a/Crypto/Crypto_vs150.vcxproj.filters +++ b/Crypto/Crypto_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {b44eee1f-a0b3-4f2d-b354-6ab4c3eee1b9} + {c8cc94f0-1673-44c2-a833-d364c75c2240} - {5fb33f31-2476-473d-a93c-ee375b6bf08d} + {deadfe1c-0120-4a46-ba94-e89ddf0fdb66} - {91357e40-0927-4032-8d4d-00fdbfd8d23a} + {1b9e1c3b-343b-44ef-8a55-876d58d05bc2} - {e11e384f-b3a1-4c55-9334-37937795bf21} + {51982601-f27a-403d-99f1-a5c36f53817a} - {6644a355-a77a-47af-af4a-b76c1c03881c} + {4f282496-3419-4563-a90f-d92e42217fd3} - {746c45ba-9012-4d77-b4d7-30949fc8225a} + {32f9f34d-c17b-46ae-83e9-cd2b49060c5f} - {ba65a143-78fa-4f78-ba76-78b894ae6c58} + {d12aba4d-4768-4fe2-9aa8-b0cf5d00cc06} - {7ebb18f3-24c5-4ece-bd29-49dbb49e6b02} + {4309ff89-037e-4f63-84b9-70350b1aa698} - {85fcc4c8-bf34-45a8-93c3-871e37c2e42c} + {39a59572-7f56-4a16-839c-d7ea5fabf060} - {63e0ce8d-5396-44b4-a77f-b17d6eeffc35} + {e5b1f82b-8580-468f-9f91-7cc42dc405bf} - {a152fd8d-b268-4df0-a4b7-9cf53f6f5d87} + {2d62b773-64a3-48e2-bbb1-605c932d9dc5} - {35810b4f-8256-4579-9697-8731ddf71b93} + {357eae3e-57f0-46f9-afef-119ae29bb1c1} - {485b4051-f20d-4c09-9879-deb4ab371c61} + {0efeef7f-564e-4079-8612-47000a2b9bdc} - {b65c7f07-16a4-4493-a337-4f30a1b22675} + {1669ec1e-276f-4564-a788-6b1b84475eea} - {191ad27b-d600-4de3-965d-488cf95737d9} + {42f92b16-a0a3-4691-8723-0cb7689a2417} - {b2c4b7b2-5aea-4fbd-8feb-a26a54b57f7f} + {7b4a9de5-5c00-48dd-b814-16505f906e17} - {33491ad2-a1dd-45df-92a5-130d10eab832} + {77def7ea-3db6-4d99-8535-e9bece23e868} - {a353a708-9f9e-4849-8989-14394eff38a1} + {46b86faa-e436-4b18-bae4-1536ac17e09f} diff --git a/Crypto/Crypto_x64_vs100.vcxproj b/Crypto/Crypto_x64_vs100.vcxproj index 265c7484e..811b2d288 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj +++ b/Crypto/Crypto_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib64\ obj64\Crypto\$(Configuration)\ PocoCrypto64d - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto64 - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT @@ -208,7 +208,9 @@ exit 0 %(AdditionalOptions) - ..\lib64\PocoCryptomtd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoCryptoMTd.lib + MachineX64 @@ -238,7 +240,9 @@ exit 0 %(AdditionalOptions) - ..\lib64\PocoCryptomt.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoCryptoMT.lib + MachineX64 @@ -261,7 +265,7 @@ exit 0 true true - ..\lib64\PocoCryptomdd.pdb + ..\lib64\PocoCryptoMDd.pdb Level3 ProgramDatabase Default @@ -269,7 +273,9 @@ exit 0 %(AdditionalOptions) - ..\lib64\PocoCryptomdd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoCryptoMDd.lib + MachineX64 @@ -300,7 +306,9 @@ exit 0 %(AdditionalOptions) - ..\lib64\PocoCryptomd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoCryptoMD.lib + MachineX64 diff --git a/Crypto/Crypto_x64_vs100.vcxproj.filters b/Crypto/Crypto_x64_vs100.vcxproj.filters index ec902102b..30a8cf8a2 100644 --- a/Crypto/Crypto_x64_vs100.vcxproj.filters +++ b/Crypto/Crypto_x64_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {8688bbed-e99f-4a47-8651-ee0d89090e99} + {72425694-8241-4b95-815b-ce622e03fb7e} - {d2df6231-23a1-42ae-ad27-7f24ffc5b2cb} + {8d402b7a-b24d-4d2c-ae6f-fb57e760b00c} - {9403b794-5192-41a9-bcc8-a2ebd2d1c3df} + {bc46d46e-b402-482c-99e4-86bed97f2161} - {67fdc986-b33f-47b5-8d21-eb77f9347c3a} + {9fce84dc-3de8-49e2-a364-5b15b8f3fd98} - {9443f4aa-9000-4e8f-a144-20c995f3c01b} + {a1e15714-6aab-4bc7-add1-0324baff4415} - {3292af88-e6cf-49dd-bc3b-a897ee34f8c5} + {92e3de94-89c8-4963-83f7-581e686e5dff} - {9b5fc6c7-710b-484a-8dee-0b2fcd2c2797} + {48abe959-ec9f-46bf-bc62-4764310474c0} - {ceaa56ae-49c8-45de-96d8-c23b0d2cf653} + {f0652cb5-2ac9-4b8a-b1d0-921ea5032746} - {56f57a2a-fbf8-433c-b3ac-837b89d17dca} + {e7c967de-92dd-47f9-bd51-794ba7a9b8b2} - {d06b995b-226c-4400-836a-81d994acd332} + {43054b0b-501d-458a-ac94-6617b6f0de09} - {3ee43923-139a-4e6d-b6fe-91dcf2c7551b} + {e8a86b45-7d3b-420e-9646-7bb27f2be564} - {79bfb876-270d-4915-84c2-cbecc29f8a0d} + {d4690d2b-5035-4356-ba4a-3b03d445607b} - {857507e1-433e-457f-bc0c-c6fa52572648} + {0748c5a4-5670-4ab2-9911-9c5ba43026f3} - {85b30b21-1fc5-4932-b12b-5dfd55f0c251} + {ca026041-e468-4b82-afc8-7fa0981a7561} - {9aa9fb56-961b-4b6f-8b50-73f2276cf7b5} + {3e92b852-ae95-4103-902f-c48322a75c1e} - {116bcfef-9c66-49b3-a2ea-678c22ba3343} + {965f8fe8-70ef-44c3-9449-17c799e75802} - {b366a9fe-1810-440c-b300-1625f14752ce} + {41b93e9a-8cb7-4e56-8262-9ecd90ea06c3} - {882956a6-bb2f-4837-82ad-bba7db405401} + {a0e04724-3885-4e3b-a512-052f6fc398a7} diff --git a/Crypto/Crypto_x64_vs110.vcxproj b/Crypto/Crypto_x64_vs110.vcxproj index 2863d38be..c61011ab1 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj +++ b/Crypto/Crypto_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoCrypto64d - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto64 - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin64\ @@ -218,7 +218,8 @@ exit 0 Default - ..\lib64\PocoCryptomtd.lib + ..\lib64\PocoCryptoMTd.lib + MachineX64 @@ -246,7 +247,8 @@ exit 0 Default - ..\lib64\PocoCryptomt.lib + ..\lib64\PocoCryptoMT.lib + MachineX64 @@ -269,13 +271,14 @@ exit 0 true true - ..\lib64\PocoCryptomdd.pdb + ..\lib64\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCryptomdd.lib + ..\lib64\PocoCryptoMDd.lib + MachineX64 @@ -304,7 +307,8 @@ exit 0 Default - ..\lib64\PocoCryptomd.lib + ..\lib64\PocoCryptoMD.lib + MachineX64 diff --git a/Crypto/Crypto_x64_vs110.vcxproj.filters b/Crypto/Crypto_x64_vs110.vcxproj.filters index ae53fc600..29c81480b 100644 --- a/Crypto/Crypto_x64_vs110.vcxproj.filters +++ b/Crypto/Crypto_x64_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {8d2d111a-fd95-43de-86b1-2000261b6bad} + {da67e757-041c-4fd9-b1c0-1527613effcc} - {8e879d09-e533-4e66-9290-7b01494e6cae} + {31239e13-50f3-4f51-b632-12a8c3c879ad} - {7671961c-225d-4423-bda5-b9a38c127b7d} + {5e973b8a-dc2b-4c3c-b613-3b1341f6d8db} - {8d7af12e-2b4a-43c1-80c9-dd4f6a30a1bf} + {14e87d55-5d47-427a-92c8-099da90452d6} - {45a9e031-bb57-46d0-a4b4-5c62cbda7cc3} + {1fd1dc4d-1e4d-41b5-8805-70fda5a208ed} - {dcb3058e-e1c6-423c-bf95-f0934adf9c49} + {149d3e7d-6c3e-4b11-9ab5-8234652836ed} - {b5f9c444-c598-44e4-9817-8cba24356129} + {25e05db3-444d-480e-9c54-e1b99d994c68} - {01898f93-b63b-4124-b631-a5d7d9b36b04} + {3c3a9926-00c2-4119-ac15-666bc4f93293} - {438a22cf-3d62-4d16-9319-6d2c54ec0517} + {10f61efc-922c-4354-a8b3-9db8bc8e9a1d} - {3938575a-924c-4fcc-9a3b-726b48a860ec} + {3d2b2a84-f9b9-40f6-a355-fda3d853c1b1} - {18e5fde3-28ca-4f1b-86e3-6590f293e652} + {ac4b8a94-34b0-4a3b-9617-f6ac5b364b7d} - {dbcbeefc-f9cc-4c1f-97f8-171ef463aac5} + {ad990d3c-25df-411c-a995-1ba5b2d92743} - {2a6be19a-6ab3-4cd3-9351-fcc7023a4722} + {8badb82f-c756-4326-8811-408e6c80e3d8} - {f76a0271-67d5-48ee-9c8c-c8734f230f5f} + {522f129b-4aca-4b3f-a3f6-7555c60d1594} - {f4cdfc97-b6f2-4d48-8e1a-d3cf745431e9} + {902ccf0d-39ef-4e07-8d13-b20420f52163} - {68ab2af1-4781-474f-bbbc-d082521a20de} + {be46b078-1079-432e-9e2a-aa8e8ecf9b7e} - {0f8679b3-02b5-461e-b4d1-7054f6416f85} + {3670191a-bf5e-44d7-a388-31946cbf276b} - {20b2e2be-14f4-4ae7-a9d7-6839f7b1d9ce} + {14881241-f3fc-46c1-8b14-2dad19545c82} diff --git a/Crypto/Crypto_x64_vs120.vcxproj b/Crypto/Crypto_x64_vs120.vcxproj index e28e871e0..6b9b759bc 100644 --- a/Crypto/Crypto_x64_vs120.vcxproj +++ b/Crypto/Crypto_x64_vs120.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 PocoCrypto64d - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto64 - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin64\ @@ -218,7 +218,8 @@ exit 0 Default - ..\lib64\PocoCryptomtd.lib + ..\lib64\PocoCryptoMTd.lib + MachineX64 @@ -246,7 +247,8 @@ exit 0 Default - ..\lib64\PocoCryptomt.lib + ..\lib64\PocoCryptoMT.lib + MachineX64 @@ -269,13 +271,14 @@ exit 0 true true - ..\lib64\PocoCryptomdd.pdb + ..\lib64\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCryptomdd.lib + ..\lib64\PocoCryptoMDd.lib + MachineX64 @@ -304,7 +307,8 @@ exit 0 Default - ..\lib64\PocoCryptomd.lib + ..\lib64\PocoCryptoMD.lib + MachineX64 @@ -313,24 +317,24 @@ exit 0 - - - - - - - - - - - - + + + + + + + + + + + + @@ -338,23 +342,23 @@ exit 0 + - - - - - - - - - - - + + + + + + + + + + diff --git a/Crypto/Crypto_x64_vs120.vcxproj.filters b/Crypto/Crypto_x64_vs120.vcxproj.filters index 89301deb0..699ff9963 100644 --- a/Crypto/Crypto_x64_vs120.vcxproj.filters +++ b/Crypto/Crypto_x64_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {5b64e6b9-e23c-4c4e-bb8f-37afd4fe4a3f} + {63b229d9-02d5-48fe-bef8-95a485a0d0a8} - {2dc6b067-c11b-4b4a-84fc-0765848859c1} + {968be2ca-ccad-4fa8-a22e-1aeffaf1ab71} - {6a937147-f5c8-4daa-bc65-e57489ee7f95} + {2c210294-07a1-4c3b-a3ba-ad16c2af05eb} - {f151bfc1-954c-46b1-8fcf-46ef09d57088} + {6d972a73-85d8-49ef-a8b8-acfd661dbd1f} - {0ba67096-4fe0-428e-8bfe-4af27b0ef79e} + {b3478c59-fa8a-413c-8b78-3b3819f61afb} - {6c053337-5542-4df0-bf46-e633e162ac4b} + {e9541509-2d70-4fce-a329-cb7b589a30c8} - {8fccac56-eb54-4b52-8c51-5e62b203defc} + {77557ce9-700d-4a5c-a255-df55fc30e1e9} - {9aec1e27-aaad-4eb4-8a03-68042c4bde92} + {6468beba-4cb5-4582-b408-f875653f4639} - {f31f22e8-3fbc-4d7b-91b0-9db2236b3de1} + {bd3b396b-e615-4ab2-9c92-293ab66c5500} - {9cd96c79-1e7b-4f5c-9467-a515a13cd81b} + {b1f0a0ec-3792-49d1-a17e-255b575b0b00} - {0ad89347-11c2-443e-93a8-9071f2f58722} + {088e7495-b4e6-40e4-948d-f1759ddef98c} - {7b877678-a1b8-43ff-8677-8baddde22ad0} + {b782e26f-c87d-409f-9e75-15d5be7ea075} - {95686c3e-c37d-4f88-95f1-1ba78ffe0d65} + {02726107-e25e-4f38-8ad7-f3cdbb5031d3} - {200f4da9-dd9a-4520-b079-e269a2404f98} + {63b084b9-9733-4a90-9aef-d42b6af9dba2} - {8ba56691-df39-494e-a539-3ace463bd049} + {53b0529e-28bc-490b-b89d-63f5e59c30f2} - {5b52921a-4ae8-4ec8-b8ad-d5cee82a81e4} + {040d866d-4e68-42d2-a0c9-607b6148e6d2} - {b9e8ad66-bc0d-421d-9ddf-baa579126663} + {906dc4c4-674b-4dc7-a735-4f45fe71b7b8} - {219aa11a-663e-4ff4-bbcd-360771ef004b} + {80d6b646-3e8e-4d8c-a255-633830a45225} diff --git a/Crypto/Crypto_x64_vs140.vcxproj b/Crypto/Crypto_x64_vs140.vcxproj index 9ba25a43b..1c5264af2 100644 --- a/Crypto/Crypto_x64_vs140.vcxproj +++ b/Crypto/Crypto_x64_vs140.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 PocoCrypto64d - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto64 - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin64\ @@ -218,7 +218,8 @@ exit 0 Default - ..\lib64\PocoCryptomtd.lib + ..\lib64\PocoCryptoMTd.lib + MachineX64 @@ -246,7 +247,8 @@ exit 0 Default - ..\lib64\PocoCryptomt.lib + ..\lib64\PocoCryptoMT.lib + MachineX64 @@ -269,13 +271,14 @@ exit 0 true true - ..\lib64\PocoCryptomdd.pdb + ..\lib64\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCryptomdd.lib + ..\lib64\PocoCryptoMDd.lib + MachineX64 @@ -304,7 +307,8 @@ exit 0 Default - ..\lib64\PocoCryptomd.lib + ..\lib64\PocoCryptoMD.lib + MachineX64 diff --git a/Crypto/Crypto_x64_vs140.vcxproj.filters b/Crypto/Crypto_x64_vs140.vcxproj.filters index 09571eb00..15aa51c7b 100644 --- a/Crypto/Crypto_x64_vs140.vcxproj.filters +++ b/Crypto/Crypto_x64_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {d3e3bb6e-7f17-4916-b72b-789139289a6c} + {83603bc1-ff58-4daf-a902-e3ec17428d7d} - {d9608685-6475-4c6e-824b-ba1f16e2e757} + {d36725e1-3ecd-4594-9bfc-7ad01320f214} - {163f4e2c-f145-44b7-afd0-805c43701cf6} + {87409edd-1749-42a6-9717-6d5ad0486654} - {e85669b0-79ff-45d6-801c-bc7c389ddb4f} + {7756f0b7-1722-4ce6-97c7-95971d7a9d85} - {499cd9e7-ec7f-4b29-9d68-d3f6e9bf4e1f} + {63883e28-1a2f-4291-aa02-8277c989e09e} - {2bf3cd12-ce7a-4426-86e3-058f981f1f53} + {28e0d023-86a0-4f38-b453-746d586be3e1} - {0df2f380-4822-4228-bb85-07bcc40cf596} + {4bd56276-22de-42a0-b0d3-429152e3df0c} - {e0c6d16c-b58f-449e-97e2-28d298fc65a6} + {64130826-a872-44c8-b63d-48e4eb0529e1} - {48322480-e1cd-4074-897d-26b54f0130ab} + {ba92b58a-7806-4db0-bc1f-0ef068c80ad1} - {bca4443c-a903-49c7-9b01-06a7de2b337c} + {cce0e0c4-862e-4f52-975f-469c044c6e4e} - {5ee3c328-f00a-42ff-a995-36012968b9ba} + {b8d5ba49-c041-40f8-8850-4e0669f87433} - {5ebf8c52-a956-4d63-abe9-a8e1bf1e34b0} + {f7760cb5-edb5-4cd4-8b42-ae14319e527f} - {def09540-2932-496e-890c-12c82efb8942} + {1f04f46b-0816-48b1-a234-ad07769aef28} - {363d9a54-9bba-48e2-9324-61ce6304ab52} + {6dd9e051-cbe4-4842-8540-a3e96a27771d} - {08be421c-277e-4686-827b-7a41ad332197} + {105e320e-51be-459e-9499-8da34fa9dc5b} - {59774c4e-9080-4ac9-9a9f-86c978e7459d} + {8d419576-bead-4557-9886-36986089bed8} - {4513247d-6b10-4505-8b68-61e33bd9be72} + {0d9c5c94-9d70-4fba-93af-e95a601ede14} - {e3bb9603-6fe1-4c16-b21c-36be7e43305e} + {75141eee-aeee-4206-9138-c44f66e0ccfb} diff --git a/Crypto/Crypto_x64_vs150.vcxproj b/Crypto/Crypto_x64_vs150.vcxproj index 58eb272d9..beb4aa4cd 100644 --- a/Crypto/Crypto_x64_vs150.vcxproj +++ b/Crypto/Crypto_x64_vs150.vcxproj @@ -85,13 +85,13 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 PocoCrypto64d - PocoCryptomdd - PocoCryptomtd + PocoCryptoMDd + PocoCryptoMTd PocoCrypto64 - PocoCryptomd - PocoCryptomt + PocoCryptoMD + PocoCryptoMT ..\bin64\ @@ -218,7 +218,8 @@ exit 0 Default - ..\lib64\PocoCryptomtd.lib + ..\lib64\PocoCryptoMTd.lib + MachineX64 @@ -246,7 +247,8 @@ exit 0 Default - ..\lib64\PocoCryptomt.lib + ..\lib64\PocoCryptoMT.lib + MachineX64 @@ -269,13 +271,14 @@ exit 0 true true - ..\lib64\PocoCryptomdd.pdb + ..\lib64\PocoCryptoMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoCryptomdd.lib + ..\lib64\PocoCryptoMDd.lib + MachineX64 @@ -304,7 +307,8 @@ exit 0 Default - ..\lib64\PocoCryptomd.lib + ..\lib64\PocoCryptoMD.lib + MachineX64 diff --git a/Crypto/Crypto_x64_vs150.vcxproj.filters b/Crypto/Crypto_x64_vs150.vcxproj.filters index 1add0b8c9..af2806f17 100644 --- a/Crypto/Crypto_x64_vs150.vcxproj.filters +++ b/Crypto/Crypto_x64_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {feb66efb-0308-45ad-b103-646a848a7194} + {3e138295-3791-4c6d-b4ea-15221f814553} - {dfa8c684-98e3-44c6-8e7d-b5b64fb4c63d} + {c492164d-abb7-411b-a2e0-5de3e3ce7e33} - {f0376b48-442e-4aa8-b2ea-1643211a3a54} + {357cee67-df11-4f26-a969-3d0ecab85b8a} - {2b0e007e-0056-4709-b2b7-6d8ed4471344} + {7246294d-682e-44c7-a4b6-1327c91a67c2} - {17a9f69b-a3a8-48c3-b88f-0306585468d0} + {f884d6e0-c7b1-4978-96ad-5ad8e999e6fa} - {4d88fec1-35e4-4573-89b2-33587e529720} + {af6b5188-a099-47e6-b30b-0113957bc070} - {fed835ed-e760-4223-962e-191b98b57e90} + {a419ac5e-b541-41cb-8fe3-43e9cbf2aca3} - {dbbd61d4-cf37-43e8-a0ad-e7999c5a3d70} + {0d2c5f61-f0dc-48d0-9a21-fa1255ee073e} - {dc70a372-7916-4c69-a0c7-1bf609dabbe0} + {9519f917-f5a9-480f-91a6-60f0731ba749} - {d4dd7ead-0209-47f2-a9e3-d3bfb8211a1e} + {02fed1b7-2f13-4bea-ba04-7e4947930e1a} - {a09369f7-9eec-41da-b582-108347f2029f} + {f883a5e2-6e06-40f0-bd95-df39c341b5a4} - {b756ced0-b2ac-472f-bff6-31d7abef69e4} + {2c8cfb51-646c-45e9-a621-67e2a9bc0957} - {8987f04f-8f65-43fd-b4f3-049e8ee34f0e} + {061dad20-c929-4b68-a6ff-a6c0e090004c} - {00e2008a-4dad-46bc-83c5-caf67879825b} + {c5403311-ae38-4e03-93bc-44979c01db4b} - {eeb3c1de-3b29-48d3-a262-b62e19b35863} + {f89a9097-d2ec-4f1b-8e72-3e8ab8508e23} - {e3371425-03d9-4c64-ac23-ccbeafae4285} + {d79bf42e-2805-44b2-a717-669c3b219382} - {8beef14d-9dc2-41bf-b30e-0c01f316bf77} + {6420d848-620a-4c7e-92e5-680e61e8fad5} - {232b8ef0-340f-48c9-a4ef-668962c6bc53} + {00357a4f-3660-4444-b160-0e6fc8da0c13} diff --git a/Crypto/Crypto_x64_vs90.vcproj b/Crypto/Crypto_x64_vs90.vcproj index 1dac108b6..79d2cfbca 100644 --- a/Crypto/Crypto_x64_vs90.vcproj +++ b/Crypto/Crypto_x64_vs90.vcproj @@ -189,7 +189,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoCryptomtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoCryptoMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -204,7 +204,7 @@ Name="VCPreLinkEventTool"/> @@ -264,7 +264,7 @@ Name="VCPreLinkEventTool"/> @@ -308,7 +308,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoCryptomdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoCryptoMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -323,7 +323,7 @@ Name="VCPreLinkEventTool"/> @@ -383,7 +383,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj index 873cd76e9..42e7f1f68 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj @@ -40,7 +40,7 @@ - + diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index b74abf8fb..5b6839249 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {5063e892-1d23-4169-8df3-ee5ccf6e76db} + {6d74d783-b9bc-4826-b086-c2ec269f8326} - {7860b730-fe11-480c-ab8d-0b1c72520545} + {602e403b-5ad8-40a7-8b6c-7c4f2a0bebf1} - {947b29e8-6db9-482a-aa69-db33bc534920} + {149dc01d-6c79-44ac-b24d-4ece8d025cac} - {2c99c0de-37bd-41c3-8d4b-6192593b991a} + {e6528ba6-9650-4a4e-9551-2822e4999c3d} - {3ffb092d-28e3-4d4e-8fcf-5f35f59822f1} + {57cfb396-48f7-45bb-868e-a72043e64e51} - {3f1e5d22-8d4a-43da-8632-2c8bc96b9965} + {83af03c5-a80c-4d2a-a691-da68477e43ea} - {f4cf1914-90ad-44ac-ae5a-7024567b524b} + {15a96060-d260-47db-926e-52a6440ec831} - {af3536ab-0d20-46b4-a709-3940754bc53b} + {6955de84-b3d1-4382-857d-0ab413eb8d50} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj index 2f08e72db..f9f6d8ee1 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj @@ -2,12 +2,12 @@ + - TestSuite @@ -23,7 +23,7 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 TestSuited TestSuited TestSuited @@ -34,13 +34,13 @@ + + - - diff --git a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index bd77b84ac..b536bbbc6 100644 --- a/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {4fac2833-ad7e-45de-8345-05776e4b17b5} + {964dde1a-718f-447e-94c8-9ff236824af7} - {193e4dce-1213-4e5b-8b94-1916aab2214a} + {8537dc80-53a3-42e9-9e2b-23e4800df9fc} - {38a8125e-3f73-43e3-88ae-e99185708f20} + {f3b530c4-d510-4d8b-b73f-173137a08c59} - {61d828eb-b205-4cfd-bb7a-3761e664bc50} + {7f52cd95-1101-427b-82d1-8779a219e607} - {a68d1e9f-f7f7-4729-a4c7-9979f7dbc736} + {625dc8b4-5fca-49c5-9ffd-6b2896d3ced8} - {91091d02-d2a9-48ac-9eb8-54b529be04c4} + {02730b47-831e-436f-ab0e-3c0977335bab} - {67ea7ed6-f9d2-4335-9559-b89d8eaf4d8d} + {59505ed3-b93b-49b9-8a10-2324db3b461c} - {dd16d34e-f265-4233-92c0-13675222762a} + {4aaf64de-c951-4fb2-ba1b-70d3304a594d} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj b/Crypto/testsuite/TestSuite_vs100.vcxproj index 6db1279ba..89c3d1d19 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj @@ -1,4 +1,4 @@ - + @@ -32,58 +32,58 @@ TestSuite Win32Proj - + Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte - - + + - + - + - + - + - + - + - + <_ProjectFileVersion>10.0.40219.1 bin\ @@ -124,7 +124,7 @@ true true true - + Level3 ProgramDatabase Default @@ -158,9 +158,9 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) %(AdditionalOptions) @@ -190,7 +190,7 @@ true true true - + Level3 ProgramDatabase Default @@ -198,10 +198,10 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -225,18 +225,18 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) %(AdditionalOptions) - iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -258,7 +258,7 @@ true true true - + Level3 ProgramDatabase Default @@ -266,7 +266,7 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -292,15 +292,15 @@ true true true - + Level3 - + Default %(DisableSpecificWarnings) %(AdditionalOptions) - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -312,24 +312,24 @@ - - - - - - - + + + + + + + - - - - - - - - + + + + + + + + - - - \ No newline at end of file + + + diff --git a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters index bda2486a0..5525abbb3 100644 --- a/Crypto/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {be7f9f0d-0401-4469-947b-3b20876c35a3} + {a63c59e0-5c5a-4329-934e-dc0ee0133954} - {74dc9297-b8a4-47d8-aee0-2d4d064bc81d} + {2b3a0c76-a667-4e1d-bd2a-1df026a23d99} - {0fccd382-d1bf-498b-8f19-6e03253ba672} + {a3c44de8-b9f7-484e-b4b6-25c4848406e4} - {874061e9-40d1-4254-a1e8-d09efb2edf41} + {a961e8e9-77be-4281-9d72-c66c6f8bfe39} - {7b30c2c2-0dee-41c7-b4cc-1a5397ff669b} + {5c147328-2367-43db-9f12-175352a36f0c} - {fd2f4e3e-c1df-474b-ad5c-c38084c7413e} + {7d1a219d-97d4-4d45-b133-c72700f80eba} - {104dd86b-1515-4fd2-9ea0-02bd3db73c2a} + {d3487e8c-b6c5-433c-afb8-f138ea278611} - {3b7aa9ee-7bb2-481c-b00b-c5bb429a2140} + {8c501d3c-e4a8-4b2f-97bf-bec883460b81} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj b/Crypto/testsuite/TestSuite_vs110.vcxproj index 46a30eb85..5b9d69347 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -208,10 +208,10 @@ Default - iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters index 4ad1ac9c6..faa2040c1 100644 --- a/Crypto/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {e873f8f7-b691-4125-9bee-9e1b4b7b0759} + {68faf99b-31f4-48cf-a259-4b35f2442e4b} - {29541721-2f6b-4ed7-94f8-23552b583e8b} + {fa4aec6d-480c-4ba6-a151-8a805ee3574f} - {76ed44d2-1aa6-470d-8b99-fb698084c8b7} + {ecd157d1-0d01-4930-a0fd-fbed9a64c1c4} - {a75f5843-715e-498e-a4c2-b52e5dec3c21} + {32b1dc64-8f24-49e5-a7f8-92b794e22b30} - {a4d29a0d-4f31-4875-93b4-923dddeaa4fa} + {2cb5fdcd-59fb-4e6e-a277-7a21b9d897bc} - {fc524cc2-8826-41ee-bf8e-dfd18fd0b1bf} + {ed576487-dff5-463f-a168-025c69d3646d} - {0bb100c4-837b-48fd-b1f9-05197a91f9b9} + {225dde9a-df7c-48a5-92b6-c19f03c43726} - {f2136498-3cdd-4a17-a705-f26d3b2715fc} + {f5e67ac4-8fe5-439d-b43b-490168ab4ace} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj b/Crypto/testsuite/TestSuite_vs120.vcxproj index 577f6de48..069050a3b 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 TestSuited TestSuited TestSuited @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -305,22 +305,22 @@ + - + + - - diff --git a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters index 29a83533d..6f5e42eaf 100644 --- a/Crypto/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {0bac9d30-5877-4894-ae8a-2fbd4f5c2ce7} + {c60848e6-79ec-43c9-b733-4600023a7ad1} - {723dfaf9-7c28-4b3b-b6d5-9d87b431e6a7} + {ebc6117b-f7a4-4d44-a8cb-7a6c4d08c0f9} - {d0d89912-3a81-4712-9fb2-e675a5ae6225} + {2dcef8ff-a24c-4be3-89a7-1db327daf1a2} - {33a66a0e-e711-4ec6-a64a-09c2d4399979} + {9cebc868-ee6d-42dc-ad58-6763f2b1a4b0} - {ee2b1075-46a2-431d-94ad-6d469ffef8b4} + {d497a0f1-3b66-48b2-b55d-4475435f8ed9} - {770a833f-6733-47c6-ae05-253d13e8bd99} + {e0c11928-584b-40eb-885a-702524b68c10} - {9a2426b1-9f56-46a0-8fd0-d599d57f242e} + {94d31e0a-0cc5-44e1-8a65-6a2bd21313d1} - {83f25ab0-546b-4cb5-be53-9c55202c16f2} + {7b9dc9da-5121-45a0-a710-c2ac11661301} diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj b/Crypto/testsuite/TestSuite_vs140.vcxproj index e7243ab9e..8b10d0599 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 TestSuited TestSuited TestSuited @@ -142,7 +142,7 @@ Default - ;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters index d2b6591d8..0248baef2 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {a0d425f8-5ca7-4a7f-8761-9a33cc642847} + {5422d0bd-90b3-4bfe-8b30-1c7d33611d2d} - {983bb1a9-cbd4-42aa-8e1e-0a86a95add97} + {11f4db89-b276-4233-aae8-b6614ae4cb43} - {b508464e-9138-4214-bb98-5211f24568dd} + {7c50deeb-22a5-418d-82b0-3b0391ebd88a} - {8ed7f50a-1ee5-4a0f-81ff-135abc3bd717} + {971afa53-5645-4de9-918d-c880fe2555d7} - {f1adcd46-f39f-4863-b2f3-5560c8c53938} + {4453a5e7-66c0-4a4d-bdc3-4aff2887ae81} - {d4b57edf-f1af-4aa3-82df-281f477b2ce7} + {ac0f6006-4dce-4d50-bd5b-3974bcdebf96} - {76a5094c-a243-49dd-b0f2-d54c5cf93009} + {10dd50f0-02ba-4278-ba5d-0c2f6dab1225} - {15636ccd-6f9e-4430-96b7-d9e18fdf739a} + {4b74ac55-1e0c-4762-abbc-22c92150cb13} diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj b/Crypto/testsuite/TestSuite_vs150.vcxproj index 4a0821d15..b71699edc 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 TestSuited TestSuited TestSuited @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters index c4d33eda9..5720290cc 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {d5d47b05-e8ba-4282-87c6-fd92b815f845} + {69adc8b6-9921-4d87-828f-3852e79e6237} - {03c085ef-2eec-4df6-b767-e7fda16817db} + {46c4e381-265d-4c5b-a6ff-0e4a5ed7e58d} - {55fcc409-8363-491c-b850-3da41753dab7} + {867a30ce-2f99-4bae-aba7-86f6bf113e70} - {86f6f695-6f40-4c7c-9a5e-62e1dccd9d4f} + {c26e9bb5-0917-49e8-bf03-d7a38e4c4cd1} - {6a21c15c-ad12-4142-91e7-09548a35d439} + {cc8cd410-f1cc-4db5-aad2-9867e32946ea} - {b1c21527-5d89-4232-9231-4689ee96a5e8} + {c3c89870-19d1-4f4d-b92c-8fd1a71d23fa} - {83d6243d-da6f-4e42-ae37-92de71c27f36} + {5695165a-64b3-404d-baad-008c30729eca} - {a1ce577d-4ce8-4abc-8531-fb9a533048a9} + {1d7c7bcf-3c7c-474e-a4e9-c37298976054} diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj index 6d0cef24a..83f3df322 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj @@ -35,32 +35,32 @@ Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte Application - Static + false MultiByte Application - Static + false MultiByte Application - Dynamic + false MultiByte Application - Dynamic + false MultiByte @@ -198,10 +198,10 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters index 0d003f93e..705aa31df 100644 --- a/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {a3d56cd0-32a8-42a8-a293-cfed50374bcf} + {4bceb911-5705-4b5c-bf70-87b436a54db6} - {4dcc9b92-8139-4e9e-80af-0bcdbf42287a} + {ae77cd83-c342-43df-9281-ac8bb4ee2268} - {6f6e23b4-6693-49b4-8037-7d01e3e1688f} + {1d695b7e-7f8f-49b6-80be-922a65321a98} - {bf1db45b-8d0f-436c-8cfc-0f11ab3eb8b8} + {c457e60d-ca38-4ce1-b1d3-74d4aab59532} - {71177f30-669a-46be-986d-7929323342e2} + {b6ec037a-d969-4240-b54c-791fbb8c0760} - {97cad33c-ee72-49b7-937c-aaec66ddcbcf} + {e0d7d852-7b23-483f-8c7f-0f1de60c890a} - {09d9ec58-61fd-423d-8592-fe593e2837a1} + {ecf87ec7-4749-4dbf-ae06-4a643a9dac4e} - {58ce7a30-9e36-4868-8de4-447908e521f5} + {8ab56677-d821-45da-b0fb-8462cc532821} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj index 1782d4f91..e96a288d8 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj @@ -35,37 +35,37 @@ Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Static + false MultiByte v110 Application - Static + false MultiByte v110 Application - Dynamic + false MultiByte v110 Application - Dynamic + false MultiByte v110 @@ -208,10 +208,10 @@ Default - iphlpapi.lib;winmm.lib;nafxcwd.lib;libcmtd.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - iphlpapi.lib;winmm.lib;nafxcw.lib;libcmt.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters index a6b42cffa..ca3dbbeea 100644 --- a/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {7938ff64-d5a8-4833-b5da-36f5dac8ac26} + {475757f7-48c1-4dab-a6ef-9c201fa88c9e} - {4fbfa487-60e5-477b-b11f-09aa55a13706} + {f13f2ac0-23b2-42d1-9cb0-941cf874eb96} - {b277de34-3b38-4a30-a888-e87f7405951e} + {cbf16436-c5e0-4aff-a069-144cdd9292bf} - {28790b7b-ab5a-4942-b76d-6c4f8b4bef30} + {f847fa67-cd7e-440d-bf58-8e864b7dbe1b} - {c2d06622-7064-4151-b9db-f03d88a3bb89} + {082f19e6-afbc-4f4f-8dff-46577757abe7} - {5363c10a-2185-4670-88e2-508a34bd6214} + {14a90cf5-c1d9-4e86-9842-8b3d977738e3} - {0527de58-605d-4b9b-9243-5b27b52b2eba} + {1fd6d85f-91c7-42a9-8191-d7e5ab74bed9} - {6cf03b86-f63b-4b1f-a8c1-f0b12c52a7eb} + {f1d10534-76cf-40d7-a7fc-3272e62046ed} @@ -71,7 +71,7 @@ _Suite\Source Files - + _Driver\Source Files diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj index 30beb320f..2e320d280 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>12.0.21005.1 + <_ProjectFileVersion>12.0.30501.0 TestSuited TestSuited TestSuited @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -305,22 +305,22 @@ + - + + - - diff --git a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters index 69f823976..6cede878f 100644 --- a/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {7496f4ce-5ba7-4986-ad80-89d1c3818d19} + {11d7e4d1-614f-401b-8f58-0202f512491a} - {f7dcad61-b566-4e38-8b30-b8e165ccbdd4} + {29c5e4ef-f2f7-4ad6-9c52-0f3f45eee251} - {dcefcb72-b53f-47bc-a44c-a56b724257aa} + {c1e673b0-2b04-4220-8e5f-437d37965e25} - {9e2197db-5527-4bf4-a49a-36379445d1a6} + {3461efae-cd34-40e5-b3fd-4f07374ad172} - {b6c2afca-1f0a-4b78-a062-16df5ab35a28} + {acbd8dd2-246d-4a5f-80eb-918ed28cb1e4} - {06dca2cc-ef05-4c84-8e82-264904ed3c32} + {f88d3ffb-2d1d-490b-9df6-1bba0cad2dac} - {ed2642f8-94a6-4234-a9e1-35b14edf4a90} + {ca714541-7132-4abc-9cef-238b4d05c0db} - {4f093996-2fe5-4f07-9a4c-950629963348} + {87915e38-ca0d-479d-aeb9-2cf076c2c67b} diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj index 014b1148f..16e18f94e 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.25123.0 + <_ProjectFileVersion>14.0.25431.1 TestSuited TestSuited TestSuited @@ -142,7 +142,7 @@ Default - ;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters index 21b364161..caefb724b 100644 --- a/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {7c178c08-3d41-4ef6-b2f9-f134868de748} + {41a80e44-46b8-4916-b802-a8e4ec360b6f} - {e3bed82d-16f7-432b-b925-907d0315ba39} + {ac29bb8f-e277-438e-ad43-776758173a18} - {1de4b0fa-767f-4a8c-8c6f-684917ad5563} + {8690bdb8-b91f-4b86-9dcd-69dcc9376c72} - {77f79756-e196-4af8-9930-115f8ce68545} + {200401ef-3b37-429b-a3db-f2c2a5b68fe2} - {ed5e6df5-0a4a-46c7-984e-f51a6236059f} + {65a8665f-4681-4e3a-b7dd-996b672d5e8c} - {47c378d2-513b-45ed-b45a-f73fdbf55dd1} + {fa6b7ad9-331c-464d-b393-02741e9e61f6} - {2bdecc9f-0c46-4f08-9e2c-9c8ee0318fc1} + {3bff8d42-df55-497c-a5be-22af1f7a092a} - {9844fa91-a2d0-4fda-9707-034620bf00a6} + {57f032f8-b82b-45e2-9aba-b86a2c69d985} diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj index 6fe25e030..afcd4a14a 100644 --- a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>15.0.26228.10 + <_ProjectFileVersion>15.0.27625.0 TestSuited TestSuited TestSuited @@ -202,7 +202,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters index 654512047..bff5201ea 100644 --- a/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {f19dfc0d-9858-4678-be8e-dfd3bcbf4dad} + {193792c4-cdc6-4367-a4c5-f124edf90dc7} - {c91a5bac-348c-4840-b9b5-e443a98b610e} + {da9ca949-d2c3-4df6-89b6-988fab7be80b} - {fe3bdf6e-5f1e-421a-b45b-b6ad8c82fc84} + {a8b276da-7ac9-44a5-a597-3e1ea00c6ab9} - {033d434d-a633-4d2f-b600-6cb89b5b564b} + {be1165d1-f983-4eaa-ac5e-cf3359b5baa0} - {6d496965-ef55-4cf5-a4f4-b107a7d11036} + {95cbf748-a711-40aa-910d-f1d5eb3f1aa2} - {41d5fc5e-e5c2-4eba-8007-745f78d21928} + {3a65b1a7-b55d-4d55-b40a-5235e97b0991} - {68dceee7-8e1e-4fe5-958f-5569affe053d} + {b53b7782-1efc-41db-b31f-db2f79cd9517} - {ecd870ad-b55c-48be-a697-09c24f177a84} + {3b72531f-b2a1-42db-a337-b5de55f11ae7} diff --git a/Data/Data_CE_vs90.vcproj b/Data/Data_CE_vs90.vcproj index 1e01ef058..c16548fdb 100644 --- a/Data/Data_CE_vs90.vcproj +++ b/Data/Data_CE_vs90.vcproj @@ -56,7 +56,7 @@ + OutputFile="..\lib\$(PlatformName)\PocoDataMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoDataMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoDataMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoDataMD.lib"/> + OutputFile="..\lib\PocoDataMTd.lib"/> + OutputFile="..\lib\PocoDataMT.lib"/> + OutputFile="..\lib\PocoDataMDd.lib"/> + OutputFile="..\lib\PocoDataMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT diff --git a/Data/Data_WEC2013_vs110.vcxproj.filters b/Data/Data_WEC2013_vs110.vcxproj.filters index 4a3189fa9..c029a5bd8 100644 --- a/Data/Data_WEC2013_vs110.vcxproj.filters +++ b/Data/Data_WEC2013_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {002c7c58-5bc7-4d63-a795-98c989130458} + {34db4526-b8de-48fe-9b70-e29879bc3dbb} - {be626293-2fbc-4576-895b-103b12fdbe7c} + {2aa85602-55a4-469e-b66e-77905e4a7bfc} - {c366ccff-5dcc-4bd7-a356-0ad01a94f617} + {77173230-ff64-491a-98c8-7a4e53efee71} - {95736580-6405-4e86-a969-1a07535fba00} + {b54fcd2c-8252-435c-bf59-320b0b19e568} - {edf27381-cc97-40c0-9a7a-ccb342ba4e00} + {d78e15bf-2ab6-4328-8596-7d770c09662c} - {4c1921e8-1d5e-40c7-b286-ee949285619e} + {733ef813-d903-40de-8214-2f8f0c440f45} - {54d6ad2d-1922-4a38-bd1c-acce57abe9c7} + {9bb411fe-a7c1-4c12-af11-4a45a83e7c3f} - {900ecfd3-8802-46ca-82b9-73501fc58779} + {b5ba5faa-3d4e-4387-90b7-1726b3c709ee} - {44b55a67-fc29-46b5-b02b-8ec5c8b22df7} + {d7b4309b-2f49-47fc-8233-1b14c90f4e31} diff --git a/Data/Data_WEC2013_vs120.vcxproj b/Data/Data_WEC2013_vs120.vcxproj index 644a3e664..1237de851 100644 --- a/Data/Data_WEC2013_vs120.vcxproj +++ b/Data/Data_WEC2013_vs120.vcxproj @@ -67,11 +67,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT diff --git a/Data/Data_WEC2013_vs120.vcxproj.filters b/Data/Data_WEC2013_vs120.vcxproj.filters index bf311ccb0..f7fbf2181 100644 --- a/Data/Data_WEC2013_vs120.vcxproj.filters +++ b/Data/Data_WEC2013_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {16b13d91-8e0f-40ed-a5e0-f03665d7dee0} + {a2b7a2b8-23dc-4394-8f8a-d852642e2bb8} - {53caa097-7de8-42d9-bb58-a1db9912cb42} + {3621d956-550d-4ad3-b517-039b005d0788} - {30d6de2c-60db-4a6e-b6d4-33839580e5a7} + {2e3672de-4c2b-4898-8aa2-223268d1ac19} - {95d89376-4bbc-4aec-b5a0-9a1f25408214} + {d4a8a927-27ea-435f-840c-e183cdb053b1} - {cb8af126-0c08-44ca-a51c-6388b49b9602} + {26c61e88-151d-4281-91b5-546fd3f96ef8} - {ad192924-72b9-4401-95ac-dfda5c693b24} + {7fc9aaaa-2866-4b42-943a-4d917b1f6157} - {73da7f8c-4b09-44c7-849e-428164367b0e} + {b4398ca3-6bb8-4e57-9866-c30aefc22f34} - {46bedd00-35a9-4c3c-a5e9-9d0eac16279a} + {40cbd71c-6707-4a58-a300-da157c81a77f} - {ee307c7a-1de9-49f6-a007-1939962fd94f} + {a800ee44-cce0-40f8-8ee5-26148be11831} diff --git a/Data/Data_vs100.vcxproj b/Data/Data_vs100.vcxproj index e67acdbd4..8bcfacb8b 100644 --- a/Data/Data_vs100.vcxproj +++ b/Data/Data_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Data\$(Configuration)\ PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoDatamtd.lib + %(AdditionalDependencies) + ..\lib\PocoDataMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoDatamt.lib + %(AdditionalDependencies) + ..\lib\PocoDataMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoDatamdd.pdb + ..\lib\PocoDataMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoDatamdd.lib + %(AdditionalDependencies) + ..\lib\PocoDataMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoDatamd.lib + ..\lib\PocoDataMD.lib diff --git a/Data/Data_vs100.vcxproj.filters b/Data/Data_vs100.vcxproj.filters index 581f1fc97..d57b79c16 100644 --- a/Data/Data_vs100.vcxproj.filters +++ b/Data/Data_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {4f877db0-7e15-42ad-9161-194295d3cf61} + {054f235f-140e-4dc5-a85f-746ce38ccf1e} - {511bb500-572a-4b4a-b8c5-d14ddcf8b593} + {8fc90974-647d-4046-bdfc-c7f9ab2c4b70} - {42c4be4b-ccfa-43ee-bd65-88e996e39ede} + {bc2373dc-fc05-48f7-a7f7-0cf8eac9970c} - {ca7802ad-cc5b-4abf-a2cd-13ca5198219a} + {7ea622f1-7fe0-4cd3-8b42-28d865502cfb} - {e41ada7e-b929-4e9d-9c2e-9afd44a513ee} + {0475bd12-e0ab-4c65-8348-fca5bf01dbff} - {3fc77a9d-740b-4105-a6c2-506c8fca4277} + {fdae4029-a979-4a34-aa71-bba6f9a349c6} - {b9cb890a-4399-4e17-aad3-6bd3f2f3aac3} + {8cbae4d7-bcde-4144-bd13-806d87f16cb9} - {69ca5d0a-beb7-4299-9893-a355d3519b83} + {1c17b4b0-e379-46c7-b1d1-387ba8ecfb9e} - {e729a557-5d60-45e7-8527-588fd6c136fb} + {11d5974e-984d-48ed-bb9f-78d336094a9f} diff --git a/Data/Data_vs110.vcxproj b/Data/Data_vs110.vcxproj index c5a01a87c..05ed2148c 100644 --- a/Data/Data_vs110.vcxproj +++ b/Data/Data_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoDatamtd.lib + ..\lib\PocoDataMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoDatamt.lib + ..\lib\PocoDataMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoDatamdd.pdb + ..\lib\PocoDataMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoDatamdd.lib + ..\lib\PocoDataMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoDatamd.lib + ..\lib\PocoDataMD.lib diff --git a/Data/Data_vs110.vcxproj.filters b/Data/Data_vs110.vcxproj.filters index b5ee2a901..67962ef06 100644 --- a/Data/Data_vs110.vcxproj.filters +++ b/Data/Data_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {b1aaaa74-ee97-4ef3-a03c-31149510515b} + {091ade32-1065-417e-a8fe-71d2930c3fa2} - {27db07a8-2bbb-40d8-abb1-dffcd8bc08b4} + {0d9346c8-52a1-46e2-9af8-84b91b0e62ed} - {99d3b04e-fac2-4568-86a7-2f290345c6ca} + {c9841345-a7a0-4c0d-b6f7-2ef7131fd1d9} - {02bc8614-0469-4d82-b73f-dd2358f360e0} + {da81d984-b16f-452e-8a33-8517608a95e9} - {17bedb4b-829c-43ab-88c4-e8b6a2e8be87} + {b8c6065b-8b2b-4ad5-9b9b-52de177354cd} - {f56c2101-7ab5-45bb-8604-2e0cf64570f0} + {61a78811-46ce-4cb3-9df4-180057c2d5d6} - {3c93b606-cba2-4d51-a57b-c08f85f50066} + {a2f7c22c-d64a-4119-a0d2-c41fe290bdf2} - {1a28cfcd-7d80-420b-814a-5d900fded207} + {a101f3e0-62af-44d8-a824-47c3441f0542} - {45797abd-b3ac-4240-b0e2-3672dd6d3a14} + {bf6f4cba-1943-4834-82c8-5b5c9fcf986e} diff --git a/Data/Data_vs120.vcxproj b/Data/Data_vs120.vcxproj index 324366774..23b9a03b9 100644 --- a/Data/Data_vs120.vcxproj +++ b/Data/Data_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoDatamtd.lib + ..\lib\PocoDataMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoDatamt.lib + ..\lib\PocoDataMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoDatamdd.pdb + ..\lib\PocoDataMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoDatamdd.lib + ..\lib\PocoDataMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoDatamd.lib + ..\lib\PocoDataMD.lib diff --git a/Data/Data_vs120.vcxproj.filters b/Data/Data_vs120.vcxproj.filters index ffa77e4e6..6f77a5e9c 100644 --- a/Data/Data_vs120.vcxproj.filters +++ b/Data/Data_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {bf9d4a35-8d66-4dab-9111-a3ed638fa984} + {f93ab561-aacd-4176-b70e-311990de6087} - {e59accbc-4b69-4916-bc9a-040f88a8c24e} + {739f4847-866f-4ecd-a050-51f990d95eb2} - {b8256114-2725-4d82-9e88-db70e6b70727} + {b3607057-0d0e-44cc-9e3e-bdb6311005aa} - {c4acd589-c154-4858-a3d0-0ee489eade1c} + {b75dc56d-984d-43f5-a51d-f50990b0cdac} - {900fd0ee-f3f4-4710-8e3d-f11a3ff097e0} + {f7a58a90-777b-4d7a-b6d1-27ed352c5285} - {d6e4069f-7082-4056-85cd-fa6967b4149a} + {92aea673-2980-4987-81ba-ae742d6414c0} - {fb5d7e8f-648e-4250-82ca-de0611ae6d8a} + {505c6874-d4f7-4091-ada9-36f401a0c582} - {f494aa75-38d6-43bf-b346-676969d08cae} + {3d11a228-1581-4e02-8198-6d2c552751b1} - {7b149928-c818-4d93-ba01-3561fe3e0cba} + {5f5bcffd-ef0f-4d9a-8261-d1635d0591cc} diff --git a/Data/Data_vs140.vcxproj b/Data/Data_vs140.vcxproj index 4b5a24dcb..44cc3a8a5 100644 --- a/Data/Data_vs140.vcxproj +++ b/Data/Data_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoDatamtd.lib + ..\lib\PocoDataMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoDatamt.lib + ..\lib\PocoDataMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoDatamdd.pdb + ..\lib\PocoDataMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoDatamdd.lib + ..\lib\PocoDataMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoDatamd.lib + ..\lib\PocoDataMD.lib diff --git a/Data/Data_vs140.vcxproj.filters b/Data/Data_vs140.vcxproj.filters index 01f1d5d33..1ff257ef4 100644 --- a/Data/Data_vs140.vcxproj.filters +++ b/Data/Data_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {ab800cf2-ecc1-4752-b278-56cc2ddfd4c2} + {dbe777d3-1808-41e3-b0b4-6fef84ea9aec} - {52e4b428-7a58-4b6c-bfcc-87635853f00b} + {42a64e7a-e072-44ec-8f9a-c737b3142419} - {783bb699-ee3a-43a7-83bb-b6e1aa6d68ab} + {415538b7-c743-4149-90b4-503ff21c625f} - {c354c7ac-013d-4a46-b096-2dcf77a0b460} + {35c1f1fe-64f5-4ff2-a512-c06efea5509b} - {92688e3b-3fbb-424d-b7ca-f427da5a45d8} + {57671a2a-b1ab-4e98-826a-a8d209597ffa} - {00d079a6-634a-42d4-9d35-231612d34cad} + {21effc2c-fa4e-4304-b350-cd7daad9fe73} - {39eba5e0-d3e4-477c-a19a-b35af0985ef1} + {abd613bd-7cba-4d0b-a256-c8cd7eeb6d88} - {4dfe448f-5c01-4f27-b4ed-772e020b1a8c} + {d35ffd9d-e76e-4f85-84fe-1940e15b5a58} - {50c5e03d-a746-4dd5-86a9-4585506c70c6} + {41f12cec-7a31-462b-baf7-46eaaed0c8f8} diff --git a/Data/Data_vs150.vcxproj b/Data/Data_vs150.vcxproj index 01f7f4c42..c83708677 100644 --- a/Data/Data_vs150.vcxproj +++ b/Data/Data_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDatad - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoDatamtd.lib + ..\lib\PocoDataMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoDatamt.lib + ..\lib\PocoDataMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoDatamdd.pdb + ..\lib\PocoDataMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoDatamdd.lib + ..\lib\PocoDataMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoDatamd.lib + ..\lib\PocoDataMD.lib diff --git a/Data/Data_vs150.vcxproj.filters b/Data/Data_vs150.vcxproj.filters index 45ccbc7bc..e09e76fe5 100644 --- a/Data/Data_vs150.vcxproj.filters +++ b/Data/Data_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {7f0654ef-7e83-4b58-ac51-31e4e1310d09} + {7971efa0-9423-4a99-93e9-674e3d8861e2} - {ecd7e754-490e-4c6e-be5c-4d06d4c6939d} + {f6635584-db78-40bb-a6e2-ac5b7da3164c} - {cf28be8f-b1f7-4f9d-a33c-16116555c8dc} + {4b057c28-ee65-4896-b863-53cbcc4092c9} - {4c4eab32-9710-424d-b86a-6f5a798db667} + {cc0494b2-1de6-425b-ad95-935ed88d385a} - {b4d217a1-dfbf-4382-a897-b6950cee98ee} + {26f3352a-0f34-4abb-b0ac-8ba964e7ffc0} - {3fc86e80-5cba-440d-9b60-9968ed4d9be4} + {f0c793c2-d141-4d20-b0ef-9cdc3041bd6c} - {a94004a8-b6d9-440e-9c6c-d5125457fcb2} + {8cf80785-f987-43ea-9f38-0f56599d22eb} - {80453d31-c856-4378-a115-6d70858034a6} + {a1961dc7-2c76-4a6d-a3d2-6c234c9be0fd} - {b826193d-e309-49ed-911b-af3e3ca9f1a2} + {1010b27e-08ef-4312-9504-d268da31f8ab} diff --git a/Data/Data_x64_vs100.vcxproj b/Data/Data_x64_vs100.vcxproj index 064fa464d..ae9d0ca98 100644 --- a/Data/Data_x64_vs100.vcxproj +++ b/Data/Data_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib64\ obj64\Data\$(Configuration)\ PocoData64d - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData64 - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT @@ -192,7 +192,9 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamtd.lib + %(AdditionalDependencies) + ..\lib64\PocoDataMTd.lib + MachineX64 @@ -218,7 +220,9 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamt.lib + %(AdditionalDependencies) + ..\lib64\PocoDataMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoDatamdd.pdb + ..\lib64\PocoDataMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamdd.lib + %(AdditionalDependencies) + ..\lib64\PocoDataMDd.lib + MachineX64 @@ -269,7 +275,9 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamd.lib + %(AdditionalDependencies) + ..\lib64\PocoDataMD.lib + MachineX64 diff --git a/Data/Data_x64_vs100.vcxproj.filters b/Data/Data_x64_vs100.vcxproj.filters index 163988418..09aa733cb 100644 --- a/Data/Data_x64_vs100.vcxproj.filters +++ b/Data/Data_x64_vs100.vcxproj.filters @@ -2,31 +2,31 @@ - {e705ff8a-95cb-4313-8a9e-d7ed2a9d3cb0} + {b742829c-d1cd-4478-8456-8760f90b463a} - {ee22e7c7-4f9a-4706-b7bb-92e67656e97a} + {dc21eafc-3321-4988-ac54-c0db9529a41d} - {f91f3a66-e8ac-42f2-8c7e-d0fba666c44c} + {8f1ecafe-8663-45f5-aed4-5da94bf91bc3} - {3864fba6-dc67-4e1d-b9b1-b845f891dc22} + {cbeced65-5198-44e0-bf35-c93cbb2e2018} - {fff40d67-7e1f-4829-a634-45a76b6730a6} + {f674dcf9-cf54-4171-8f8f-27498bef517e} - {40ece370-d352-44c7-9c44-f810a16fea05} + {34260f33-b5c3-4ce0-b9b9-0c30b1797a4b} - {a64d9b17-d7cb-44b9-9ad5-fe96efc116be} + {9825139a-490e-4b0f-aaf8-7218c391ef61} - {b0ed69a4-8363-42a9-a286-f2c6347687ca} + {85a72ee6-f7f4-4877-af35-4f7d7b5b1e40} - {a393ed41-f928-40e8-8016-38c758780e33} + {eb70908c-5241-4bb2-84a6-bacd84f62e1d} diff --git a/Data/Data_x64_vs110.vcxproj b/Data/Data_x64_vs110.vcxproj index be6740559..bfa04dad1 100644 --- a/Data/Data_x64_vs110.vcxproj +++ b/Data/Data_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoData64d - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData64 - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin64\ @@ -203,7 +203,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamtd.lib + ..\lib64\PocoDataMTd.lib + MachineX64 @@ -228,7 +229,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamt.lib + ..\lib64\PocoDataMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\lib64\PocoDatamdd.pdb + ..\lib64\PocoDataMDd.pdb Level3 ProgramDatabase Default /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamdd.lib + ..\lib64\PocoDataMDd.lib + MachineX64 @@ -277,7 +280,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamd.lib + ..\lib64\PocoDataMD.lib + MachineX64 diff --git a/Data/Data_x64_vs110.vcxproj.filters b/Data/Data_x64_vs110.vcxproj.filters index 88d554782..0d9febfeb 100644 --- a/Data/Data_x64_vs110.vcxproj.filters +++ b/Data/Data_x64_vs110.vcxproj.filters @@ -2,31 +2,31 @@ - {90acb326-4d5c-49d7-88a6-f719cfb88454} + {bea574e1-66dd-4545-8744-a812a4e27f42} - {2635f1d7-35c0-402c-9557-180003cb3786} + {d4ccc1cb-c64b-4bed-b117-734951ab1cdc} - {1abd4334-9d26-4c71-9125-ea8b470b6a31} + {197758e4-a48c-48dc-9feb-bea3cce8105d} - {5a527897-cc26-4490-9227-43845e251f10} + {1041eef7-3b64-4bbe-8efa-cce679200650} - {74e2cc5a-40d2-4f87-b35f-bfe56be2423a} + {259b3e6a-00e8-4c83-ac28-3fca1cac9139} - {742622d6-4cd1-4cdf-9de1-49019436b603} + {035838fd-2212-48d1-8caf-c702a1f1a51f} - {cc2ae774-de1e-4429-baf4-2859a76abddb} + {cacc5fbd-cb98-4247-8286-b12f709fe6cc} - {7c861528-339e-4012-b6bf-398ca6a4ab89} + {e121aae1-3ded-4b03-ad5a-0dd7e4d16913} - {ec0a1165-51a7-4f6c-8673-9a0181c6bb9b} + {b20c9944-259c-4200-b9b6-90f38dad7c06} diff --git a/Data/Data_x64_vs120.vcxproj b/Data/Data_x64_vs120.vcxproj index 7116bf5b2..1173cc826 100644 --- a/Data/Data_x64_vs120.vcxproj +++ b/Data/Data_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoData64d - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData64 - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin64\ @@ -203,7 +203,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamtd.lib + ..\lib64\PocoDataMTd.lib + MachineX64 @@ -228,7 +229,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamt.lib + ..\lib64\PocoDataMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\lib64\PocoDatamdd.pdb + ..\lib64\PocoDataMDd.pdb Level3 ProgramDatabase Default /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamdd.lib + ..\lib64\PocoDataMDd.lib + MachineX64 @@ -277,7 +280,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamd.lib + ..\lib64\PocoDataMD.lib + MachineX64 diff --git a/Data/Data_x64_vs120.vcxproj.filters b/Data/Data_x64_vs120.vcxproj.filters index 3bb1ebf01..f80560d19 100644 --- a/Data/Data_x64_vs120.vcxproj.filters +++ b/Data/Data_x64_vs120.vcxproj.filters @@ -2,31 +2,31 @@ - {33fd0431-836d-4069-ad6b-4ca528c2500e} + {9d0d20c0-01e0-4609-a5ca-1379f8406d00} - {973e9e54-aef0-472d-9b3f-1a18ffffc2e6} + {624a7358-4439-4cb0-a037-4873abbf99c5} - {ee9d4b89-84ae-4d71-b1a4-7b4e8c4d8c78} + {f34a6e8b-9152-4490-b8c7-562ef9260836} - {8e3f8613-a846-43be-9c60-d392a7bb0db2} + {239169ae-d5c2-488d-8986-a2e629da7c5f} - {d60c58b2-07fb-4fb5-9a7c-4c096461ba3d} + {81e77ab8-1ac6-42c1-83f0-d40cdd282cd5} - {f780643e-1e0b-4ac8-b857-d61c824552fe} + {ec9206e4-4798-4105-986d-641c939c0c7b} - {211caaad-dc33-43b5-a514-8bd7b5afc56b} + {d53bae15-a9f7-4b06-ad13-f7a56cb175fc} - {1e49310e-6b82-45cc-a08e-ac2ba3aba8a0} + {3ed4e25f-63e8-4d13-bb72-e47d8e67c8eb} - {0240e793-e20b-45bf-b751-ca32bf1ebef6} + {70c6127c-22f1-4904-99d7-a7d3922b1848} diff --git a/Data/Data_x64_vs140.vcxproj b/Data/Data_x64_vs140.vcxproj index 5f38ec0f6..3da780a3d 100644 --- a/Data/Data_x64_vs140.vcxproj +++ b/Data/Data_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoData64d - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData64 - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin64\ @@ -203,7 +203,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamtd.lib + ..\lib64\PocoDataMTd.lib + MachineX64 @@ -228,7 +229,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamt.lib + ..\lib64\PocoDataMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\lib64\PocoDatamdd.pdb + ..\lib64\PocoDataMDd.pdb Level3 ProgramDatabase Default /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamdd.lib + ..\lib64\PocoDataMDd.lib + MachineX64 @@ -277,7 +280,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamd.lib + ..\lib64\PocoDataMD.lib + MachineX64 diff --git a/Data/Data_x64_vs140.vcxproj.filters b/Data/Data_x64_vs140.vcxproj.filters index 1232a1448..2903ef52e 100644 --- a/Data/Data_x64_vs140.vcxproj.filters +++ b/Data/Data_x64_vs140.vcxproj.filters @@ -2,31 +2,31 @@ - {61818a9e-a09d-4c5d-a5fb-088feec8065b} + {f7824b95-af53-48f5-adad-e99e9d71de19} - {16af8285-90c3-4d16-84ed-b229b6b788c7} + {2b33c7b6-c0f3-473c-8546-e4590f84146e} - {22e9ba2c-721c-48d7-8634-7ec4ef234f37} + {160ad812-6090-4033-a26a-7d43e1b9ecd6} - {516315fc-1b92-42f8-95cd-a7c12f24acc6} + {07677a3e-b716-4331-8547-441737e2cf1e} - {ea099c9e-e003-4b32-89d2-1daa03a269ae} + {bf5717e8-d158-4634-a071-83cb0d9b536c} - {51c28c5f-5332-4565-a72a-bc47072d3cff} + {2069e350-e356-4c9a-8c77-46a4bb606505} - {533c5f68-fe42-47ed-8f22-6e302bc0c893} + {281425a7-1dab-4b54-9193-66a49bd67d9a} - {f903a4b0-76ca-4b85-a839-9696a0433258} + {199b7deb-ffbb-41ff-8988-45283b05a30c} - {de3d7712-c041-44ac-ab06-bca4d22ab6ed} + {7b479ccb-4c08-4564-bbbb-63841ac451de} diff --git a/Data/Data_x64_vs150.vcxproj b/Data/Data_x64_vs150.vcxproj index 96d303429..58c0da6b0 100644 --- a/Data/Data_x64_vs150.vcxproj +++ b/Data/Data_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoData64d - PocoDatamdd - PocoDatamtd + PocoDataMDd + PocoDataMTd PocoData64 - PocoDatamd - PocoDatamt + PocoDataMD + PocoDataMT ..\bin64\ @@ -203,7 +203,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamtd.lib + ..\lib64\PocoDataMTd.lib + MachineX64 @@ -228,7 +229,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamt.lib + ..\lib64\PocoDataMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\lib64\PocoDatamdd.pdb + ..\lib64\PocoDataMDd.pdb Level3 ProgramDatabase Default /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamdd.lib + ..\lib64\PocoDataMDd.lib + MachineX64 @@ -277,7 +280,8 @@ /bigobj %(AdditionalOptions) - ..\lib64\PocoDatamd.lib + ..\lib64\PocoDataMD.lib + MachineX64 diff --git a/Data/Data_x64_vs150.vcxproj.filters b/Data/Data_x64_vs150.vcxproj.filters index aaa62f186..664f946c9 100644 --- a/Data/Data_x64_vs150.vcxproj.filters +++ b/Data/Data_x64_vs150.vcxproj.filters @@ -2,31 +2,31 @@ - {d73e287c-95f8-4e3e-813c-e00224dd4c03} + {dcae42a9-3a56-4c69-a214-aa2bd24d5dd6} - {6fa2622a-d4e8-4e36-885c-f9ffa9587486} + {acdac9a8-3594-4afb-9ea6-912f02d3bfe6} - {496f071c-d958-42b1-8f7f-50038c64ec72} + {a32538cd-9c5e-45d3-beb2-fe74bfd65ee7} - {3fa3bc17-61ce-4efc-9427-18ca49bd2b46} + {93d3b085-c8a4-443b-82a9-4ce248707e9c} - {e972d60c-c0f3-4fb6-92d7-b0304573f091} + {f7e59e8b-7fe8-4e1e-8b4a-3756261b49fa} - {0ed2ac40-199c-49f5-9f0b-de4c6fbb9412} + {5dbde9c4-56c8-48aa-9dc2-010fcaa55344} - {8bc6f01e-65c5-48d9-8566-41ecd985d600} + {fc09f07d-09f4-4920-af9f-979d67d36257} - {34f53df2-5f1f-47c8-a305-473b4e016ed9} + {c1068c6f-5b71-4f84-9848-8eb5ee6f12fb} - {e9545ad3-ef25-4933-92c4-41a6d7a8f10c} + {65f1aeca-979a-4ae9-8e1a-edc498e5ebfd} diff --git a/Data/Data_x64_vs90.vcproj b/Data/Data_x64_vs90.vcproj index 219c78d60..c9d21d44b 100644 --- a/Data/Data_x64_vs90.vcproj +++ b/Data/Data_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoDatamdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoDataMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Data/MySQL/MySQL_VS90.vcproj b/Data/MySQL/MySQL_VS90.vcproj index 3fcb52f11..999cb6296 100644 --- a/Data/MySQL/MySQL_VS90.vcproj +++ b/Data/MySQL/MySQL_VS90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\..\lib\PocoDataMySQLMTd.lib"/> + OutputFile="..\..\lib\PocoDataMySQLMT.lib"/> + OutputFile="..\..\lib\PocoDataMySQLMDd.lib"/> + OutputFile="..\..\lib\PocoDataMySQLMD.lib"/> ..\..\lib\ obj\MySQL\$(Configuration)\ PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT @@ -207,7 +207,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataMySQLmtd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataMySQLMTd.lib @@ -238,7 +239,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataMySQLmt.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataMySQLMT.lib @@ -260,7 +262,7 @@ exit 0 true true - ..\..\lib\PocoDataMySQLmdd.pdb + ..\..\lib\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default @@ -268,7 +270,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataMySQLmdd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataMySQLMDd.lib @@ -301,7 +304,7 @@ exit 0 %(AdditionalDependencies) - ..\..\lib\PocoDataMySQLmd.lib + ..\..\lib\PocoDataMySQLMD.lib diff --git a/Data/MySQL/MySQL_vs110.vcxproj b/Data/MySQL/MySQL_vs110.vcxproj index 9b81afe6d..8216a435d 100644 --- a/Data/MySQL/MySQL_vs110.vcxproj +++ b/Data/MySQL/MySQL_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmtd.lib + ..\..\lib\PocoDataMySQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmt.lib + ..\..\lib\PocoDataMySQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataMySQLmdd.pdb + ..\..\lib\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataMySQLmdd.lib + ..\..\lib\PocoDataMySQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmd.lib + ..\..\lib\PocoDataMySQLMD.lib diff --git a/Data/MySQL/MySQL_vs120.vcxproj b/Data/MySQL/MySQL_vs120.vcxproj index 11e3fea46..12b4a8e99 100644 --- a/Data/MySQL/MySQL_vs120.vcxproj +++ b/Data/MySQL/MySQL_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmtd.lib + ..\..\lib\PocoDataMySQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmt.lib + ..\..\lib\PocoDataMySQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataMySQLmdd.pdb + ..\..\lib\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataMySQLmdd.lib + ..\..\lib\PocoDataMySQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmd.lib + ..\..\lib\PocoDataMySQLMD.lib diff --git a/Data/MySQL/MySQL_vs140.vcxproj b/Data/MySQL/MySQL_vs140.vcxproj index d4bb8599f..c89fb79c1 100644 --- a/Data/MySQL/MySQL_vs140.vcxproj +++ b/Data/MySQL/MySQL_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmtd.lib + ..\..\lib\PocoDataMySQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmt.lib + ..\..\lib\PocoDataMySQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataMySQLmdd.pdb + ..\..\lib\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataMySQLmdd.lib + ..\..\lib\PocoDataMySQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmd.lib + ..\..\lib\PocoDataMySQLMD.lib diff --git a/Data/MySQL/MySQL_vs150.vcxproj b/Data/MySQL/MySQL_vs150.vcxproj index 9d035f53e..c0b8b5365 100644 --- a/Data/MySQL/MySQL_vs150.vcxproj +++ b/Data/MySQL/MySQL_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataMySQLd - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmtd.lib + ..\..\lib\PocoDataMySQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmt.lib + ..\..\lib\PocoDataMySQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataMySQLmdd.pdb + ..\..\lib\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataMySQLmdd.lib + ..\..\lib\PocoDataMySQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataMySQLmd.lib + ..\..\lib\PocoDataMySQLMD.lib diff --git a/Data/MySQL/MySQL_x64_vs100.vcxproj b/Data/MySQL/MySQL_x64_vs100.vcxproj index b4a9e7e74..c018ebcba 100644 --- a/Data/MySQL/MySQL_x64_vs100.vcxproj +++ b/Data/MySQL/MySQL_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\..\lib64\ obj64\MySQL\$(Configuration)\ PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT @@ -207,7 +207,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataMySQLmtd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataMySQLMTd.lib + MachineX64 @@ -238,7 +240,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataMySQLmt.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataMySQLMT.lib + MachineX64 @@ -260,7 +264,7 @@ exit 0 true true - ..\..\lib64\PocoDataMySQLmdd.pdb + ..\..\lib64\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default @@ -268,7 +272,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataMySQLmdd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataMySQLMDd.lib + MachineX64 @@ -299,7 +305,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataMySQLmd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataMySQLMD.lib + MachineX64 diff --git a/Data/MySQL/MySQL_x64_vs110.vcxproj b/Data/MySQL/MySQL_x64_vs110.vcxproj index 018562e58..efb43dfb4 100644 --- a/Data/MySQL/MySQL_x64_vs110.vcxproj +++ b/Data/MySQL/MySQL_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmtd.lib + ..\..\lib64\PocoDataMySQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmt.lib + ..\..\lib64\PocoDataMySQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataMySQLmdd.pdb + ..\..\lib64\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataMySQLmdd.lib + ..\..\lib64\PocoDataMySQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmd.lib + ..\..\lib64\PocoDataMySQLMD.lib + MachineX64 diff --git a/Data/MySQL/MySQL_x64_vs120.vcxproj b/Data/MySQL/MySQL_x64_vs120.vcxproj index ec3a84cb6..9ffeeff7d 100644 --- a/Data/MySQL/MySQL_x64_vs120.vcxproj +++ b/Data/MySQL/MySQL_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmtd.lib + ..\..\lib64\PocoDataMySQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmt.lib + ..\..\lib64\PocoDataMySQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataMySQLmdd.pdb + ..\..\lib64\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataMySQLmdd.lib + ..\..\lib64\PocoDataMySQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmd.lib + ..\..\lib64\PocoDataMySQLMD.lib + MachineX64 diff --git a/Data/MySQL/MySQL_x64_vs140.vcxproj b/Data/MySQL/MySQL_x64_vs140.vcxproj index c8e6c2913..8908ddacd 100644 --- a/Data/MySQL/MySQL_x64_vs140.vcxproj +++ b/Data/MySQL/MySQL_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmtd.lib + ..\..\lib64\PocoDataMySQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmt.lib + ..\..\lib64\PocoDataMySQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataMySQLmdd.pdb + ..\..\lib64\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataMySQLmdd.lib + ..\..\lib64\PocoDataMySQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmd.lib + ..\..\lib64\PocoDataMySQLMD.lib + MachineX64 diff --git a/Data/MySQL/MySQL_x64_vs150.vcxproj b/Data/MySQL/MySQL_x64_vs150.vcxproj index e26b47272..cec30d148 100644 --- a/Data/MySQL/MySQL_x64_vs150.vcxproj +++ b/Data/MySQL/MySQL_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataMySQL64d - PocoDataMySQLmdd - PocoDataMySQLmtd + PocoDataMySQLMDd + PocoDataMySQLMTd PocoDataMySQL64 - PocoDataMySQLmd - PocoDataMySQLmt + PocoDataMySQLMD + PocoDataMySQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmtd.lib + ..\..\lib64\PocoDataMySQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmt.lib + ..\..\lib64\PocoDataMySQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataMySQLmdd.pdb + ..\..\lib64\PocoDataMySQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataMySQLmdd.lib + ..\..\lib64\PocoDataMySQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataMySQLmd.lib + ..\..\lib64\PocoDataMySQLMD.lib + MachineX64 diff --git a/Data/MySQL/MySQL_x64_vs90.vcproj b/Data/MySQL/MySQL_x64_vs90.vcproj index e5d0e0000..301b55a11 100644 --- a/Data/MySQL/MySQL_x64_vs90.vcproj +++ b/Data/MySQL/MySQL_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> @@ -264,7 +264,7 @@ Name="VCPreLinkEventTool"/> @@ -308,7 +308,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\..\lib64\PocoDataMySQLmdd.pdb" + ProgramDataBaseFileName="..\..\lib64\PocoDataMySQLMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -323,7 +323,7 @@ Name="VCPreLinkEventTool"/> @@ -383,7 +383,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Data/MySQL/testsuite/TestSuite.progen b/Data/MySQL/testsuite/TestSuite.progen index facfa95e3..e0486f475 100644 --- a/Data/MySQL/testsuite/TestSuite.progen +++ b/Data/MySQL/testsuite/TestSuite.progen @@ -8,4 +8,6 @@ vc.project.configurations = debug_shared, release_shared, debug_static_mt, relea vc.project.prototype = TestSuite_vs90.vcproj mysql = ${vc.project.pocobase}\\mysql vc.project.compiler.include = ${mysql}\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include -vc.project.linker.dependencies = +vc.project.linker.dependencies.Win32 = iphlpapi.lib +vc.project.linker.dependencies.x64 = iphlpapi.lib +vc.project.linker.dependencies.WinCE = iphlpapi.lib diff --git a/Data/MySQL/testsuite/TestSuite_VS90.vcproj b/Data/MySQL/testsuite/TestSuite_VS90.vcproj index 0d3d004cc..2fcd438be 100644 --- a/Data/MySQL/testsuite/TestSuite_VS90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_VS90.vcproj @@ -32,7 +32,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters index ec442a2b9..e1467c68a 100644 --- a/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {364e6c29-c104-4da0-8e60-cfef9f841380} + {b58927dd-0f45-48ca-ac3d-e11bc636da14} - {7f36e030-191d-44bb-89b6-5b7665366fe8} + {bca2a979-c069-450f-a42c-9c2d515ca887} - {aab8f2cf-b91e-447e-afab-a706b20a6c2a} + {2624a89c-6946-4d10-8126-e18606339eb4} - {a10a717c-53df-47eb-b9f8-853bda1bdd0f} + {07df6101-deea-4c4d-9589-b24e76a6f75a} - {266b753b-e2ae-4df1-9369-e28644eb0fab} + {66ac8177-badd-4ca7-b996-fc50a6efd54a} - {24d87ff5-5587-4ee4-9c62-2d4d06ccbc93} + {48eb3fb7-9074-4ca5-b8d7-abe7c749204a} - {ae716507-250d-40ef-900f-acd046ace9e9} + {06c6992c-f96f-4bfe-85c0-710debb42653} - {f5c0c611-ff23-4a31-9f8a-5d28a16266fe} + {dbf58337-9959-4f1f-8b0f-32385a917921} diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj index b59377b28..85eec95a4 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -164,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -190,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -223,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -250,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -282,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters index e1141cdb0..6081acb8a 100644 --- a/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {2bee57b8-7878-4e45-9f1b-fdcb58b8cd00} + {e6d9711c-1586-4099-802e-4b245169709d} - {d8f8c3b1-c8a8-4e49-8dd7-ac2503117bf2} + {54322512-aa62-4116-9fe7-2272ec9f6e5e} - {d0f9c213-d339-4e88-a4f7-6a1977f35382} + {40050e98-358b-4578-8855-863e51baadbe} - {35b34fc6-9e3a-4bc4-94eb-d85214f10fcf} + {487f6869-91ab-4f52-94bc-b6dcd1a033f1} - {23bf3613-f375-40b4-a979-c6a5a379de71} + {91e1ad68-172e-4434-a170-c25ac34c0a04} - {681a38a6-2b61-45b0-8cbf-716edcd5af47} + {e194a749-61ca-4bd3-815b-db8ac356bbaf} - {3ab00620-3896-42ba-9b2d-be05e4e36bd4} + {28e9e401-ef9e-4a1f-bb8f-607fbfd01b96} - {7badedc4-cdac-4805-bb58-1690d1350f2f} + {e9d60fc5-29d3-4c6d-8cdb-8a377077b159} diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj index c5d7c9e92..86c641a46 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters index 61a70e136..a5befd8b1 100644 --- a/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {cd51dfff-4cbd-4de8-9fb4-ce7fa1a4e15f} + {c3e73c41-1c8c-4c56-8188-f9a17f37b977} - {5547c395-fc31-4f29-ace1-b94555325ba5} + {226b53f0-24c8-4df2-be90-02845205fac3} - {30c57803-5d56-4734-a7d6-5c122936d5af} + {9bae0a48-94e9-4635-9862-96f34d8483ab} - {5b403d46-448c-456b-95e4-7d04105e5703} + {fa6a80d5-20e4-4bd8-8cd0-efba488fffaa} - {330a886d-277b-4d83-9f62-18adddd1a8ab} + {7b0aafaa-875b-4441-b055-1ae5e925511a} - {9c41722d-5cbe-4b34-8508-0a703939c2ae} + {28596e30-49c9-4a62-965e-e87334540954} - {e22488ca-6bdc-4ec3-b670-24406574b23e} + {2744edbb-1839-463c-82eb-6c6d66b85815} - {54e0a331-db2a-457e-bdb8-711eae301da3} + {be211904-9541-4d2a-83bf-b5ffe1b07563} diff --git a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj index 5d516ba56..ec638df9a 100644 --- a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters index 7d0ca4da6..d058933d2 100644 --- a/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {afb5443a-6957-46f6-8d1f-f8eb49c82dfc} + {dd8e795e-d5de-4c9b-92c5-79895430ee5e} - {e44120eb-ff95-418d-bd88-362387e0715e} + {d723bcd0-d02c-4c45-a2dd-dbf88079fa1b} - {329c9773-9fe9-4aa8-b173-db5276d5dd06} + {96e5fa72-ea87-4edc-a644-360fad51cb9e} - {179f2f8a-7f92-487d-9ccd-ed7e51c61749} + {1554e162-34a7-4ff8-b96e-7e81cfc648df} - {d7736483-217f-4cf9-842f-bd37ed7a881b} + {cdab8a70-0fe9-4727-bf04-9f1da79ec0de} - {731b7c28-a012-4d52-adbc-ccdb89e9632c} + {19a21486-727a-4f69-8ea0-74ec62da729e} - {6e5ae936-4868-4088-85a3-6ccb0269cb75} + {3d745756-fd7b-4a0d-bdef-9f8fff9f7a8f} - {72f15b12-711b-4f4c-ac14-65a3ba50584c} + {23118103-c0c1-4697-b003-f983f8d827a3} diff --git a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj index 4b061bc42..4994803a9 100644 --- a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters index b7fe064ce..783e3a534 100644 --- a/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {bfc6d86f-c3d2-4c0d-8720-e30aa678b53b} + {d5e02d9f-310b-4cce-9050-b364e99426eb} - {08d124a4-c1b4-4f79-95ec-9560e1b6a09a} + {c92ffc3f-4c31-4763-ba2c-631e4650b03f} - {bcdbf43b-2e24-419a-974c-5094868b92c1} + {801f2629-d01a-4f4b-80c6-3e63c832198b} - {010011de-8787-48d7-9262-3ebbedfcfde9} + {a8a8466b-f86e-417a-a3dc-fce4929bfacb} - {d365732b-da1a-4c51-b8a2-a3d9f34336ab} + {22c0cc20-7fea-423c-b936-bcd151a845d6} - {461f3ace-2f28-4b10-a7b0-ebf4d51c1def} + {7cc83edb-8f78-446c-a325-7d8e5e97ca79} - {ff0e6952-1891-4081-a3b4-e082271eb89e} + {53d55f71-57dc-4d56-8783-e83fb3b33acc} - {16f21ead-bd05-481c-8184-6089f00f67a9} + {71cf4f8e-b277-4a67-9812-00f165e17631} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj index 0313ddaf7..a1eaf1577 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 798a7eab6..9aff85bf5 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {b40c191d-6fc1-4c72-a547-b7636f1cb473} + {7dc3e02c-7bc9-496f-9f67-809d12494cd5} - {d979874b-eb73-4e53-8cfb-82e09a34dcf0} + {a17dc7fa-e77e-4be1-a85e-a2a3d22084d5} - {5bdbe1ce-7301-4d77-acd8-74e3b89463ac} + {c5f13fbb-0934-4f98-bd7b-85bf940921fe} - {292ad638-5a0c-42bf-be7b-5b0cada7bf36} + {e2b5276c-4574-4492-8486-61ca88f134b7} - {75959cea-2683-487e-9485-52ee57108cf8} + {07036c49-3db1-48ab-b1de-863881f6c80e} - {14b0f4a1-277e-4cbb-a1fa-c2e46eba5697} + {bec1238e-e4c5-405e-9968-38bb87aa92ff} - {e2d02b31-f55a-4888-8671-a26b18313ffe} + {920bd212-4f9d-42eb-9d49-6146a36bb46b} - {d4bc4f83-a144-4d7f-937b-439c3569873c} + {028ded26-6021-420a-873d-01ebd2382b7a} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj index 13e76a8f6..882402eac 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -164,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -190,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -223,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -250,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -282,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 483998779..4012ee673 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {c650c45c-fc80-4c0b-8407-da4456ad3c5e} + {70f7e5a8-94d7-4eaa-a934-6e79e6a41e62} - {bff7f3c6-b734-46fb-b2fe-36d322dff473} + {a736498d-5928-4480-b3d5-15dc7fcc612e} - {b9341598-9c37-48c3-a601-b0ead0e3cf03} + {0a8564a2-b1da-4d80-bdc8-d681b513b1d8} - {271c27b9-456e-4b55-b0d3-33b8041978d5} + {24c13454-2a9f-4a66-baf9-80f89fd36761} - {5c560063-c857-478e-9c58-7813909887b4} + {dfee5080-782a-4056-9b51-7a261c23318c} - {b015183d-691f-4e41-a592-0bff7bc79f90} + {782753d3-191e-4d63-b03c-86e4216fa92f} - {65564cd7-4d1c-4d39-b809-751d431f74bf} + {2926e755-da48-49a0-b119-7b37bb0eabec} - {afbe09b0-8232-4eef-a9a8-89fe279bbc0a} + {9bf38178-379f-4024-be0c-340e58154111} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj index 5c73e6d86..ac912d4ed 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters index a81e9a646..168ddc997 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {79a8459f-cd4f-49f9-837c-0444c26b2130} + {a44ef1cf-0a20-4073-a94a-93d4c9260e98} - {8bb1b8fd-2661-469b-9e62-65d76fdaac11} + {b56af62c-8cd8-4710-b2d9-e8547520da2f} - {3f2ac34b-faba-4099-9216-14b328fd0605} + {95705496-7c3a-479f-8e49-277aa425b6b1} - {c7b56b93-7a12-46b5-9793-4dbbfe92f6b3} + {0d44909b-8d67-4cc5-8c23-d8d133bf793a} - {b6c0d446-484a-4a87-b034-16c0b3455ff4} + {a7d886e8-4911-4f7c-9be4-ad8668949a10} - {8ab7caeb-44fc-43f5-8e3c-b3aecd7f16f5} + {2bdf3067-4baa-499b-a114-eccee453bd1b} - {3cd90e61-2d7a-4fa9-b8b8-5d97d723767a} + {4602c026-5c0a-46e0-921e-6507e049fd8c} - {6984506e-845f-4e6e-b68f-10306abc5601} + {d2089a12-c95e-45ab-9308-02a1c7f90f13} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj index d22989e49..291f9b8dc 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters index 6a6bfd96e..9bc609165 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {45627996-2388-4d06-baf3-35f6bfbdaf9e} + {a859c211-5067-48f8-b4ca-6edd978ce297} - {13ed2d3f-3b14-4165-ae28-9762fc61b9e3} + {f5084fa9-1dc3-45a0-84be-c718d4c3a70a} - {4b3c2ae5-4cb8-4cf9-946d-1b87d976b86c} + {d44f55c7-c3fd-4986-8e1e-f1e5a8479760} - {aea184d5-afcb-4156-b7da-3821b9f95873} + {205ae173-e494-4300-a269-76dcfafad672} - {7e8d07b0-9eec-4c89-8ee2-d2932544e443} + {9b2952bc-8ddc-4f83-bb9d-2ee404796ed9} - {ad8ad9c4-0bf6-489a-a695-68d187e0982e} + {e926947c-6ade-49bc-977a-97d494b2e840} - {74155cd6-b51d-4009-a020-5115a2202c3d} + {b84e1c98-9ae8-4b41-9026-984a73a63bd2} - {61eda188-706e-409b-a209-e844ca1adc20} + {b52ce62f-9966-419e-a7ec-28d1abcefa9f} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj index fa7f70b42..04633a214 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters index e06c56b0e..4452b156e 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {5e5ef4a9-ca97-479e-a805-3c4e88154387} + {af9aaec1-6aeb-489e-b44b-fec7656768c7} - {f3d7c024-d129-4a67-816e-7a53c3fd0b30} + {f7209869-e5f2-4121-8d0c-7bcb24f51b1d} - {2fa1be0e-084b-4516-925a-5a44193ab9f6} + {2510b231-4ab4-4c6a-bb60-98b160a6c9cc} - {c7ebe9a1-4aa4-4247-91aa-3c63a996d08b} + {6471f70b-564c-4d57-8962-39692fb06ff4} - {f433069e-eb11-4660-bfc1-396080d69e02} + {6281b0de-da43-43c6-b69b-ad95bbd979b3} - {0a578778-74c0-43a1-9500-997734ea6e7c} + {2ff6f349-55ae-4a28-aed2-2dd61ee20143} - {ded90b0d-a29d-4fe8-a5ea-4e9429fa6616} + {acfb183d-cb27-4231-b571-29c1e3e7c16a} - {6dacd857-276c-4ea3-9a23-c59bf62e94fd} + {f26340c7-b714-4c1c-b22f-78305c1071d1} diff --git a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj index 868f9fee2..1b839d956 100644 --- a/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/MySQL/testsuite/TestSuite_x64_vs90.vcproj @@ -32,7 +32,7 @@ + OutputFile="..\..\lib\PocoDataODBCMTd.lib"/> + OutputFile="..\..\lib\PocoDataODBCMT.lib"/> + OutputFile="..\..\lib\PocoDataODBCMDd.lib"/> + OutputFile="..\..\lib\PocoDataODBCMD.lib"/> ..\..\lib\ obj\ODBC\$(Configuration)\ PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataODBCmtd.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataODBCMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataODBCmt.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataODBCMT.lib @@ -235,7 +237,7 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + ..\..\lib\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataODBCmdd.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib\PocoDataODBCMDd.lib @@ -271,7 +274,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib + ..\..\lib\PocoDataODBCMD.lib diff --git a/Data/ODBC/ODBC_vs100.vcxproj.filters b/Data/ODBC/ODBC_vs100.vcxproj.filters index 803e37a04..5b45c1ce1 100644 --- a/Data/ODBC/ODBC_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {e30fb377-decc-4c39-935a-a847e063c52a} + {2a957947-c752-4eed-9d47-24dbdf9bede2} - {74077f39-7c93-4e6d-af52-6521d414bf8b} + {e4dde767-bf30-4f67-9a69-1261009e5ee2} - {6f5b2e8d-12be-40de-b1a0-7dc7ac54e36d} + {f038d876-83c6-4b4e-a5b1-a7e017e54a8e} diff --git a/Data/ODBC/ODBC_vs110.vcxproj b/Data/ODBC/ODBC_vs110.vcxproj index b165f8170..4ea455080 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj +++ b/Data/ODBC/ODBC_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin\ @@ -202,7 +202,7 @@ Default - ..\..\lib\PocoDataODBCmtd.lib + ..\..\lib\PocoDataODBCMTd.lib @@ -226,7 +226,7 @@ Default - ..\..\lib\PocoDataODBCmt.lib + ..\..\lib\PocoDataODBCMT.lib @@ -243,13 +243,13 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + ..\..\lib\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataODBCmdd.lib + ..\..\lib\PocoDataODBCMDd.lib @@ -275,7 +275,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib + ..\..\lib\PocoDataODBCMD.lib diff --git a/Data/ODBC/ODBC_vs110.vcxproj.filters b/Data/ODBC/ODBC_vs110.vcxproj.filters index 25fbefb53..7685b2a2e 100644 --- a/Data/ODBC/ODBC_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {96dbe5ee-3061-4826-b685-21bf48acd67d} + {3326f331-d1de-4b06-9d47-a8ad46582ec1} - {840404eb-3d4a-4b83-94fe-bf52005ec99f} + {5c25196d-e42f-4a10-a9ff-45d561c622c0} - {8fb6c137-8f26-4c11-8bcc-79cac47760de} + {04c874af-8e18-4f2c-8f9e-1e1d7bad93c6} diff --git a/Data/ODBC/ODBC_vs120.vcxproj b/Data/ODBC/ODBC_vs120.vcxproj index 78876ec8d..c1590ba62 100644 --- a/Data/ODBC/ODBC_vs120.vcxproj +++ b/Data/ODBC/ODBC_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin\ @@ -202,7 +202,7 @@ Default - ..\..\lib\PocoDataODBCmtd.lib + ..\..\lib\PocoDataODBCMTd.lib @@ -226,7 +226,7 @@ Default - ..\..\lib\PocoDataODBCmt.lib + ..\..\lib\PocoDataODBCMT.lib @@ -243,13 +243,13 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + ..\..\lib\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataODBCmdd.lib + ..\..\lib\PocoDataODBCMDd.lib @@ -275,7 +275,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib + ..\..\lib\PocoDataODBCMD.lib diff --git a/Data/ODBC/ODBC_vs120.vcxproj.filters b/Data/ODBC/ODBC_vs120.vcxproj.filters index 27531c2e3..e8559abfc 100644 --- a/Data/ODBC/ODBC_vs120.vcxproj.filters +++ b/Data/ODBC/ODBC_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {e0b5873a-105b-4e8f-929d-47c7e92ba2dd} + {894e346f-1aa5-4e3d-a009-59c5fe008750} - {015320b7-bba6-4071-9d90-2b3313a9868f} + {db4a9605-3685-4490-9e21-4fc980540221} - {0d942bb1-40d6-416a-9bb9-6aea2b63596f} + {ca2c98e5-a4c5-47a9-92ee-0d776f17565d} diff --git a/Data/ODBC/ODBC_vs140.vcxproj b/Data/ODBC/ODBC_vs140.vcxproj index f9e2e2213..d83015185 100644 --- a/Data/ODBC/ODBC_vs140.vcxproj +++ b/Data/ODBC/ODBC_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin\ @@ -202,7 +202,7 @@ Default - ..\..\lib\PocoDataODBCmtd.lib + ..\..\lib\PocoDataODBCMTd.lib @@ -226,7 +226,7 @@ Default - ..\..\lib\PocoDataODBCmt.lib + ..\..\lib\PocoDataODBCMT.lib @@ -243,13 +243,13 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + ..\..\lib\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataODBCmdd.lib + ..\..\lib\PocoDataODBCMDd.lib @@ -275,7 +275,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib + ..\..\lib\PocoDataODBCMD.lib diff --git a/Data/ODBC/ODBC_vs140.vcxproj.filters b/Data/ODBC/ODBC_vs140.vcxproj.filters index b0e6b07fa..7e06a674a 100644 --- a/Data/ODBC/ODBC_vs140.vcxproj.filters +++ b/Data/ODBC/ODBC_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {2da3e13f-dfa9-4ef3-bbe9-76d000814db9} + {1404f82a-aefd-4fe4-8516-527a21a7e4e4} - {162e9fa9-a051-4a97-9f75-ea99efce4933} + {7cd005a8-92bc-4b48-9504-ec00bcdfb64a} - {0f8cd624-0828-4a47-a954-98490057bfc8} + {ada89a2a-413b-4168-b8dc-b989693b569a} diff --git a/Data/ODBC/ODBC_vs150.vcxproj b/Data/ODBC/ODBC_vs150.vcxproj index 57ac3b4cb..62d91e78c 100644 --- a/Data/ODBC/ODBC_vs150.vcxproj +++ b/Data/ODBC/ODBC_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataODBCd - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin\ @@ -202,7 +202,7 @@ Default - ..\..\lib\PocoDataODBCmtd.lib + ..\..\lib\PocoDataODBCMTd.lib @@ -226,7 +226,7 @@ Default - ..\..\lib\PocoDataODBCmt.lib + ..\..\lib\PocoDataODBCMT.lib @@ -243,13 +243,13 @@ true true - ..\..\lib\PocoDataODBCmdd.pdb + ..\..\lib\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataODBCmdd.lib + ..\..\lib\PocoDataODBCMDd.lib @@ -275,7 +275,7 @@ odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - ..\..\lib\PocoDataODBCmd.lib + ..\..\lib\PocoDataODBCMD.lib diff --git a/Data/ODBC/ODBC_vs150.vcxproj.filters b/Data/ODBC/ODBC_vs150.vcxproj.filters index ec39bf760..c921669a0 100644 --- a/Data/ODBC/ODBC_vs150.vcxproj.filters +++ b/Data/ODBC/ODBC_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {2a0eb393-c771-40d4-bdee-85bd67176c94} + {7a4fa54b-8bdf-4c8f-bad9-99ad64261a72} - {2ad89069-1541-4bff-bc90-b23f83515d99} + {5b5544e4-caa7-4fd0-a4a7-857307926353} - {dd17e5af-717e-410b-b112-5092f927728a} + {9765636b-d5b4-4a3f-9a8d-42891d3a8490} diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj b/Data/ODBC/ODBC_x64_vs100.vcxproj index 1dfc0f829..0d190d594 100644 --- a/Data/ODBC/ODBC_x64_vs100.vcxproj +++ b/Data/ODBC/ODBC_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\..\lib64\ obj64\ODBC\$(Configuration)\ PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataODBCmtd.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib64\PocoDataODBCMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataODBCmt.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib64\PocoDataODBCMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + ..\..\lib64\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataODBCmdd.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib64\PocoDataODBCMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataODBCmd.lib + odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + ..\..\lib64\PocoDataODBCMD.lib + MachineX64 diff --git a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters index 6f8ca9204..d699e355d 100644 --- a/Data/ODBC/ODBC_x64_vs100.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {a75ad312-6ca2-4bf7-96d6-5637d7e71a33} + {5eb96d59-8c64-4af3-acb6-d5f9ce60c2c9} - {21470592-158f-4e5f-8397-9f17cafc69ae} + {83d0e86a-a852-4e98-a838-f1009bdf2380} - {8777626b-4c57-4ddd-a520-5c8155064737} + {504d4805-8ab6-479e-9975-7bf96c2ffe26} diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj b/Data/ODBC/ODBC_x64_vs110.vcxproj index 3f68a8c24..60ff079fb 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin64\ @@ -202,7 +202,8 @@ Default - ..\..\lib64\PocoDataODBCmtd.lib + ..\..\lib64\PocoDataODBCMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\..\lib64\PocoDataODBCmt.lib + ..\..\lib64\PocoDataODBCMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + ..\..\lib64\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataODBCmdd.lib + ..\..\lib64\PocoDataODBCMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\..\lib64\PocoDataODBCmd.lib + ..\..\lib64\PocoDataODBCMD.lib + MachineX64 diff --git a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters index 928a5cc46..dc8bcd5f2 100644 --- a/Data/ODBC/ODBC_x64_vs110.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {c676049f-3eac-4ad7-8c54-6f23862ed228} + {48501ea8-6bee-43de-b6ab-d6ffb71a28cb} - {b6325e0f-673e-417e-a933-cc41fafa57fa} + {4d2e7070-263b-4cec-abe6-475bb8c6ba99} - {a28943ec-4715-441f-bd7d-56259eda27cc} + {46dd7b11-9383-4bf7-bf0b-0b7a089578c0} diff --git a/Data/ODBC/ODBC_x64_vs120.vcxproj b/Data/ODBC/ODBC_x64_vs120.vcxproj index 1ff80c2b7..a538c4c1c 100644 --- a/Data/ODBC/ODBC_x64_vs120.vcxproj +++ b/Data/ODBC/ODBC_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin64\ @@ -202,7 +202,8 @@ Default - ..\..\lib64\PocoDataODBCmtd.lib + ..\..\lib64\PocoDataODBCMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\..\lib64\PocoDataODBCmt.lib + ..\..\lib64\PocoDataODBCMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + ..\..\lib64\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataODBCmdd.lib + ..\..\lib64\PocoDataODBCMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\..\lib64\PocoDataODBCmd.lib + ..\..\lib64\PocoDataODBCMD.lib + MachineX64 diff --git a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters index bc57ecb1c..77def9fc5 100644 --- a/Data/ODBC/ODBC_x64_vs120.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {085b1467-f8d6-4e79-b0d1-3d45e142e39a} + {30c22f1f-dbe9-4af8-bd31-cbe8a47e4603} - {73eaaaf8-1bcb-4b9e-a037-c70f5dc987ad} + {7a61beb6-fc03-433e-a0ba-484b9b112828} - {cfb3df2a-9278-4744-bb50-bfbe1d2ceb54} + {f3eecee5-46ab-4dc1-857b-2e82f179b2eb} diff --git a/Data/ODBC/ODBC_x64_vs140.vcxproj b/Data/ODBC/ODBC_x64_vs140.vcxproj index b38075e45..62cbcd61f 100644 --- a/Data/ODBC/ODBC_x64_vs140.vcxproj +++ b/Data/ODBC/ODBC_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin64\ @@ -202,7 +202,8 @@ Default - ..\..\lib64\PocoDataODBCmtd.lib + ..\..\lib64\PocoDataODBCMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\..\lib64\PocoDataODBCmt.lib + ..\..\lib64\PocoDataODBCMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + ..\..\lib64\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataODBCmdd.lib + ..\..\lib64\PocoDataODBCMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\..\lib64\PocoDataODBCmd.lib + ..\..\lib64\PocoDataODBCMD.lib + MachineX64 diff --git a/Data/ODBC/ODBC_x64_vs140.vcxproj.filters b/Data/ODBC/ODBC_x64_vs140.vcxproj.filters index efd7b0c6e..57c836f7f 100644 --- a/Data/ODBC/ODBC_x64_vs140.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {042fc032-b2af-4426-8b11-93bc4e13d453} + {c5be108d-0648-41c1-82f3-18034d3fcb0d} - {99aca2ee-3a43-4f73-a844-5766d443e399} + {cadeb613-a243-4fb8-bed8-5c2373ce7cb5} - {547188ca-f576-495c-bd1e-d7bcd5886121} + {dfde76ce-6cd2-48f4-a93b-122d8d408be2} diff --git a/Data/ODBC/ODBC_x64_vs150.vcxproj b/Data/ODBC/ODBC_x64_vs150.vcxproj index 6794c5e02..0137394d8 100644 --- a/Data/ODBC/ODBC_x64_vs150.vcxproj +++ b/Data/ODBC/ODBC_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataODBC64d - PocoDataODBCmdd - PocoDataODBCmtd + PocoDataODBCMDd + PocoDataODBCMTd PocoDataODBC64 - PocoDataODBCmd - PocoDataODBCmt + PocoDataODBCMD + PocoDataODBCMT ..\..\bin64\ @@ -202,7 +202,8 @@ Default - ..\..\lib64\PocoDataODBCmtd.lib + ..\..\lib64\PocoDataODBCMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\..\lib64\PocoDataODBCmt.lib + ..\..\lib64\PocoDataODBCMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\..\lib64\PocoDataODBCmdd.pdb + ..\..\lib64\PocoDataODBCMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataODBCmdd.lib + ..\..\lib64\PocoDataODBCMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\..\lib64\PocoDataODBCmd.lib + ..\..\lib64\PocoDataODBCMD.lib + MachineX64 diff --git a/Data/ODBC/ODBC_x64_vs150.vcxproj.filters b/Data/ODBC/ODBC_x64_vs150.vcxproj.filters index b46e1a439..7657c46f2 100644 --- a/Data/ODBC/ODBC_x64_vs150.vcxproj.filters +++ b/Data/ODBC/ODBC_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {fd6f2fcd-25c7-49dd-9519-1ea82fcb402d} + {676ede08-39bd-49ce-a3a0-6106008c8ce5} - {edeb8057-decd-4aac-bedf-59392999578a} + {9439cbb5-38e3-4c90-83fa-d2beefac8258} - {28a68bce-488e-4143-ab9f-dd337ab8e96f} + {b7b60dc7-8789-4989-892f-85e333bc881a} diff --git a/Data/ODBC/ODBC_x64_vs90.vcproj b/Data/ODBC/ODBC_x64_vs90.vcproj index df03d6726..bdf3c294a 100644 --- a/Data/ODBC/ODBC_x64_vs90.vcproj +++ b/Data/ODBC/ODBC_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\..\lib64\PocoDataODBCmtd.pdb" + ProgramDataBaseFileName="..\..\lib64\PocoDataODBCMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,7 +201,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\..\lib64\PocoDataODBCmdd.pdb" + ProgramDataBaseFileName="..\..\lib64\PocoDataODBCMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index 80ba5508c..d9ed748c8 100644 --- a/Data/ODBC/testsuite/TestSuite.progen +++ b/Data/ODBC/testsuite/TestSuite.progen @@ -7,4 +7,4 @@ vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include -vc.project.linker.dependencies = odbc32.lib odbccp32.lib +vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib diff --git a/Data/ODBC/testsuite/TestSuite_VS90.vcproj b/Data/ODBC/testsuite/TestSuite_VS90.vcproj index e4b53cd70..e8678b973 100644 --- a/Data/ODBC/testsuite/TestSuite_VS90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_VS90.vcproj @@ -199,7 +199,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters index 13ddd0eb2..14ab3cda0 100644 --- a/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {5dd0c62a-400e-4588-96b9-7452adfd24b9} + {be2ef15f-65ae-437c-9304-3e05b7b40692} - {5b1517f7-9c17-47cd-b7f7-e5bdb773dee7} + {0e0ed096-a09c-4a27-9d2e-c86214e8092b} - {8125c62c-4050-43b0-9577-2ab9bd9be56b} + {eb07f94b-2fd0-4dc0-8c65-45153d9b8ae9} - {d161d431-df6d-4047-84d4-1a839c4ce1a1} + {dba99659-3492-4d9d-a2ff-940ee34ea82d} - {4b0e7f3b-ebc3-4693-ab00-70fce4e6787c} + {6a5dca8c-017c-443b-a899-24da8686fe31} - {af2ef720-df32-433e-a584-46efbc6a7a4b} + {c4f69d74-0332-47a3-9e96-9a73a6d4c896} - {8bc7d2bf-77de-484a-8807-2d505f10beb5} + {2467d9b2-4561-45ac-a493-3b26e8038505} - {0ad7820d-9e82-420d-bfe0-cfbc2449f5a6} + {3e23130c-1fb7-41bb-8699-ffda9feaeedd} diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj index 169af6c62..2284e7354 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters index 9795bb6c3..5dcd9f2a5 100644 --- a/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {dfe2a695-a99f-4d3f-b727-34da88410bf1} + {411f6aa8-2cb4-4ad9-82af-4c12cf046a07} - {3dceed7f-582f-4da3-9959-ab21c66a0a28} + {3b129c56-f254-4e77-984a-0357ca736333} - {fb17d90b-5b73-42c0-b715-8531f4278d30} + {8c984444-9c15-4ff9-9a8c-eb23ef135a0c} - {107e80b6-2529-402d-8044-17cb6ce558e6} + {dca1cea7-6494-45cf-8409-e97013ede6f3} - {54de5d80-0802-420d-bd9b-99a144922ad6} + {cbc34793-7948-4cad-8a5b-d6c72ee894a3} - {889a7a33-7f36-4dce-aae6-b1fe93ad833b} + {6822e3f2-dd78-4b05-b1d0-1b9f33dc05ee} - {cbd40839-ff26-4fe0-a20c-30d86b5301de} + {1c3e160b-c07a-4f99-9a69-28e2002779ea} - {1822d2ed-943c-4349-a262-3b2df724382a} + {bc595915-451a-430e-a3cc-f9d8e9c40001} diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj index 34c8365ea..46c6db69b 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters index 4c294b691..778c71973 100644 --- a/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {cd2050be-9828-4918-90ce-ecc2a5acd0d0} + {9bd38c03-540c-4222-b8e9-2feaa04ec66c} - {3a029714-b97d-4703-9ef2-ba2c8d67ff9a} + {03274330-cda8-4e5a-ae8c-6c144fa36080} - {1f0f9715-103c-446d-b2a3-f8df1e020ea2} + {afd5f048-ea7b-41cd-8458-8de989a4aa7d} - {1c19af38-aa12-4ad2-a780-826250a2a28a} + {c3ea6387-286d-4368-acab-164085b45d69} - {daa1de56-b939-44cc-8725-bfbbc47f769b} + {be4c390a-c239-4620-a7ef-e0cc2637a011} - {8ab1ef47-ffdd-45d8-a76b-2d07e56273f7} + {ff63c5fe-5f29-4d86-a7a3-1e7bbdd63591} - {dd041c46-a0dc-4b48-b1bb-6ab2e3fac5db} + {e527bc8d-db98-4af6-ae6d-7e8a985f61d5} - {acf6eea5-d849-4da1-8182-48f2e09a1366} + {31bf41bf-97ed-4dbc-b832-0130ff0d1716} diff --git a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj index 6bc0d0697..b0a804eb5 100644 --- a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters index 066ff7518..75301881b 100644 --- a/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {a9d5b620-0ae8-4b16-97d0-8dade44fa4f1} + {c5a82738-d310-4d75-bd95-ed1541c56a13} - {ef1578b3-0594-484e-a8a6-4ccf09e5cbbf} + {3b2f2d8c-b37a-42db-9940-bb590c7bd86e} - {e708fa86-9f2c-4b68-b9e0-efe8fb921cbb} + {ef71ab27-06f7-40c9-b030-49c811b3b967} - {32fa5817-8f82-4a77-b8e1-10b6bb547439} + {8bfeddc1-b28f-4746-8329-19dbf45d6632} - {c93a04ca-0269-4527-ac39-27ed3a0fd7a6} + {8e01d40e-5dce-45bc-a405-ff6a2c2b7960} - {04a4d009-4b58-478e-950f-33512a55d4f6} + {f622c152-f4f4-4c64-8753-15deecc49abb} - {3800fdec-31b3-4785-bc2f-51dea38d29b5} + {c0ff2297-f20a-4099-8e0a-bd78e1ff0fc7} - {65dfe213-1e02-4b59-8c1a-60e895939bfd} + {d005a834-0d35-428a-b06a-6c32a777a450} diff --git a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj index c67a5c426..6614c49ac 100644 --- a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters index 7f0d57ef0..a65f3748c 100644 --- a/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {296d1eae-4cbe-488c-8570-c252fc17f927} + {b0ff1abc-1d30-4fbb-94fd-4e0421e54257} - {0b7bae8e-50ae-4004-8223-bffb0c69e0b4} + {4ac5c4de-60bb-4f50-ae06-54ef5217a32f} - {4520ee06-10d3-447f-a331-9b2a6aa4a937} + {afbf35ed-b008-4f8c-b2f0-42f72c8c3713} - {b62e8ce3-8d8a-44cc-bbdd-0e218cd9f64f} + {8f50b99b-f878-42b8-af86-bb431f2e85d0} - {5e7556fc-d001-4755-9105-6affd63082d5} + {095e468c-1c86-4c43-bda2-7ca338ab9583} - {afbd747b-b823-4ac2-9b36-6e144cdd81bd} + {a180e4b4-6c3a-492a-9abf-038a1e4ecb9e} - {5df335a1-4779-477e-9788-8817538e1440} + {0aa8ae80-3d2e-470d-905f-9cfedfc6de49} - {2e263f7d-66b5-4e2a-b9f0-d1f0930ef865} + {a3059593-3cbe-4f88-9f4a-8f6b8db7f288} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj index 25b9b807a..b61bab1eb 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters index c1dadb145..3be5d65a7 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {14bee51f-ec6e-460f-8fd7-ca647ce1afe7} + {3f84029c-107d-4fb1-b3de-ddc56eee5eec} - {31ad35ab-9792-4a5a-bad9-9d181abdf05e} + {3e071517-cdb2-4c67-b8f9-06eac606ad79} - {965b189e-87a3-477a-8e48-0adc6dbb31a2} + {63b42910-45b0-43e0-aa09-b535d4d49ed3} - {0709274e-13c4-434d-91bf-80541f299fc8} + {2a52b254-df0b-492c-a69b-6632f1b45d7f} - {b1e434a3-cf55-4559-a3f5-540c0ba5b2b2} + {99be4f89-bd80-4cf2-b1dd-71458e6c99ca} - {6d85760d-9bb0-480e-b8e3-2de8bca10dc4} + {ec922f41-0d07-4e81-83bd-0bd327d27ab6} - {c9461886-05de-4759-ac1f-1f393860cfb7} + {b6da8882-4003-4d4c-b88d-e94eacf2e64f} - {eb0f0e87-e7cb-43c6-bd5f-a23e34be8e1d} + {14e65606-7871-4319-add7-3232891bedbc} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj index 058ed5320..b97c5ece6 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters index ec1bbfcbc..3a7f125d5 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {74f7cd2b-bb66-424a-b879-575e46f8065d} + {9441146d-f197-4650-b2fd-e802b5191951} - {e54cfe9c-395b-4fa0-9c92-2acaaaf5ab28} + {b6fb677b-bd54-4792-a1c9-f0db82c66b4a} - {cd16e3dc-247d-469e-95e1-c4f91f3ca25b} + {a2556efc-ee05-4d4c-9fa9-1f15cd5c093b} - {20ea9db4-f370-4321-bc4f-a65986c9e39a} + {8b9071da-edd0-4aa7-82f7-79ce9f4f9446} - {8f2df928-ea10-47e2-b508-f9b66976a995} + {0726bfd0-ef07-49ce-a782-aca4e57190d4} - {157b54ea-1f36-4f2b-b31d-a01f7605ba22} + {42b844ed-a53c-46ed-833a-4f288b261958} - {07cfa525-521e-4f99-ba18-9446fe1c7df4} + {c405b1a0-cad4-4778-bbf4-eae4e72a6f4f} - {ba02ebfc-0956-41af-a567-a41c76e70cf7} + {069dfd2b-90b9-4234-aeae-5757c597d542} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj index 02e324d63..d0cf6f5fd 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters index 0742607dc..19c5bae04 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {5abd0be4-4644-4820-9773-274b5645224e} + {e42840f7-3634-4a69-bd7a-e08fd28f3736} - {02d6e074-d96c-4b0d-8cb6-343a92c8bba6} + {4ee15d91-b40e-4ad2-8b90-9e0e3e02af69} - {85dfa446-e3e0-49d8-ad46-4391217cdac3} + {c482daaf-7a83-47c1-a639-8d6f79d71ce6} - {58d50537-8b0c-43f3-b5d6-382f506ba438} + {1819abbb-dc24-451b-9c6d-56010da3ed01} - {8b7c8288-7e58-446f-aae1-526ed5c3a2d1} + {66daea23-0b03-484f-818b-2ef38dfd9cc9} - {d60f0a2a-7a4f-4200-bd0b-7189a0de2b90} + {ec13db41-80dd-490f-bbf0-f3622beb6bdb} - {bc628091-c79c-4eb0-bb7a-b9a043194527} + {012475c1-80bc-4857-bf81-b77b9214ed1c} - {35ac10c1-f447-4e1b-b3bb-26d7c933b282} + {bf180419-1c4a-485e-98d7-eef167fb6b75} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj index b1da249fc..798f1ca0d 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters index d3c937a71..4acdd2a2f 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {8ab601aa-5e4d-448a-938f-35b914a86c5e} + {995cacc5-7d4a-4006-a40c-c04fc0b363a3} - {7c5c81de-ddd7-480e-a948-170e608fd3cb} + {34e55007-137f-471e-9c80-12289f9d4484} - {3ca239a5-a66b-4f4d-ab99-35c88dc9393d} + {f2e5aa19-5297-4753-bcbd-616a7c297d61} - {a6c93e7a-53e4-4b01-802b-5d699086b70c} + {b28e0511-3b9f-4fcd-bf86-891abe2dd53c} - {4ac4043d-5648-4460-9ca1-7882e3a25bca} + {14a9ee09-7129-4d6a-aaf9-881dc1836b27} - {4936075b-14c5-4a3e-8816-04e5c19db8bf} + {6e8a3ec1-913a-438b-bc79-d6f3ece6641f} - {a3621585-1dca-46b1-b382-54691914d656} + {45009a33-a683-406e-8582-e1629dd1bbcf} - {3950487d-3aee-4129-82f2-7f1f8dc16db4} + {e6cd4140-8641-42b5-85a5-37bbe679a539} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj index 8bd5dcbea..4b3ff281d 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,7 +142,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - odbc32.lib;odbccp32.lib;%(AdditionalDependencies) + odbc32.lib;odbccp32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters index 198590b4f..5b343f931 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {303fbfcf-f1ac-40e9-9651-ae6f6f87e7d3} + {46e6411d-2cb9-4f5b-af23-054a5333b928} - {1bbbf7ac-7865-4c2d-ae73-3136226926a4} + {cef154ec-7044-46ce-8230-dd4ce9cb8a69} - {a487a6ef-e9d8-4042-8a72-5a89f3737df4} + {e4908151-a932-4dfb-81d9-870798c0339f} - {47dca9f5-5928-4164-8d80-f3a54895598a} + {d12e74ea-4445-4c70-82af-f89cc4811ec4} - {5e71d2b3-a13c-485e-884f-acc3e198987d} + {9f532307-3b1f-4d49-a8fe-bc2d4d5410c4} - {ab77f342-779a-4a11-a5ec-82c7e51fd1cc} + {2776ed2b-aae1-4fba-9e5a-86333f9d0bfa} - {bf5cc629-5b89-42a9-9516-fac492f0a37d} + {c8e923cb-bf23-4f21-acb5-195dffe8ba8d} - {8576fc64-2e86-49c9-85b7-186adbe141dc} + {eb218732-adca-4adb-a54d-ea31bdc0080b} diff --git a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj index 37ce536c8..89849583e 100644 --- a/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/ODBC/testsuite/TestSuite_x64_vs90.vcproj @@ -199,7 +199,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\..\lib\PocoDataPostgreSQLMTd.lib"/> + OutputFile="..\..\lib\PocoDataPostgreSQLMT.lib"/> + OutputFile="..\..\lib\PocoDataPostgreSQLMDd.lib"/> + OutputFile="..\..\lib\PocoDataPostgreSQLMD.lib"/> ..\..\lib\ obj\PostgreSQL\$(Configuration)\ PocoDataPostgreSQLd - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT @@ -207,7 +207,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataPostgreSQLmtd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataPostgreSQLMTd.lib @@ -238,7 +239,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataPostgreSQLmt.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataPostgreSQLMT.lib @@ -260,7 +262,7 @@ exit 0 true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + ..\..\lib\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default @@ -268,7 +270,8 @@ exit 0 %(AdditionalOptions) - ..\..\lib\PocoDataPostgreSQLmdd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataPostgreSQLMDd.lib @@ -301,7 +304,7 @@ exit 0 %(AdditionalDependencies) - ..\..\lib\PocoDataPostgreSQLmd.lib + ..\..\lib\PocoDataPostgreSQLMD.lib diff --git a/Data/PostgreSQL/PostgreSQL_vs110.vcxproj b/Data/PostgreSQL/PostgreSQL_vs110.vcxproj index d1e707330..1dca1a6c8 100644 --- a/Data/PostgreSQL/PostgreSQL_vs110.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataPostgreSQLd - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmtd.lib + ..\..\lib\PocoDataPostgreSQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmt.lib + ..\..\lib\PocoDataPostgreSQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + ..\..\lib\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataPostgreSQLmdd.lib + ..\..\lib\PocoDataPostgreSQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmd.lib + ..\..\lib\PocoDataPostgreSQLMD.lib diff --git a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj index ff83e7252..db67bd0b9 100644 --- a/Data/PostgreSQL/PostgreSQL_vs120.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataPostgreSQLd - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmtd.lib + ..\..\lib\PocoDataPostgreSQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmt.lib + ..\..\lib\PocoDataPostgreSQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + ..\..\lib\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataPostgreSQLmdd.lib + ..\..\lib\PocoDataPostgreSQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmd.lib + ..\..\lib\PocoDataPostgreSQLMD.lib diff --git a/Data/PostgreSQL/PostgreSQL_vs140.vcxproj b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj index 8bda1faa9..8697fd9ea 100644 --- a/Data/PostgreSQL/PostgreSQL_vs140.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataPostgreSQLd - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmtd.lib + ..\..\lib\PocoDataPostgreSQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmt.lib + ..\..\lib\PocoDataPostgreSQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + ..\..\lib\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataPostgreSQLmdd.lib + ..\..\lib\PocoDataPostgreSQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmd.lib + ..\..\lib\PocoDataPostgreSQLMD.lib diff --git a/Data/PostgreSQL/PostgreSQL_vs150.vcxproj b/Data/PostgreSQL/PostgreSQL_vs150.vcxproj index ec823f325..ce679ecb1 100644 --- a/Data/PostgreSQL/PostgreSQL_vs150.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataPostgreSQLd - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin\ @@ -215,7 +215,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmtd.lib + ..\..\lib\PocoDataPostgreSQLMTd.lib @@ -244,7 +244,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmt.lib + ..\..\lib\PocoDataPostgreSQLMT.lib @@ -266,13 +266,13 @@ exit 0 true true - ..\..\lib\PocoDataPostgreSQLmdd.pdb + ..\..\lib\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib\PocoDataPostgreSQLmdd.lib + ..\..\lib\PocoDataPostgreSQLMDd.lib @@ -302,7 +302,7 @@ exit 0 Default - ..\..\lib\PocoDataPostgreSQLmd.lib + ..\..\lib\PocoDataPostgreSQLMD.lib diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs100.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs100.vcxproj index 11395bda6..df6c32462 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs100.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\..\lib64\ obj64\PostgreSQL\$(Configuration)\ PocoDataPostgreSQL64d - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL64 - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT @@ -207,7 +207,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataPostgreSQLmtd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataPostgreSQLMTd.lib + MachineX64 @@ -238,7 +240,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataPostgreSQLmt.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataPostgreSQLMT.lib + MachineX64 @@ -260,7 +264,7 @@ exit 0 true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + ..\..\lib64\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default @@ -268,7 +272,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataPostgreSQLmdd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataPostgreSQLMDd.lib + MachineX64 @@ -299,7 +305,9 @@ exit 0 %(AdditionalOptions) - ..\..\lib64\PocoDataPostgreSQLmd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataPostgreSQLMD.lib + MachineX64 diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs110.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs110.vcxproj index 452a0b2ff..379777c86 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs110.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataPostgreSQL64d - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL64 - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmtd.lib + ..\..\lib64\PocoDataPostgreSQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmt.lib + ..\..\lib64\PocoDataPostgreSQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + ..\..\lib64\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataPostgreSQLmdd.lib + ..\..\lib64\PocoDataPostgreSQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmd.lib + ..\..\lib64\PocoDataPostgreSQLMD.lib + MachineX64 diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj index 8930e51f9..c0759c0d8 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataPostgreSQL64d - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL64 - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmtd.lib + ..\..\lib64\PocoDataPostgreSQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmt.lib + ..\..\lib64\PocoDataPostgreSQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + ..\..\lib64\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataPostgreSQLmdd.lib + ..\..\lib64\PocoDataPostgreSQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmd.lib + ..\..\lib64\PocoDataPostgreSQLMD.lib + MachineX64 diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj index a934d2e87..93f3d353d 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataPostgreSQL64d - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL64 - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmtd.lib + ..\..\lib64\PocoDataPostgreSQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmt.lib + ..\..\lib64\PocoDataPostgreSQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + ..\..\lib64\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataPostgreSQLmdd.lib + ..\..\lib64\PocoDataPostgreSQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmd.lib + ..\..\lib64\PocoDataPostgreSQLMD.lib + MachineX64 diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj b/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj index 36533be59..20692a298 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataPostgreSQL64d - PocoDataPostgreSQLmdd - PocoDataPostgreSQLmtd + PocoDataPostgreSQLMDd + PocoDataPostgreSQLMTd PocoDataPostgreSQL64 - PocoDataPostgreSQLmd - PocoDataPostgreSQLmt + PocoDataPostgreSQLMD + PocoDataPostgreSQLMT ..\..\bin64\ @@ -215,7 +215,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmtd.lib + ..\..\lib64\PocoDataPostgreSQLMTd.lib + MachineX64 @@ -244,7 +245,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmt.lib + ..\..\lib64\PocoDataPostgreSQLMT.lib + MachineX64 @@ -266,13 +268,14 @@ exit 0 true true - ..\..\lib64\PocoDataPostgreSQLmdd.pdb + ..\..\lib64\PocoDataPostgreSQLMDd.pdb Level3 ProgramDatabase Default - ..\..\lib64\PocoDataPostgreSQLmdd.lib + ..\..\lib64\PocoDataPostgreSQLMDd.lib + MachineX64 @@ -301,7 +304,8 @@ exit 0 Default - ..\..\lib64\PocoDataPostgreSQLmd.lib + ..\..\lib64\PocoDataPostgreSQLMD.lib + MachineX64 diff --git a/Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj b/Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj index 73ed27dd3..59d056eef 100644 --- a/Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj +++ b/Data/PostgreSQL/PostgreSQL_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> @@ -264,7 +264,7 @@ Name="VCPreLinkEventTool"/> @@ -308,7 +308,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\..\lib64\PocoDataPostgreSQLmdd.pdb" + ProgramDataBaseFileName="..\..\lib64\PocoDataPostgreSQLMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -323,7 +323,7 @@ Name="VCPreLinkEventTool"/> @@ -383,7 +383,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Data/PostgreSQL/testsuite/TestSuite.progen b/Data/PostgreSQL/testsuite/TestSuite.progen index ff966577a..4e0ec3cce 100644 --- a/Data/PostgreSQL/testsuite/TestSuite.progen +++ b/Data/PostgreSQL/testsuite/TestSuite.progen @@ -9,7 +9,7 @@ vc.project.prototype = TestSuite_vs90.vcproj postgresql = ${vc.project.pocobase}\\postgresql vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include;${vc.project.pocobase}\\Data\\include vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS -vc.project.linker.dependencies = +vc.project.linker.dependencies = iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = vc.project.linker.dependencies.debug_static_md = diff --git a/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj index 968c7a666..78c94e533 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {aa897198-28ec-4998-8b72-382245dd2735} + {81237c91-f6d8-4cd4-94ad-e4487b9e7e2a} - {102789c0-9cb2-4ad7-80fe-431f58653852} + {8519ea4b-2e8f-4157-8406-d162abeed085} - {c7626815-71a6-4122-9a56-cce842ecf9e0} + {4c958ab0-c0de-4f06-adea-c56d1e7b63ae} - {6142a588-cc14-49b3-87a2-3a80e99b8aac} + {e7762e79-f57b-412b-bbcd-3180dc781b0a} - {932f527f-3f29-42ff-b049-e7d7a2a84542} + {d3e83d8f-c787-43ac-953e-79b7e9dfb09f} - {e541abd8-25d3-433d-b655-c4f2d1a73505} + {d797b8db-871b-42f5-8418-907f97177aa5} - {472600f8-cf4a-4175-a3d2-827529fb3cc6} + {347c5bb3-bf73-472c-816a-d9022bd7f9e5} - {304f67f1-356f-4a66-bc35-ff8024e9fbb2} + {319f8e20-f290-49b0-9e7e-4430d4e294a8} diff --git a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 095715705..c6643a834 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {1e189d0a-1611-4560-9bef-f9919762d57b} + {98d956cf-4928-47fe-a4ef-2e36bf0729d6} - {1481426b-9c61-4fb7-b4b2-0d4392c96fbf} + {8144d47d-8d69-418b-a61f-a42d0a737c8d} - {d539313b-9073-4bdf-949c-50c42c8b2f1c} + {758a1711-b334-4a08-a694-0432439ff724} - {b048f657-7523-49f9-9cd8-2c66c235c6a5} + {0a4ae524-8f9d-472a-9bf6-871db416de03} - {3dbf1d2c-91fa-44b1-83f3-840d0fe6cdc5} + {cf7b283b-e08b-4672-aceb-7b069b8b1309} - {75699732-bb6d-4562-9681-ffcf99b6e495} + {6fa6b3fd-95d3-40c8-aad0-98d7c6bc8301} - {3ed07339-c31b-465b-8eb9-e8f5889c982a} + {8fda4ee2-08e6-42ab-a3bc-146d675bec93} - {a7b300fe-7013-4e93-b307-5e93f569df94} + {e9a8e060-0036-4746-9d05-a2712e4ecf51} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj index 8c038ccfd..1414911da 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters index ecec97096..473cd3f8a 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {ce0eb972-c360-430d-9c6e-6601aa09d52e} + {5d94b527-dbf2-4792-aa79-3755c891c37f} - {528344c2-d0b0-4d71-a997-426890b76f7c} + {2051b3db-f525-4c44-bc80-d91c1a3bb35a} - {c2ce0849-761a-4c25-8009-055b8aeb417a} + {9bb97fea-d5d4-4ec9-9dc2-41a8bf9ea207} - {6fd61c8c-aea6-4bd8-8d6b-74b559e87361} + {eaf0c411-0d28-4f1d-bdde-7a128552c51c} - {a7112ebb-e6d4-470e-950a-28480d5d8e19} + {51c4f39a-b506-4e48-9f5f-5be90e40ba31} - {2a67f8f0-8df2-42ac-8f0f-4f85b89abf90} + {903b5caf-6b6c-4448-825b-0ef7083b59aa} - {141d467b-cff1-48c8-bdff-42608eb3a468} + {530307ca-49c6-484a-b5d1-b0eaf5b0d779} - {334c9472-10ee-445d-9457-f3d0c595ff52} + {82d55ecd-3d28-4e33-84b5-8c8db20b6b87} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj index e550a1812..387eb1139 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -164,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -190,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -223,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -250,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -282,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters index 67fc2eaed..7367bcd5f 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {a79d3243-c385-4bcf-ae73-5a2138444b5c} + {454ed352-806f-4de1-b8af-d8f42dbc9fc4} - {36839382-8e7f-4df7-9d18-716d4ed70949} + {135c8aaf-911c-41b9-aeb9-a0dfc83e1b38} - {134bfdb6-c5b3-4dff-a554-c001e28ed498} + {55a05bcd-e6cd-4c28-814c-8fa66ed005f0} - {e4e38cf3-2ef5-4f5b-a4e1-a0f22c901daa} + {ba9d1c1b-2bb9-4ab8-bab4-5aa7726f8444} - {7fd7f91a-baf7-40c1-829a-c5fcd04766f2} + {25134a7d-cb2d-43eb-853d-c13bad503d87} - {038ac280-2992-43ed-ba21-9d738d599335} + {026ef01f-3bd1-4cbd-b121-29a2ca61be04} - {a079540e-6d4c-44a1-a892-db654392bf10} + {f69b8936-f3fe-4f43-853c-b6807ed73561} - {ea6dd4b5-b27d-4864-bae4-db5da469f356} + {c298c3a3-eb6d-45a3-b2a3-c77ef9c3210c} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj index ff29ef3d3..e592ff160 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters index e44e8beca..50e146bca 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {feb4c82a-4592-4477-b9e5-d48d55b13df8} + {9362f5bb-556a-4d4a-a3e8-97e6eae687b7} - {d779829a-5acf-4a94-a7ab-c0dc2ad45c08} + {6653f087-c2c6-48e3-a7f1-6a8ea220aea3} - {66804ce6-5013-49ba-a2a5-c67f0521ee72} + {d52828a5-b16e-4aec-9686-d9f164853df7} - {58f534d8-0441-4133-8f44-6b4f7cd1f963} + {4cb76cae-5fbc-4594-b2d0-1f19e86687bf} - {38d7cb33-5b9f-4c7f-b042-a59a305f3b95} + {6f604038-353e-47b1-bd42-c3be8cd47b6c} - {ed44a0ac-ef8e-40e4-b502-96b6c5e8a168} + {b1ee01c6-4ee9-47e8-8dff-ee083b48f046} - {ec2b70e5-7520-45c6-b64e-4ecd617f1c10} + {d37dcd2a-3195-47c2-b445-c784787d86a4} - {40802448-f4e0-4a8a-91ab-a6bc073ca61b} + {c52f1cee-2bdd-413e-8057-972e002e59be} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj index 7e6da7c23..29a652070 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters index e4cac81c7..0e4a8db61 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {5bf43a25-d466-41a2-9e48-c60a568dd17a} + {ba5dedd4-3fb3-4274-ba99-46f4691430c8} - {d1febb30-8cd9-4097-bef1-b855edb8037e} + {ca9f5fbf-5a8e-49e0-bb80-c1a30f66af94} - {57e28629-cebc-4671-99fe-1eee7a6d97eb} + {240c5600-5dac-4f86-9dc6-65129a520b38} - {8522b809-2d22-4522-9e76-83c235e108bc} + {d7c5c9e5-5bab-41bd-856a-3fa4648484a0} - {ae2ae580-dee5-450e-8110-095f770d33ba} + {d7534325-5c94-494d-bda2-8b25493289a2} - {c68a9488-ddc8-4ce3-a125-4a5fe135fee0} + {e0d23e84-3902-47a4-b4a6-c48caf5b1b57} - {b180345c-b75d-4339-993a-eba2a379ed02} + {2f0a292f-46e5-4de2-8a87-3d809a39fa16} - {feae5d72-ec3d-47b8-9767-6803d2e6c902} + {a815518a-5ed3-4676-914b-80824ed3aeff} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj index 938e6ca51..2c9293ac9 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters index c478e8eb0..1a0ebba3c 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {8a73f8cd-1669-416b-882b-ac5b65a6fd3f} + {13dc58a4-8524-4c7b-aeaa-a5700f4a5cb2} - {608b489f-dd52-41b3-9df0-23a7a432141b} + {5b23162e-6b97-4996-92a2-2bc19c979be3} - {ae234ca9-6cf8-404a-a271-ba229fb47399} + {56cc42c9-d57c-4d78-830f-7621c7601603} - {b673792d-eb33-4c50-a4bf-6422616ae3cf} + {83065397-cfe7-41ef-ae77-eb56e8dba7ad} - {27d0cab6-39d5-436f-aff8-85b8cf443759} + {ce5fba18-072f-4831-9752-18147b820f00} - {2ffd9064-e775-4d11-8acf-4e8595f67e94} + {4df6429b-ddfe-42b7-9945-0c393df671ca} - {fbbd755c-578f-45b1-9ee3-ca9e5018c54b} + {2e9b300d-a975-415b-a1aa-8803f52be86c} - {5b1af651-332e-4ac2-b87c-f417052d06ef} + {c45d700a-0e33-4e4b-86f4-f5601ea5117f} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj index 50d07f0e9..52ccd9e87 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj @@ -114,7 +114,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -150,7 +150,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -180,7 +180,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -217,7 +217,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -248,7 +248,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -284,7 +284,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters index 9dc2007d5..6b40996d5 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {5fb68052-7f51-4cca-af3b-661bd9ed6676} + {88b8f5f6-b64b-437a-99c8-ab9ef9af6125} - {71dc0928-3c72-4f6a-9b30-681156934322} + {f480da46-f05a-443f-8029-66e16ed994c0} - {7d28ac5a-7e9c-4875-aaa1-f7606bb0c6df} + {baf669e6-25ba-4ddf-b1a4-55660bda57b9} - {15733f0c-d4c7-4dc9-b447-07dea14c4658} + {0409b23b-478b-4fdb-9cce-6c0da6d5df3d} - {850d74a8-cccc-4daf-8fa0-1352b57d7a50} + {3bc9340d-8f48-4199-b2b3-576e242e113d} - {a693f23f-2570-4a69-93fb-9fc89e23a097} + {32f1ddbc-212b-4f23-95c3-870d9df6f98d} - {5aae364b-f9c1-43c4-aab8-eb5f57ef788c} + {1808928f-6f62-4e0b-80de-31178d211d92} - {cdbee3ab-48ef-460f-9c70-69d7a0c9c741} + {be71cae2-0232-4296-bd16-204739c301fe} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj index d239be8f3..65eccbaed 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj @@ -132,7 +132,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -164,7 +165,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -190,7 +192,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -223,7 +226,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -250,7 +254,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -282,7 +287,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 26e3ba1df..249cb66df 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {83016003-f6b1-4b64-b6f2-5f7783795071} + {199f321f-b470-44ee-ba83-d9ed1dc50f6d} - {59a04cbb-baa1-4e12-851d-9fd245b25577} + {f51acbd4-9ec3-44e6-824f-e1c8a807d168} - {75ad78ed-13bc-489a-80c5-896b11035828} + {70d8eb2f-4f6e-4e20-b883-adf271524589} - {4a677a30-277d-4bbc-9038-3e3210dabb64} + {9895aafd-95c0-4470-ab91-550360807856} - {8da4e3ba-8411-4733-bd04-c6952df36336} + {ff9191d8-1e74-4c73-8203-b349df3d35f3} - {6c8e1f25-4038-416f-8133-e72c91642723} + {65c39a15-fe41-4e54-85d3-ed4722eb81e9} - {199adccd-7fb0-4b73-be14-887dcb56f0b7} + {85f32de4-429b-4bdc-b6fd-68dadb7ea753} - {6383d8b0-df4f-49f7-950b-3190c7528fd9} + {841fad99-6e2c-4860-9eee-5ed341016f57} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj index e5052a943..39807c7e8 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 30c2946a1..362841bd7 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {fc04cd71-7a46-40b2-8033-278c71f9c0eb} + {e6799cf1-ca48-4427-92e6-d58b6918367c} - {a01babaf-a3da-41ea-a8f0-bd12e3a34e8c} + {580dde21-bc47-44ef-aab4-5a0cc67eb25b} - {3ff32932-3f61-4ad8-9971-52b352205b63} + {e5dea2d7-cb51-40e5-9c71-f3853e02b91f} - {1b3fad52-bc5f-425e-b3b8-db1b33f38dc5} + {92568131-e169-4bcd-b81b-ca1709a22dfd} - {8828be15-1a37-4894-8941-1a23afdfd3ed} + {25c998de-bb91-4587-8dfb-6342acb72912} - {0eb95244-5273-42a5-b56d-0a55a1acb574} + {3c5889d2-cad5-454b-982b-85b103eb7272} - {a3cb3bd7-2337-4fcd-9b6f-32ad072488d5} + {e6e76036-c200-40a8-b6c2-593d253782d1} - {a175764f-ea94-4f78-a688-f9668934fb59} + {9f9a6551-4d62-42df-82a2-ae7f57caa280} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj index 026bb7509..88380fc6e 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters index 2fb13c6b5..b9500a722 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {0d26f41e-fe38-4411-bd82-231e410bbefa} + {a2564dba-1196-4fe4-924f-b8d4923a67ff} - {7f41bd15-73f6-4dbd-9d6c-e4cc22024d9c} + {7ad654d1-e6f5-43e6-b650-cf980ed7fbb8} - {17b16324-4228-4737-b897-be62310e2d21} + {c4fe1efb-16f7-4e44-9e96-ee01cb0930ad} - {d4110d3d-27e0-4e5e-84c0-4bf199c3e3c6} + {8061d28a-aeaa-46e4-b3aa-eb810966470c} - {5038dbf9-a17d-4cc2-b744-b63ddea5f7ab} + {13a947d3-faa2-458c-ab07-a5760c7fbd89} - {809d7e27-cf4c-4ea0-b441-7938e6b82070} + {f4a9c5da-bdba-4b5a-80f2-4e73aa7444dd} - {7bd9a5f5-e347-4fb4-98ae-86d59911360c} + {566d12ba-9d70-4570-9bd2-5d86b3f9bd10} - {85401f09-072b-40d7-9519-909fdc7fefb8} + {9cf0a6a5-4b36-498a-942b-c53a961d0f34} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj index 36588d1e6..9b4140394 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj @@ -126,7 +126,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -158,7 +159,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -184,7 +186,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -216,7 +219,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -242,7 +246,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true true @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -274,7 +279,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters index a1d2b4154..2b7a000aa 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {b973d4c6-8604-42ea-93d6-91fc9cd2d23c} + {d4426045-d228-4e36-89e9-b5f608fa7bba} - {5ea1ea1d-a003-4dce-b603-c1f1960907fa} + {be2568f9-4a4c-43a3-ae6b-ef9bf82023b2} - {ae38f324-2d07-4af3-994d-63b5b14f43f4} + {2c25a4a3-2340-45d1-9456-fbd8f2191388} - {e4d1e6c4-a175-46ee-aa49-1bcd135080f5} + {5e583d42-297e-491d-87ce-397e60320ef7} - {bb71e23c-af79-40ea-90be-8f909f84eb9f} + {7bfcf1d8-e404-4688-b678-92fdf60abd62} - {185ba33d-f134-4ad4-ba30-797b714c58d7} + {19266d0f-3167-48e0-9864-05da7e726fb3} - {9a6edfa1-1ab5-4ef0-b61b-c799ba2c99b6} + {183c6169-c689-40b9-8cbb-e72b0b62dd4a} - {9a1bedfe-f41b-42c6-a183-4e8f428e7cec} + {5220feb6-f96e-4390-8473-5f57792ae613} diff --git a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj index f2869daae..c2d5273d4 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/PostgreSQL/testsuite/TestSuite_x64_vs90.vcproj @@ -32,7 +32,7 @@ + OutputFile="..\..\lib\$(PlatformName)\PocoDataSQLiteMTd.lib"/> + OutputFile="..\..\lib\$(PlatformName)\PocoDataSQLiteMT.lib"/> + OutputFile="..\..\lib\$(PlatformName)\PocoDataSQLiteMDd.lib"/> + OutputFile="..\..\lib\$(PlatformName)\PocoDataSQLiteMD.lib"/> + OutputFile="..\..\lib\PocoDataSQLiteMTd.lib"/> + OutputFile="..\..\lib\PocoDataSQLiteMT.lib"/> + OutputFile="..\..\lib\PocoDataSQLiteMDd.lib"/> + OutputFile="..\..\lib\PocoDataSQLiteMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT diff --git a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters index 70fa8c3ad..683ae3e5f 100644 --- a/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_WEC2013_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {6ad17cfe-92ce-4c66-b775-325ded72246f} + {26fa7e07-2e95-40e4-8c62-efadccf6b6a6} - {bff62d6b-5043-4e89-b72a-96cdcb7ecc9e} + {c6a23bd8-adf9-4a00-8c20-c5eadb4fee52} - {46ea7d56-3171-49c8-87b5-19e20779140e} + {b0a06a73-62f1-4dab-a2e5-8d2f270a73b9} - {47bb1598-f30f-412f-b8f4-e06b50250978} + {46b2d19e-5656-4de3-9a3a-fdbc59b0aad2} - {23388edb-fb43-403a-8cda-175ac328c7e4} + {4e5214e7-cfe5-4453-b077-8ab2777dfa52} - {ffb1d98c-1062-4084-8f65-bcbfdd9001db} + {c19d81ea-c08d-4f90-a330-df6f76664ae3} diff --git a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj index 53c5ca63a..960038cfe 100644 --- a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj +++ b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj @@ -28,11 +28,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT diff --git a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters index 393e364aa..c7c09958d 100644 --- a/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_WEC2013_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {6f6882e2-4afb-4b58-a31f-74da03a4521e} + {b076a5ed-8a0d-4f70-b0eb-14da0fab31c9} - {dbe6caf0-1001-4262-9cef-8610695f4763} + {df37f1ba-f837-4528-97b4-19383e37d061} - {aef179cf-1cb2-461a-808a-7bd941390941} + {f8000f01-06f4-4e8d-8889-47db2ecc0338} - {a5da3040-fe4c-493c-8269-6452c277f673} + {f81e77e6-0557-424b-a787-49f048c98e5d} - {74775ad7-39ca-4ede-9a53-851a7f6ab574} + {896a32ea-029e-4dc4-802b-749faf73dd20} - {0dc26a2a-5807-4b46-8734-56baaedec8d4} + {69838271-a26c-4ff9-abd4-43017b845648} diff --git a/Data/SQLite/SQLite_vs100.vcxproj b/Data/SQLite/SQLite_vs100.vcxproj index 8aca8e082..fe287f498 100644 --- a/Data/SQLite/SQLite_vs100.vcxproj +++ b/Data/SQLite/SQLite_vs100.vcxproj @@ -95,11 +95,11 @@ ..\..\lib\ obj\SQLite\$(Configuration)\ PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataSQLitemtd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataSQLiteMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataSQLitemt.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataSQLiteMT.lib @@ -235,7 +237,7 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + ..\..\lib\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\..\lib\PocoDataSQLitemdd.lib + %(AdditionalDependencies) + ..\..\lib\PocoDataSQLiteMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\..\lib\PocoDataSQLitemd.lib + ..\..\lib\PocoDataSQLiteMD.lib diff --git a/Data/SQLite/SQLite_vs100.vcxproj.filters b/Data/SQLite/SQLite_vs100.vcxproj.filters index 2725a1ae5..fafcfed68 100644 --- a/Data/SQLite/SQLite_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {19106b97-a7b3-4ec0-bd03-b71a6ed7abc1} + {550d9a48-357f-45c6-a718-5e5d9146d133} - {2a6e1c13-0d3a-4983-9a09-b60989ec0952} + {b285121e-dee4-4b70-8a93-5edb02422b87} - {3ee7b58e-f519-476e-bbeb-5c5053193dab} + {edba9ae8-1a29-42ac-a915-938743cb4ba4} - {58154d36-7978-4f18-a797-34616ca05b8a} + {66f40887-9a33-4f8b-a29b-f1c99640978f} - {e3187b32-0916-402e-8014-7a15cbb2bf28} + {35d851a8-a87b-4268-94a9-72b0ee1a18f8} - {0b4f66a8-377f-4d7b-b2bf-1f032b1a2393} + {4fa65301-d761-48fe-babf-b8fdb3de8f77} diff --git a/Data/SQLite/SQLite_vs110.vcxproj b/Data/SQLite/SQLite_vs110.vcxproj index 67c704ad9..99b0687f4 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj +++ b/Data/SQLite/SQLite_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin\ @@ -203,7 +203,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemtd.lib + ..\..\lib\PocoDataSQLiteMTd.lib @@ -228,7 +228,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemt.lib + ..\..\lib\PocoDataSQLiteMT.lib @@ -245,14 +245,14 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + ..\..\lib\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemdd.lib + ..\..\lib\PocoDataSQLiteMDd.lib @@ -278,7 +278,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemd.lib + ..\..\lib\PocoDataSQLiteMD.lib diff --git a/Data/SQLite/SQLite_vs110.vcxproj.filters b/Data/SQLite/SQLite_vs110.vcxproj.filters index edefba304..2153d312d 100644 --- a/Data/SQLite/SQLite_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {22dfeba9-aaa5-4f82-9f59-dad0506ec547} + {374c9154-6f7b-409e-b437-07f16591650e} - {f9e4c6cd-c6be-4fd9-8156-7ec76b2a48cd} + {2354d8fb-643d-4397-aa6b-da58d240fb6a} - {9eb26f76-c640-4b96-895e-bebdb73648fc} + {89ea2f26-a840-4115-8add-fabcfe0a3153} - {bc3a5f88-8b2f-482a-bb67-35e5a52c126e} + {5b199513-211f-4547-a609-71cfc8193990} - {908a7f35-444f-4bbb-8bab-a7e34f348516} + {3e7ead9b-ed61-4d92-8bde-cf57777d2ab6} - {fa0cfbdc-3903-4d69-abce-4b14bdaac130} + {cba31ba4-510c-4289-a4f6-d7a45f2c0e28} diff --git a/Data/SQLite/SQLite_vs120.vcxproj b/Data/SQLite/SQLite_vs120.vcxproj index a6d87e75f..e90d55ecf 100644 --- a/Data/SQLite/SQLite_vs120.vcxproj +++ b/Data/SQLite/SQLite_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin\ @@ -203,7 +203,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemtd.lib + ..\..\lib\PocoDataSQLiteMTd.lib @@ -228,7 +228,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemt.lib + ..\..\lib\PocoDataSQLiteMT.lib @@ -245,14 +245,14 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + ..\..\lib\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemdd.lib + ..\..\lib\PocoDataSQLiteMDd.lib @@ -278,7 +278,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemd.lib + ..\..\lib\PocoDataSQLiteMD.lib diff --git a/Data/SQLite/SQLite_vs120.vcxproj.filters b/Data/SQLite/SQLite_vs120.vcxproj.filters index c187f6f61..d029dcaf6 100644 --- a/Data/SQLite/SQLite_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {9d836dd6-02ee-4c3b-8bf1-a4b772233f12} + {d1c9ae76-2ca2-4301-9176-ad5241db71dd} - {b04e88e9-d07a-46ba-bfec-07c8812655ab} + {bf75d886-da64-4397-850e-cc57a1c81da7} - {dfe185a4-0f87-42a7-bda2-9634b64108c6} + {b6c84657-8a07-4f71-9646-8ddb641dba22} - {cac50b4f-4783-4708-8d0f-52de67b17f52} + {b9179148-1394-45ab-9def-d5361a3091f9} - {141609fd-ed65-43ef-b1ca-b010fea27010} + {2859b19b-67a5-4e11-8a05-a21785d5fe13} - {6a2d056f-fd2e-46fb-8ce7-97cbbe7b9612} + {f6065875-845a-4799-99d3-64594c54d699} diff --git a/Data/SQLite/SQLite_vs140.vcxproj b/Data/SQLite/SQLite_vs140.vcxproj index 84410bea5..53e6d3998 100644 --- a/Data/SQLite/SQLite_vs140.vcxproj +++ b/Data/SQLite/SQLite_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin\ @@ -203,7 +203,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemtd.lib + ..\..\lib\PocoDataSQLiteMTd.lib @@ -228,7 +228,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemt.lib + ..\..\lib\PocoDataSQLiteMT.lib @@ -245,14 +245,14 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + ..\..\lib\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemdd.lib + ..\..\lib\PocoDataSQLiteMDd.lib @@ -278,7 +278,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemd.lib + ..\..\lib\PocoDataSQLiteMD.lib diff --git a/Data/SQLite/SQLite_vs140.vcxproj.filters b/Data/SQLite/SQLite_vs140.vcxproj.filters index da6e4e110..241c8b187 100644 --- a/Data/SQLite/SQLite_vs140.vcxproj.filters +++ b/Data/SQLite/SQLite_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {d3bf8ad2-af4c-432b-8591-5c902c19b8b8} + {1cc2a1a1-2b74-4237-8e2d-cfd89ec77b39} - {df126619-afcc-4280-91bf-68997c12c289} + {aef4c892-297a-48fb-b05f-06778dbb018f} - {1bcbfb7a-aeb4-4121-939e-ca20fe59232e} + {5a127fe7-faef-4747-8c46-462db4c31714} - {2c657904-5687-4a64-b382-b71684d6f0d5} + {b5821512-30a5-467b-aef9-04c9ec3023b2} - {67639195-f1fd-4b26-8e87-b43dbf30ab98} + {374385bb-e1a9-4799-bc2e-02f0fd637e14} - {1dca2949-2fd0-49b6-8c7d-880c4374165d} + {8a940a3a-3596-4b29-9077-0f3603e03439} diff --git a/Data/SQLite/SQLite_vs150.vcxproj b/Data/SQLite/SQLite_vs150.vcxproj index 855dc26a1..8c33a8baa 100644 --- a/Data/SQLite/SQLite_vs150.vcxproj +++ b/Data/SQLite/SQLite_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataSQLited - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin\ @@ -203,7 +203,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemtd.lib + ..\..\lib\PocoDataSQLiteMTd.lib @@ -228,7 +228,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemt.lib + ..\..\lib\PocoDataSQLiteMT.lib @@ -245,14 +245,14 @@ true true - ..\..\lib\PocoDataSQLitemdd.pdb + ..\..\lib\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemdd.lib + ..\..\lib\PocoDataSQLiteMDd.lib @@ -278,7 +278,7 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib\PocoDataSQLitemd.lib + ..\..\lib\PocoDataSQLiteMD.lib diff --git a/Data/SQLite/SQLite_vs150.vcxproj.filters b/Data/SQLite/SQLite_vs150.vcxproj.filters index 9436317c5..21dfbfeae 100644 --- a/Data/SQLite/SQLite_vs150.vcxproj.filters +++ b/Data/SQLite/SQLite_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {c046f557-7646-4f08-9ce9-e3378085b62b} + {0af1fdb8-1061-4af1-88b6-b4fff10c0cfd} - {f527a76d-c01b-47b5-a1d8-253606327ba4} + {9d4adb5e-80a2-47c8-80cd-708366412eb5} - {fac626ea-c86a-425b-85b9-98f416ad34ac} + {e0be4b13-3840-49d1-8f3f-52d4841e17ed} - {3bf050c9-40b5-4f15-98f3-2c22e2651049} + {e2112b92-4d7a-4d2a-a839-6be20481ccd3} - {239b1a8b-8063-4e30-9bee-c9eb0e9ae452} + {2f65bfe7-607b-4834-8a8a-86b8e5f44e55} - {25bd32fe-6981-47c2-a4a6-154506536e87} + {f4e0c58d-d7d8-4db8-86f9-67166e8eca7c} diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj b/Data/SQLite/SQLite_x64_vs100.vcxproj index ecc345965..8dccf1b4f 100644 --- a/Data/SQLite/SQLite_x64_vs100.vcxproj +++ b/Data/SQLite/SQLite_x64_vs100.vcxproj @@ -95,11 +95,11 @@ ..\..\lib64\ obj64\SQLite\$(Configuration)\ PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataSQLitemtd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataSQLiteMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataSQLitemt.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataSQLiteMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + ..\..\lib64\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataSQLitemdd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataSQLiteMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\..\lib64\PocoDataSQLitemd.lib + %(AdditionalDependencies) + ..\..\lib64\PocoDataSQLiteMD.lib + MachineX64 diff --git a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters index 4ebab8960..e96c4288e 100644 --- a/Data/SQLite/SQLite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {d9314398-8d01-42d3-a7a0-886c0f3ef93e} + {8025f61a-85fb-4e81-8e28-a3f865ed6bac} - {80e8f75b-6eae-468b-9663-3467fbbb2d1a} + {b2a0af77-2f6b-4e7a-ac7b-5f3d9d89c278} - {714b727c-22ae-478f-8460-279110b1b368} + {3313282a-404c-40ec-b6e2-e37a9703acf1} - {392d175e-ab5a-4f87-9ff6-3a6876897074} + {0be93629-fb33-47db-844c-0bf9e47349c0} - {cc4e28d3-1efe-45e3-bbb6-3bcd4d48d934} + {7c8aaa64-cf2b-41c1-98e2-129d2e95d722} - {a3cc1c8b-8563-453d-a163-80318e7400d3} + {4fe91aeb-c5b9-4d16-a38f-ceb8f9492050} diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj b/Data/SQLite/SQLite_x64_vs110.vcxproj index 587acb1a6..0bcd18235 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin64\ @@ -203,7 +203,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemtd.lib + ..\..\lib64\PocoDataSQLiteMTd.lib + MachineX64 @@ -228,7 +229,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemt.lib + ..\..\lib64\PocoDataSQLiteMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + ..\..\lib64\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemdd.lib + ..\..\lib64\PocoDataSQLiteMDd.lib + MachineX64 @@ -277,7 +280,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemd.lib + ..\..\lib64\PocoDataSQLiteMD.lib + MachineX64 diff --git a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters index fb664fb08..502fe1a3f 100644 --- a/Data/SQLite/SQLite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {60bed258-ef4e-4612-916d-c40edae5fb69} + {87ebe70f-d6bb-459e-9609-6e3ffdb8ed94} - {8d5a01d8-0002-456b-aaa2-892779fd25f5} + {f257f9cf-2a0e-434d-94f8-bb06d7fef260} - {59485c93-094f-49fb-a275-02c38b732621} + {e0c9bf11-f9aa-44c7-906e-a73a0df80b0c} - {f23b9ffe-50ef-42aa-877e-11ab12489217} + {ca18ccec-5187-451a-99c3-67050ea24e32} - {0f683511-6abd-43b4-9efa-53b022f0a599} + {c5839e8a-27b0-4283-bb4f-5b7b229a0449} - {37d9857c-be83-49d1-b505-31de8e562772} + {e773fc95-f167-4ba8-8d48-9f96d4f75bd7} diff --git a/Data/SQLite/SQLite_x64_vs120.vcxproj b/Data/SQLite/SQLite_x64_vs120.vcxproj index d8d131cb8..0594cfd7f 100644 --- a/Data/SQLite/SQLite_x64_vs120.vcxproj +++ b/Data/SQLite/SQLite_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin64\ @@ -203,7 +203,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemtd.lib + ..\..\lib64\PocoDataSQLiteMTd.lib + MachineX64 @@ -228,7 +229,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemt.lib + ..\..\lib64\PocoDataSQLiteMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + ..\..\lib64\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemdd.lib + ..\..\lib64\PocoDataSQLiteMDd.lib + MachineX64 @@ -277,7 +280,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemd.lib + ..\..\lib64\PocoDataSQLiteMD.lib + MachineX64 diff --git a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters index 8706d1094..0ce7157c4 100644 --- a/Data/SQLite/SQLite_x64_vs120.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {96698a27-581f-4b7f-ba81-e2c0fcbcf07f} + {7bea3f41-4452-45ba-a8e3-a2fb54bd4733} - {5624cb96-971f-41d7-8114-3e620e76a483} + {2335d55f-3f2f-4e34-a6b9-db94fbe04dbc} - {f8b77356-9f4b-4468-885e-ff8edee116d3} + {02a0c636-9e8c-4ab4-897d-4063e464a889} - {5b49545f-6552-4afc-ad40-8e072766b026} + {cfafb78c-f3e8-43de-868d-f616b6ed4a72} - {27bb50ce-93d5-43fd-be6e-bd406fbcad3d} + {a2ede00d-a697-4487-a1f3-c2d1d46cffe5} - {5343b431-63d2-4911-af83-2bbe9fc1b4d8} + {d22a9b13-bc42-400a-b37e-52f14dc4c805} diff --git a/Data/SQLite/SQLite_x64_vs140.vcxproj b/Data/SQLite/SQLite_x64_vs140.vcxproj index bd520611a..c06e84521 100644 --- a/Data/SQLite/SQLite_x64_vs140.vcxproj +++ b/Data/SQLite/SQLite_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin64\ @@ -203,7 +203,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemtd.lib + ..\..\lib64\PocoDataSQLiteMTd.lib + MachineX64 @@ -228,7 +229,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemt.lib + ..\..\lib64\PocoDataSQLiteMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + ..\..\lib64\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemdd.lib + ..\..\lib64\PocoDataSQLiteMDd.lib + MachineX64 @@ -277,7 +280,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemd.lib + ..\..\lib64\PocoDataSQLiteMD.lib + MachineX64 diff --git a/Data/SQLite/SQLite_x64_vs140.vcxproj.filters b/Data/SQLite/SQLite_x64_vs140.vcxproj.filters index 12b68a7d1..e150f6781 100644 --- a/Data/SQLite/SQLite_x64_vs140.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {c61d2885-58ec-44af-ac9b-1a92dad9173d} + {938d1bb0-3a0b-4eac-8ea8-f89ec5196a8c} - {c4c5d677-9e8d-45e1-8b80-fd08a6dbdeb8} + {3e7b5ee1-cd38-45ed-9977-f93a608ef30c} - {6fe63675-b894-4852-b780-de04ec25d38b} + {45241d8f-7944-41a8-8190-1f22235e8a3e} - {40490d1d-c8ea-494e-908c-1af4e74ed618} + {88636b67-5256-49fc-890d-6bbaa5020f72} - {34b9b4ac-8d4b-40d5-a542-d1ce1c6332bd} + {8b6acef5-2141-498f-86ed-b685f802487f} - {dd0bb630-2650-4e45-81b4-8d52bb792f84} + {25f41ae7-8d84-4b6c-abf8-0a8029a918e3} diff --git a/Data/SQLite/SQLite_x64_vs150.vcxproj b/Data/SQLite/SQLite_x64_vs150.vcxproj index 34a4fc1e6..d894db4de 100644 --- a/Data/SQLite/SQLite_x64_vs150.vcxproj +++ b/Data/SQLite/SQLite_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoDataSQLite64d - PocoDataSQLitemdd - PocoDataSQLitemtd + PocoDataSQLiteMDd + PocoDataSQLiteMTd PocoDataSQLite64 - PocoDataSQLitemd - PocoDataSQLitemt + PocoDataSQLiteMD + PocoDataSQLiteMT ..\..\bin64\ @@ -203,7 +203,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemtd.lib + ..\..\lib64\PocoDataSQLiteMTd.lib + MachineX64 @@ -228,7 +229,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemt.lib + ..\..\lib64\PocoDataSQLiteMT.lib + MachineX64 @@ -245,14 +247,15 @@ true true - ..\..\lib64\PocoDataSQLitemdd.pdb + ..\..\lib64\PocoDataSQLiteMDd.pdb Level3 ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemdd.lib + ..\..\lib64\PocoDataSQLiteMDd.lib + MachineX64 @@ -277,7 +280,8 @@ 4996;4244;4018;%(DisableSpecificWarnings) - ..\..\lib64\PocoDataSQLitemd.lib + ..\..\lib64\PocoDataSQLiteMD.lib + MachineX64 diff --git a/Data/SQLite/SQLite_x64_vs150.vcxproj.filters b/Data/SQLite/SQLite_x64_vs150.vcxproj.filters index b3e301118..6f022a2f3 100644 --- a/Data/SQLite/SQLite_x64_vs150.vcxproj.filters +++ b/Data/SQLite/SQLite_x64_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {65aef071-96de-4feb-8bce-4cf7f277b36d} + {3e5ed4ea-814c-49ab-8ce5-87d3309a2896} - {8e0ba5a5-c131-4f54-82ba-9b18c12cca7d} + {7e295116-e81d-404b-a3d7-296bbdeb1fde} - {d27f6ece-cbaa-429c-8bc9-28dfc8dd7815} + {7cbe9eb6-e43d-483e-acb1-8f18d686a43c} - {3f5350eb-e800-4caf-be39-005d1bf10d60} + {d6d7129a-fcf8-4dda-95d7-0ec374aecb18} - {1875b4fe-678a-4f87-904b-7cd3ff09a724} + {f9cfc87b-90fc-4c86-80a1-3c597ece6262} - {26fb5a18-297e-4061-bb23-85841b1f8264} + {f0faeb8f-1c18-4787-ad2b-cb87c3bbbf08} diff --git a/Data/SQLite/SQLite_x64_vs90.vcproj b/Data/SQLite/SQLite_x64_vs90.vcproj index 848a52f38..d2138f0cd 100644 --- a/Data/SQLite/SQLite_x64_vs90.vcproj +++ b/Data/SQLite/SQLite_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\..\lib64\PocoDataSQLitemdd.pdb" + ProgramDataBaseFileName="..\..\lib64\PocoDataSQLiteMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Data/SQLite/testsuite/TestSuite.progen b/Data/SQLite/testsuite/TestSuite.progen index 8f69390be..fe21d5306 100644 --- a/Data/SQLite/testsuite/TestSuite.progen +++ b/Data/SQLite/testsuite/TestSuite.progen @@ -7,3 +7,4 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include +vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj index 7ab060f82..bcc36015e 100644 --- a/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {97d75219-8091-4652-bc2c-58b899b63010} + {1dd0e209-1b8e-4948-afde-55d4bd06c12d} - {644c4ab7-ea8a-4daa-a22a-17f9bac053d5} + {ed21227f-d769-464a-9c79-03f0d45422a1} - {da85bc54-261e-47a0-a8db-af6e68531f5e} + {025d4676-a15c-44be-ae12-d4de8b989964} - {ad747ccd-35ea-4fb8-a906-a931993fd68c} + {f05f41bb-e375-4154-9ece-0bf4d5792681} - {eee27ae3-baa2-45c2-8bd7-7ef31fc2dc08} + {35f05919-dcb7-458d-bbca-5e6c5f4baf6d} - {846f6106-e3e3-4682-b40b-6cd67f00f7f0} + {7e0cb255-2d4c-40a3-beb6-e2b4f977dfa5} - {02700767-53cc-493e-bc6d-a575f5089017} + {60be62b3-abb4-423a-b90c-ed20a2760774} - {feac55e1-4aa5-4d51-9126-e7c76d169253} + {ea1d8754-19d6-43ad-93f9-69a56cbd2eaf} diff --git a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 9c762dce9..cfaf31015 100644 --- a/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {5f4f7a4f-fbf2-45de-b454-187da42d5249} + {1a01bfba-2445-4d66-b368-1bacb87d2c1c} - {6ab4a27b-7f15-4a69-aacc-4cbdba615fa4} + {9e09207a-9085-469b-a559-8aac4ff3aceb} - {3f3195f7-907d-41d9-bbbb-1be093094385} + {9f92c15c-0a16-4576-a2ef-17008e4d7dc2} - {0d9996dd-37ff-4147-b4d0-f73e7a4b062c} + {3b946e34-b8dd-4ecf-90cd-49ac1c9871e8} - {42b10a61-bea1-4cb1-b648-d66f944a35f1} + {a36d0e0e-8f16-4eff-b2fa-9b44ce3659a7} - {b369fa20-dcfb-48cb-bf7e-44f9f4776784} + {57515ad7-3de5-4530-adb4-31787030c30b} - {c216485c-e9c3-4c25-868c-fe9d2bafec74} + {33fdd657-90a5-48ec-b9c2-b152c7ff819f} - {3feb58a2-0af5-4180-934d-7ea6ea4d08fc} + {4d6cc54d-1e8c-4196-9385-5cfa14630904} diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj index 94ecfc6d4..3c867c8e5 100644 --- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters index 177c8dde3..45c16e167 100644 --- a/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {7e4ec13e-adc2-4cef-bcb4-bd6ae5088053} + {1d39871a-6df8-4538-a0dd-1e6067550284} - {f44dc2a5-2f2e-4357-a08c-8fdc6eacb728} + {c1ab7259-c503-4cda-a9d1-5b1ecf570bc4} - {3cee168d-91fd-4e4f-8c39-307c394692d1} + {ceacc8d1-a598-42c9-8ef5-3d3604c91d8d} - {e6480be8-b5c6-4d59-8655-15123ac6d1a8} + {3c0d134f-b021-4bba-8d7b-1a2d79479e65} - {839a1790-dcf7-4008-8814-732fa05d579f} + {0281ba7d-871f-413d-9d98-ebb16c36e7ee} - {61a71052-b2ac-4769-9b39-e5efbf6d6e38} + {1e413656-cc89-45a4-a0fe-fd2491c88394} - {2db88185-7793-44fd-9d28-58b621d77fc1} + {e66fcdbc-b1f1-4afb-8a02-b586b56ce5d6} - {923488f9-c854-4101-b35d-8b3d2a9517ac} + {b7385af6-8e3c-47c3-b7a5-4be9bfb1fe1a} diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj index 503fe5854..b99f646c6 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters index 8d65f2a5b..e027a28ef 100644 --- a/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {ec1b283a-5971-4026-ab48-3d83dfbfd50d} + {220a1f90-c681-467b-8285-8db9bcc28ae1} - {1983e28b-4f50-4ec8-9d5c-7f1ecdc03ee9} + {4585d7bb-8cca-4bb6-971d-305efb510262} - {7a5be821-5176-4b69-9312-c9ffcf3c561a} + {1bc560df-9c56-4c1d-9705-7d59ca251cc3} - {e97fa491-c3d8-46d3-bdef-195038020ec1} + {448075b2-ce7a-4b43-961d-ad320c93c206} - {ae1bfa69-c5aa-4a5d-b2f7-df3830c5a136} + {7f298a60-bb8f-4190-8957-f1e292db2d3f} - {059cb246-01b7-42c8-83cf-2ef5b6203066} + {f3d4ab08-6d51-4dfd-9334-ff7699e8bdec} - {2a067a3f-b8b7-444d-a3cc-3cfef3a3a50a} + {ec8dc29c-2d73-4b9c-9aa0-caa5aab4ada7} - {b1185af2-58ff-477e-a412-672f54f1ae02} + {ff156f7f-b9e5-44d8-99ee-25395a0a8283} diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj index 7682dd703..35f5d4830 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters index f9f288f84..d86a7b420 100644 --- a/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {fcd62f4c-341d-47a0-b927-269044491efd} + {284cb459-7e14-4720-be17-404bc9a4fe2a} - {5fca14e2-db58-461f-95d4-14467a6a3eed} + {c850ed16-27db-44fa-889f-c3a3fede1b27} - {39f1ea08-c571-45b7-98c0-8b11cc889e99} + {b6cc1b24-ae86-43e1-8ad4-8ae3ecb93216} - {86ce836a-e6da-4801-be4d-d4916e0e6921} + {3643db33-8c50-42ae-b17c-75e9db691530} - {4f7510a4-4465-4401-bd7d-f2158373b25d} + {fc6ec0b6-7c0f-48fa-a176-cdc81c96d4b4} - {b6c70fde-9755-4c23-9f3b-92803904bfde} + {239d3d24-6fd5-4190-89f3-96c1809c90c3} - {05bce786-5e37-4a7b-a095-548a7650a857} + {99cc1b99-f763-4b88-b1e6-56a46139feb8} - {210b0c6c-cdee-43f1-b983-bb077176f09d} + {f479dc21-ae4d-458d-93a9-cbb860323ce7} diff --git a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj index 24f890d35..c87e75c4e 100644 --- a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters index 75a56e16b..d9e6ed379 100644 --- a/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {be0cedf2-924b-4e92-9251-71874f51f7c5} + {47af0551-4db5-4bbe-84e7-38c168cd336f} - {bbdaf38a-373e-41f0-b12a-2b4ba6557e63} + {ef9385f3-e224-4210-ad46-e11598b1b9eb} - {18f70193-5e74-4bad-9b9b-0e1d47b937f5} + {ed6299a8-b8ea-49f3-a8ac-7dbb21f7dd57} - {0d1fa5a6-dc21-4cab-93b9-30d57547d957} + {26d7668f-c2d7-4c19-96b6-789143136b26} - {c25e6228-93e2-47fc-bcba-b15aff69c3a5} + {bc034239-3f3f-4323-b8df-006d9391249d} - {cef15fef-368a-450d-ab94-cec687a73f05} + {ad907337-3175-42ad-8071-257fa70dce4a} - {2a127406-cb82-424c-b4b2-5b200972fcec} + {37f73d96-cc12-4425-90ef-37aa786862d0} - {f4a81813-da5d-4bd5-b87c-b9ddf7795320} + {262896a3-c1e6-458c-9405-d6e800d3c1c7} diff --git a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj index d1d5558af..e19f82771 100644 --- a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters index 867a9d327..7361a7cf0 100644 --- a/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {e2c571fb-d15e-4979-a87d-191d01c756f1} + {3c4789e9-9a20-4a0d-bd8d-3053bb736214} - {41ec19e9-b314-485d-a7ac-79c16e5d1217} + {72845289-2ce9-4fdc-b446-411a9e7186de} - {7641ac15-0227-4a5d-a13c-2e3a9ad5ac31} + {2939c3f1-4c0b-4db1-b11c-3a84579d1c37} - {ad754a24-1892-4b88-b52b-b169880897b7} + {b07ebd31-8763-4965-82a3-367d678437e0} - {3b5b1fbc-af9c-4168-81f6-975bd58df30e} + {6ce7be7d-7c87-4469-9eeb-bc282794eab4} - {6dead3c5-7e8c-446f-a994-45d08e5207b1} + {e5b7ca39-6a93-400c-a5a8-9c33de0541f8} - {542955c2-fd83-48a2-ac12-3009a9e4c0db} + {bcb72ab4-a96f-4cf6-aaf9-9c988937f24a} - {031029d6-a609-48f3-85c2-3033e923c9d3} + {d569ce30-b03b-4bb1-bfbc-82bf6d45bb6b} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj index 39c9c2f91..0412a527c 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters index d102ba1b2..e24c1d3d5 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {a82f6840-56f3-48c1-8dab-a0b636b9fa46} + {3a95411e-8f6d-4c53-91ec-6a62ccef3e4b} - {26f82a48-1a43-4da2-9874-8a4161bbd0e9} + {319e2968-7b7f-418d-90be-ac81d8b0e46f} - {17084bf0-c26a-4946-b23c-28d125ffcfa7} + {6acd4e7f-008f-48b8-adfb-d2b5e376f029} - {963a7b68-3030-465d-b702-eeb6dc0de04e} + {ab6b2ead-9aad-4a2a-9371-378d6c147159} - {0052255f-a992-42dc-835a-1735b7b596fd} + {f4d127ff-fce6-481f-a036-3274a867c0b6} - {02a683cb-68d7-4758-8c1b-d8ad4b62291a} + {0cdc04b2-4349-4068-9162-278dcae90ef2} - {f23a1f39-2f3c-4876-a921-4932dae0a76a} + {be222752-442a-4666-93e7-a960fabe0eea} - {9bbe29a8-12a0-45f2-9f77-7b906423778f} + {1ac014e2-a701-4a26-9239-91b597bfd410} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj index 991f17a99..2f117f15e 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters index b1ef87595..08904d684 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {2fad8f00-a075-44d7-bd30-73ebc21ab4e1} + {c98b3457-0c2a-4272-8a28-2aaf1a431f62} - {2c68a228-af28-46fc-bf5a-56ebef6ad447} + {e826b54c-3525-443b-b15a-eb819562d35a} - {a476912a-f754-4161-9640-33a21d80e653} + {5c722ca8-54c0-4da4-b672-fc025e536d4f} - {598d6fa5-3578-49f0-8ffa-0274a59dc879} + {25d48501-5642-4a01-95d2-56f9ec583050} - {880f6484-99c4-4167-af25-8b0d731657a7} + {bc83e328-3f36-4943-9e38-8873340ac398} - {9103e4a1-67c8-4907-8301-c5e30546aa8a} + {2effe707-9b77-4d83-b9ad-eef2cf4eb129} - {0a315dbc-945d-4521-bf7b-08a08905c15d} + {07984977-af52-44b1-8c61-ba3d8e2e5598} - {e77fe6f2-ae40-4562-84d1-bb243b37d8e4} + {6761a070-706e-4633-847d-ab92a18be11f} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj index ecacd4e2e..28b8b1525 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters index cfce96954..e8cb6d8b3 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {c2317a73-98bc-4b2c-934b-e74bd2192537} + {0686c4e0-6ba5-4b84-9561-ed935d2c2525} - {425c5768-831b-49e5-bf87-0e11251397c8} + {f633b6c7-7645-4b19-8fa7-ef22ab7c7643} - {6e083acf-53a0-4b50-bf62-06f580286564} + {0cad8bd7-1c62-468b-82ee-8b4c7e3ebb05} - {3a9a2006-ea57-47b7-b252-9550df08811a} + {bec3749c-2682-4934-9133-139f09d6e8d7} - {37120768-a991-48b6-ab8d-2cb687af8c8e} + {d635d077-a1e2-487a-91c2-db2d2ae2ab5a} - {2663d26d-0710-4192-869e-64db79968223} + {8a4ad0f0-6461-4d9f-aaab-5fe472bb3ec5} - {c97d113f-1f41-442e-acf2-ca0fc187527d} + {600e0ea3-4abd-4813-a4bd-99515a47c72e} - {0bc9b83a-1410-4614-883e-3ef8825c0dcc} + {aa0bad63-1a9c-47d4-86b2-137547ca3e87} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj index 7078311b2..178a19042 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters index 0e3853f34..fafc6509c 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {5e2a135f-e23b-4b9d-a25e-6f336b7cfaf1} + {120963ba-d6a5-4178-9b58-b6301236593d} - {fae39b21-2d93-49fd-b366-e3cbd16cff82} + {943eba4a-514d-4314-8bd9-2f3d941c0c99} - {76348886-c083-4cb8-8893-daccdeb4c857} + {458a6b95-e1d5-4f56-a6be-f2bba140601c} - {d6e17955-b6ae-4ad2-845a-8df7e4c856e5} + {5657dc52-f6ec-4c80-bf7d-56924c1737cd} - {dd83ec74-2931-4e0a-b9fc-9bf52c3ba0d0} + {3c3fdd1c-ee64-43ce-931d-0bc48069997b} - {008874d2-eb74-487c-8fe1-c54127ae4a41} + {fade0ec0-b4d2-4a10-87b8-bbd18fe79e3d} - {7d12e46c-6036-40b9-b846-ca066627ffa6} + {9702b340-c780-410f-8d97-f8ab6686a276} - {22afbe77-270a-4123-964a-db9b02dcd761} + {8ce1ed35-ca77-47c6-bcff-eb1514e997ec} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj index a342a0e4a..abce0ee67 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters index 09a8e2670..d983d4d5d 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {c8df4eff-87b7-4318-8f65-047ee80ac10a} + {6311edfd-5df5-48a0-8e16-6c90cfab201b} - {fdcf4c1a-9758-4fc3-a913-756f164133d2} + {27f87b1e-34b3-4fc3-8989-c1f44fa4b37c} - {6a42c24e-dd3b-4588-aa57-a04c15fedcbb} + {d68f417d-94a1-4fb8-84ec-92f341912d5d} - {fda8e258-d2ea-4765-9ffe-072fe5c11987} + {cc1acceb-0993-4d24-a699-36b8c804aef5} - {43419e9e-b10b-4148-90e1-220721590b09} + {6021c2c8-1518-47a8-bedf-575bba3150f0} - {13ce6baf-dec8-4267-8a25-8a60a81a90d1} + {04e736d0-adf5-48e1-b496-2c08b054c7db} - {2ef29616-b083-47cb-847c-cb237fa92512} + {c6368ce6-6776-4a46-b33e-053a2751f075} - {94227db4-d3f0-421c-a15d-d50562436e17} + {07e6b887-e8b1-4f12-99e9-ad3c9c8bd614} diff --git a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj index 7be214267..bec968e45 100644 --- a/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/SQLite/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - {55608a02-0408-4843-aa44-391241efa224} + {cd324689-1349-4cdc-a50e-040699eae6dd} - {d3159d87-09fa-45c3-9c5e-19e2fe7f4fd4} + {1d095f72-ca5b-4357-b79b-34249331fccc} - {458ed29f-93b9-4d82-b71b-2d11af292e5b} + {010cb4ef-c7dd-48f4-b7ef-806cb782f664} - {89161740-4b33-4269-9819-c78915d18c50} + {80002bab-18c6-424c-a2cc-c51fd3e5da3a} - {6defd41b-8d9f-4b87-a3eb-fe8d4f22b64e} + {6485a9bb-f508-4fdf-bfa1-8ce964e6ad84} - {b99cc591-083e-438a-aafd-e094e9983723} + {3c061a43-9ff0-4573-b21a-e49333852536} - {4a0f1f9e-2214-4bb4-8647-e8646b97056e} + {9e322f92-1c2d-428b-8ef5-cfb13173944c} - {453a2513-be29-4bb7-97eb-4bbc9f6d9d6a} + {b7483220-fb05-4310-8690-8147751fdb82} - {db783350-75fa-4e1b-911d-0d399bcfe316} + {2c1b98ea-1164-4756-978f-0b6d6abc463f} - {70b78d52-8ae5-4917-b4de-a2a69254815e} + {2d4b5a9e-7a6b-4107-8355-5384e07ddd2a} - {ff337875-5ae2-4032-8c99-0a44d012140c} + {3a87dc3e-687e-4ab6-8e88-8ef7e703aa64} - {d04ab369-02b9-4be0-adf4-4d930c81e412} + {1ea9dd9c-3ce8-4a29-9afc-8ff1b04eff44} - {7623e9fb-e501-41bc-ad82-37193ba2613d} + {765e7192-321f-4ffb-9e89-9c89202d6856} - {6c20e2f4-cc61-4b33-baf1-eaf1097fc597} + {0b817046-7d48-445e-b4d0-56f23e08862c} diff --git a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 4bdb2126a..1007e8788 100644 --- a/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {4fa94c87-090d-499b-b0ec-5b621bc7dfd9} + {51efa1fa-ef36-4170-a4e8-3e25f0419761} - {631d041f-cce3-448e-8a2e-3047aea693c0} + {c6c7ff3f-56ea-4dc1-845f-efe0cce7608a} - {b47edee3-c87a-43e3-9aea-e6d5a85047ff} + {72308929-6b30-4c34-821a-6d359b68b896} - {a43da434-48d1-4ca3-9bf5-1933e5eeeca5} + {b54a2e7b-fcf0-41fd-9e0a-4fa2bc71f4d5} - {3d5f93f5-f72e-4a75-831e-3f9f9d353c1d} + {6f073440-5b26-4e6d-94dc-17a2ad402442} - {04ac3412-cf5b-49d0-8cfd-883810a330dc} + {cd0e5bc4-3c64-4cfc-bbd8-3555fbf81c5c} - {89f937fd-909d-490b-b852-a3b85de073d0} + {6943dcf0-f152-4aee-9cf6-54531bbd48d1} - {4e52dea9-a16e-42bd-8ce8-83e2860a07d3} + {2ad55c5e-6a1d-482b-8937-cf6279ceab85} - {337d5b20-68d4-433e-80b5-0f43518b48f2} + {bd79054e-581e-4516-97ca-13d19a580c65} - {38368cd6-01b9-4256-9292-2e7391da1de5} + {712fd556-c13e-4084-b10e-80dd6a7e16fd} - {0d67caf2-f61f-4c25-9613-8bbbb75cbf0a} + {0f03bfbc-000e-4226-9f97-fba49556d9ad} - {b8ab563b-63d9-4310-bebd-6aa25e884e6f} + {61bbde5f-d226-4a01-ae9e-eae3619cf694} - {febf692f-4482-402f-b36f-8ae268cb89d5} + {9fb08ffa-6f6b-4bbd-b2ea-7b7ccb4e3794} - {3a58366d-ba2a-4eb1-8b42-4b4eaea70b37} + {4423b6ba-91e9-4a5b-aab0-8f3d3f417a69} diff --git a/Data/testsuite/TestSuite_vs100.vcxproj b/Data/testsuite/TestSuite_vs100.vcxproj index e56dc711f..14a95b6f4 100644 --- a/Data/testsuite/TestSuite_vs100.vcxproj +++ b/Data/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs100.vcxproj.filters b/Data/testsuite/TestSuite_vs100.vcxproj.filters index ba9ae1926..951ea2b19 100644 --- a/Data/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {19e2322f-6d13-44f6-8c2a-cbb408f1d128} + {5cd9de31-7675-4924-bfdf-3b75fb5c8ef0} - {cc772106-4669-4839-a55d-f00eca72a47f} + {f60daf48-c907-4be6-a62a-862d426f5627} - {fe799c0f-3e0c-4449-b356-02c50b5342b1} + {f418712b-65a6-4952-9050-f8be6d8aa9b8} - {9a62a1bb-9715-4c41-95e1-f7a089b35f0d} + {e2da3c5e-a881-405d-bc03-7c7c0cab595f} - {5f989294-1545-4092-b7aa-ca7196dfdcb0} + {daeccabb-d9e3-4c0b-9299-419a8cbfba03} - {dd20b432-b4ec-47aa-afa8-c90b404b7b82} + {e12bcb59-f81f-4be0-a421-cae907586ba6} - {cd908598-223e-4794-b919-98f67d781f99} + {233af856-f6c6-4b6e-899a-f29b31684194} - {361c3d5d-17f2-48ef-86cd-b8dad5fd1c7b} + {cc3447ba-8a9d-48f7-af67-43c42af3879a} - {f65427d0-df1a-4fe5-9b2d-3dc02c9b727b} + {996cdce1-8747-4873-ab25-425750c4ef35} - {80ae9b58-4fe2-4f76-8a8f-2e27ab76afe7} + {19ba41d3-f4d8-4c91-81b4-f5a398a988be} - {1178afe3-6922-4bba-b9ca-bda70102d032} + {5315ef2e-0436-4cd4-ae74-dd95122d6b77} - {dfdd77d8-eb0b-4482-a020-55c0c76df9a6} + {f58ee13f-8aad-4c14-b8db-7c4a28ede584} - {3e724ef5-2219-44b5-a689-868bc32791fc} + {8de27ca1-5b79-4cfd-a1ed-3e53dcf4a0d2} - {dd41a284-633e-4520-8cc5-9721a4ec8e3f} + {d6daa72a-47ea-41cd-86ee-cf9c5fc955e7} diff --git a/Data/testsuite/TestSuite_vs110.vcxproj b/Data/testsuite/TestSuite_vs110.vcxproj index 251f74add..cf756749c 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj +++ b/Data/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs110.vcxproj.filters b/Data/testsuite/TestSuite_vs110.vcxproj.filters index e00abb490..d0975594c 100644 --- a/Data/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {c994b3cc-5b6c-484f-84aa-08a66671c061} + {8430b96e-d88e-4641-9b7f-b1dc14dce3e0} - {22a0545d-2b45-4d11-a8c0-130e95c57cf1} + {0fed3d6f-fb8c-45c8-a561-b8171efb27fc} - {6e275394-7f25-4d6e-92f0-b94f336346bd} + {ef5de2b8-035b-4a95-9d00-71d0e830786e} - {14583bf0-04da-45fc-87bf-fed6aa5e39af} + {4b9b39f8-0b95-48d7-b48a-32bc044e8c8c} - {c72c7b6f-b83c-4cfb-b211-392f53aade01} + {7102b581-1aa1-4e4f-96f7-3f7df52cae19} - {8a4d056c-2554-4bf8-a5f4-db06b38b3ada} + {5de48aa6-b961-42cc-aca8-8d19cb74a613} - {4b57db0b-e139-4d79-be95-412d3f3cb5a4} + {764483db-298f-4c14-98e0-4c783db5e0b3} - {b52ec83e-63cc-4c57-9d03-e929e606cd3d} + {576048fc-e452-4cea-8cfc-8d92f73c49e6} - {a487a1d4-9c3c-443a-8120-7861725aa843} + {c572783b-9eef-4ea7-8f46-e520d9b8f1e2} - {815ce9e8-fdcc-4203-9056-a2940e0b0c41} + {335b64c2-5089-4f0f-8bc7-d82d76ce5ebc} - {ec23403e-362e-414b-aa42-5ac36248eef0} + {54cb8742-4b31-4068-be04-e466323f2621} - {2700057e-d603-484d-9d26-d029df2e3469} + {27a470a9-4675-4217-b50c-fe0151265e80} - {23dce6a0-cea0-45c3-8350-dca4c9176fcd} + {3d8216c3-a50b-4b83-a714-a9b24c9ec0ff} - {722d69f7-64b2-4a2a-a50a-1e865cd1d9c7} + {8bc77766-8d4e-49c3-b690-f6acecd0098b} diff --git a/Data/testsuite/TestSuite_vs120.vcxproj b/Data/testsuite/TestSuite_vs120.vcxproj index 1536d061c..f067dcf61 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj +++ b/Data/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs120.vcxproj.filters b/Data/testsuite/TestSuite_vs120.vcxproj.filters index 0988c464c..cbc5c7bc0 100644 --- a/Data/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {3628e615-38c1-41e9-be73-61653dfd41b0} + {72dd9830-f436-4c24-a404-de1dea2f8ea3} - {709612fd-161c-4b25-88c1-7a77fed130dc} + {7e222100-c2d2-4617-b802-89c0f2ecff01} - {18b749dd-cc51-4fc4-8fb3-a7de37195b27} + {052cdf27-3676-4502-a77b-1ca6a6daecfd} - {31dc2417-ae5f-4dfc-aa04-9ae77dc784d7} + {7d846a12-f746-4633-befd-b1e665c3fdc6} - {4983b609-9e64-4301-b219-40a5289eba30} + {e9be5576-5e04-43ef-965f-e6b3598896e0} - {9751b31d-9424-4cf5-85d0-fbb06661b1fe} + {06651778-a6d3-4bed-927b-458f02e4a2ae} - {14a9dbc3-d1f5-4186-b721-215aee59eb18} + {78dae345-1897-4dfc-b61f-39177b51b110} - {d54d521c-d3cb-455a-8db6-fc024104a79d} + {7aaff912-667d-43d7-8eae-a35d218d6cfa} - {08317035-5764-414b-bba2-34c418edbff8} + {51cfc758-3877-40dd-b565-45c20ca378a1} - {29a46250-2d7a-4300-b4b6-bb48e0b2c3a2} + {c06ab96f-982d-4e12-808a-11f12676ef4e} - {5b1d2f5d-fa8b-44d9-9029-b85d0e174285} + {3e6a7d24-9753-4599-acbc-a47f531e1e86} - {edff14e4-a504-43a3-897e-881f971edcb9} + {def6a048-c602-4c5d-ad2d-d1a1404fd6f1} - {e85b6be8-4a61-4755-acfb-ad1e8e20c74e} + {3c190c0e-d5bf-4442-b120-afbd54e0a0c9} - {1be0c035-7fc4-4cad-9001-3c122c5fc6b4} + {a1a7cb25-7c8b-4436-ba46-6041b847771e} diff --git a/Data/testsuite/TestSuite_vs140.vcxproj b/Data/testsuite/TestSuite_vs140.vcxproj index 891b61620..555a1ffb3 100644 --- a/Data/testsuite/TestSuite_vs140.vcxproj +++ b/Data/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs140.vcxproj.filters b/Data/testsuite/TestSuite_vs140.vcxproj.filters index cf6bd9fda..05374ab0a 100644 --- a/Data/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {7bd4e729-bf1a-4249-baae-013a9215dbe8} + {700a379b-c791-4bc8-af53-0b1d67eab9f3} - {103b4ef8-5ca3-4067-b156-5c8a3eb22597} + {e2433dad-52f3-4526-95f0-dda89fd97db7} - {607d6e8e-0006-496b-a23e-af9638bf9107} + {3741b99f-b509-45e9-a479-13b0804ba4e4} - {d505692c-f3fd-487b-87ba-5b02fefc018d} + {9eb9c4d8-ac66-42e3-b321-5e66fddfce9d} - {462d9501-6e8b-4c21-bdde-d1fc1f4bb309} + {9b580255-619b-4968-a8d3-23162c26a596} - {b7e11b18-0fe3-47d0-869e-6065b7bc38d5} + {caffeccc-297a-4c4c-a4d1-30c449f283d6} - {ab2a200f-2b40-4583-8ee5-26455fcf81f9} + {c456511a-ae65-4627-9f81-7b02e4e15e7c} - {f3e66970-834d-46ee-8ef0-ffebb790a556} + {f2c9a6cd-00ba-46ea-b4ae-6c6b0067efc1} - {72592b06-653e-4e99-98c2-70ef728b0b17} + {eec6403d-b42b-47bb-93e5-0e9d27c97a5f} - {ed9566bf-4404-4e8e-83b6-c88b752b703c} + {5767b507-e6e4-4511-9423-8af7666d629a} - {c665bb3a-b8ed-4bc4-bead-b3255600c8b5} + {e0bb9e39-79da-4d65-8c12-26dc83448428} - {c05e1767-3a10-4244-bf4b-7ba7d9cb3a7a} + {6ae2e8a7-2183-4ac6-bd4a-2e09e0c4f28f} - {83b52c2d-d708-4529-a003-c9fa92165de1} + {70f3dd70-ddbe-45d5-a03d-a8b3af2e213b} - {60ff879a-033a-4702-9725-e196a3a16f33} + {e8456e33-bde5-44da-a752-b3e7d67dd214} diff --git a/Data/testsuite/TestSuite_vs150.vcxproj b/Data/testsuite/TestSuite_vs150.vcxproj index 5db09a5fd..be2dc8637 100644 --- a/Data/testsuite/TestSuite_vs150.vcxproj +++ b/Data/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_vs150.vcxproj.filters b/Data/testsuite/TestSuite_vs150.vcxproj.filters index d9a47d777..597346fae 100644 --- a/Data/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {e191fd2e-7b1b-4d0b-9811-2691ca3f0c65} + {4841a408-4dec-4372-9b76-cd8630a7b521} - {331af13a-e31f-40f4-919f-059e030a9530} + {4f625e53-b1ab-46c1-8a11-952002a9c221} - {58e2e3b1-ee4a-4bd9-9d3a-bbcecad178c2} + {6f599d59-50f7-4ed8-ab3d-00b99c6e1133} - {c4a0ff5b-d308-45f3-8ba5-14532fe355bf} + {b69f8140-a202-4d06-bda9-46b1dc22cc73} - {ed9a046b-e8ef-4597-82fa-3b6be0a6c051} + {ebcf5728-640f-4b83-9d7d-d2fc7c518f95} - {87acfe3e-cab2-492b-8f16-b255a8e2dd6a} + {b55ef444-309e-4b27-9e3d-11d84db50305} - {990eca72-e803-435b-a1f2-5213a5772da7} + {4fc9612a-042d-443c-a05c-9e232229ea4f} - {db2f5f7a-02b2-4820-8484-f7e33ba257b8} + {334b90ba-8a38-471b-9e66-19a3972cc51e} - {d57b2c2d-b7c1-4364-adf3-4c30441c9f5c} + {b08b3c17-7268-4c35-99b0-7df7c2bb13de} - {d9d1d34a-d42a-4f31-a664-650e770f6f61} + {8839c867-4987-4550-82d9-40670f7b5741} - {6f945ad0-3b78-4ee7-9079-7e45bfd72093} + {2a421b1e-733d-4bed-92a2-2009f8fb26f1} - {b84db61d-1ff5-4b61-9e1b-45e0a477c38a} + {ad01e7db-18ba-4300-9f39-d3e992595423} - {2f78c413-fd10-45f9-9e9b-11567026d3ee} + {24de509a-629c-4c3b-8d5a-e1846f907e64} - {6277956a-b526-4b6f-81e3-a11282479e3e} + {acbcbaae-acea-45c6-854c-9ffcb14185aa} diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj b/Data/testsuite/TestSuite_x64_vs100.vcxproj index 10e4e77c9..699e3f700 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters index c1f04867f..4bdbab753 100644 --- a/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {fff3bb2a-0cda-4043-8562-683de25b53dc} + {18052633-f765-46f7-962d-3460a3767a5b} - {24591343-6bfa-4a0a-838a-155396e57f49} + {84d1564e-578b-480c-a9ac-312afa49b090} - {f0af132f-df00-45d4-af5f-879f12fce9b2} + {ef1f8fef-e4ed-4c73-9232-fba5b7c984f7} - {0937b6d5-f74f-423c-bdfb-c0e270388b21} + {2b31de11-7cb3-4e77-9ec4-d79fc2873ab4} - {205217b3-fa4c-45a7-a7bc-a07f3766f573} + {24909aae-1cb5-4fe6-8ae5-2cdf3c8778dd} - {622ab8f9-630e-481c-a19c-f063bf24f7d5} + {a2d7bbdd-ee5f-4656-801c-258fd28b54c2} - {ad6d9a83-5bdb-4cdf-be44-585d35a8f5e0} + {8080d023-1828-41d2-a204-0ebcb40dcd4a} - {f2142239-7017-4ecf-b4f5-e85c50de6387} + {c9be3f26-245d-4ea6-b831-e12e8889e101} - {35d36eaa-aef4-486d-978f-6064056c7ef2} + {e0c25f22-6403-4394-aae5-e26747f6f95f} - {6e07b1cc-b413-42ed-be8c-af27b4695956} + {3fe569e6-bd4a-441c-9857-c682ba0e5b5e} - {806927c7-40dc-49e3-a531-9a875ce220f0} + {9e3a41b7-19de-4d71-a951-4e2eefc9d9bb} - {beac6316-067f-41ce-9f68-3fe9ef7787e5} + {7a131afc-3df3-46e2-bb16-b23aa3716a13} - {0c7fd92d-7d73-4bb1-b665-df456ad37dee} + {7a629db0-26ef-40c8-b1d5-31e73de67d91} - {220b8a89-0f39-446a-857f-901271422e3b} + {5c60c132-8ae3-40fa-a767-34bb0f54c447} diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj b/Data/testsuite/TestSuite_x64_vs110.vcxproj index e68d95494..6205bed7d 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters index c6e8eab27..3c677a256 100644 --- a/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {cc3dc132-fd6a-4296-84d6-31b5b9d08475} + {226b0471-7e47-4a6f-a885-8062fa91b548} - {af655687-9544-4e93-84a1-23c66164e371} + {a51b81ac-b2d3-4919-b212-2f9f1937b37c} - {d4adeacf-9e03-42e1-a958-67f50a6abea2} + {92849c6a-e45d-4f1c-b58b-cff82decd917} - {fdf7d252-2d99-4bc9-8e42-34a41ae556b9} + {149449e7-e012-4366-a075-eb28b5695553} - {16cdb692-94cb-4c1e-92ae-5592b7de6706} + {041975cb-9ce1-4f2c-abec-9829ffe2c60e} - {bca78984-d782-46c8-a7d3-1678f824bf09} + {dfde034f-80b1-4a70-beb4-51c516354bea} - {c0b41ce5-df5a-426f-acef-500accec84e5} + {2203ff13-f6c6-4965-914c-4a47d8cf3d82} - {e352741f-96f6-4c63-90fb-3386e8c2b19e} + {374b02bf-3b55-42a6-9460-86d52d221ae8} - {b5a838a7-32d5-4010-bcbd-9684dfb9bbbe} + {e9d47a3e-8010-4e87-90a7-c93e5f506a71} - {39a669cb-04e6-434a-9cbe-b650d1918f59} + {fe9949fd-047d-4953-bf1c-c16d6b632991} - {f9434dbe-9074-498e-82c4-dfd2d67d7e21} + {57f466b6-a714-47ee-9d73-f359f425c4db} - {b161d1ff-3a81-456b-95ed-74b8036d7e1e} + {10ee6ff9-aad9-45c7-8891-770964242d9a} - {eec1f7bf-b7e6-4f95-93bd-5d40cc0d1b27} + {7300b3b6-6fa2-45f4-8b5d-49194b81d41f} - {463b994b-ebe1-4ee6-b325-167757612aea} + {ab11bfb6-e9dc-465f-9f7e-b3c641e819f7} diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj b/Data/testsuite/TestSuite_x64_vs120.vcxproj index f5175fb8c..4e3a6d28a 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters index 7c4dcc53c..8f46a0719 100644 --- a/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {ce6c5de2-9987-4b20-bc9b-cf175879857a} + {02af4be0-d71b-4ff0-8a9c-702acffe8685} - {4ce8a9d7-ac3c-47a4-a6eb-57b0f2ce976b} + {418cec26-1d96-4bdf-988c-6d1ecb10c385} - {fc33bff9-78f0-4e55-8b3d-8f6c11955ae8} + {4ac26295-beee-4c5b-ba8d-1af58c00cb01} - {f764817c-d894-44e1-abe6-8421745c316f} + {c5005b78-6379-4f5b-a308-aad87de01b15} - {fce11772-ef57-4efb-aca7-f8a5de0f7575} + {84a2bc90-5a58-4879-bbac-4fca9e635b9a} - {b1dc68e5-0348-4c33-aca1-687d4fa6db8d} + {c2ddb740-1f05-4fbb-8f6d-436016a39f2d} - {cb35aa04-c500-4e6c-9759-f48f0b5d56d5} + {9e393d33-dfbe-40d0-8e89-af04b1c4803f} - {b94c066a-4529-402d-979f-b8b3a71e6f2b} + {7cf3dc7e-b305-48e0-bd3c-ca4c7c7539c4} - {77e67fe4-2ac3-4bdb-8281-f030aaa0bc6d} + {0e0e6077-ec40-4c29-b20e-cebd717e327c} - {c843deb7-25a9-4240-8526-1cfe2d0e12fe} + {c31ffca9-570b-4318-b8fa-8bc35cf7cbbb} - {d7e26b66-f01e-4c09-8b5a-a12c7b9207ed} + {d8e0f09f-9f17-4d8a-9764-8d748c027b80} - {407b143e-becd-4f26-bae1-c81c5793a672} + {e9f864d3-698c-4dcc-bc8b-d8de2b85fd41} - {4d2d31df-b093-47b6-84a5-a07529a2b3b3} + {35d665c6-f1f4-4f63-aeff-9e943f098607} - {ff6a147c-3aa9-482a-99f1-e4936da63dde} + {699af7f1-97c0-4e64-a323-98f7d0a4eb61} diff --git a/Data/testsuite/TestSuite_x64_vs140.vcxproj b/Data/testsuite/TestSuite_x64_vs140.vcxproj index 1dd1f827e..265d37492 100644 --- a/Data/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters index be17527bb..9f0245d6b 100644 --- a/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {583273ae-dbad-4af2-bed3-2c6bc5853802} + {db585a2f-8eb7-4997-9028-e3df3efe915e} - {fc269909-e298-4397-b657-a2180c550815} + {567222d8-179d-48dd-a237-4ed2954c0dcc} - {4b652c4d-1934-474f-a67b-a32fecc906f9} + {78c6b9bf-bf1f-4bcd-8f26-882df8d78ae9} - {26909bb5-d5f8-4a19-b386-0c15566e298a} + {59d5b373-744d-49c7-9a0b-f79a7feb09f3} - {8d665c85-a219-4697-9bdf-5a7d0a80ed07} + {3121596c-681f-4601-bc45-8121c622c986} - {31843d17-0bf9-4121-8cd4-d27246ca915b} + {4d6d627a-ab74-40e0-80d0-c538c57043cf} - {eb6a1582-b09b-4521-b761-c03853769bda} + {b9c9f50a-0b33-486c-ba04-8b9c713dcbe9} - {3517c4a3-2976-496b-b401-2e00029ecd7e} + {db2eb87c-6f24-42eb-ace8-3b464900a646} - {cf3586a2-d62f-4f9d-b94b-61d7120e7961} + {941547e0-9b27-490d-bbb6-fe192d9e4007} - {a01a01dc-99eb-4b0c-80dc-becaad977ed7} + {fc8cf47f-cafc-4484-aa3c-37194027a5de} - {c06e010e-7923-4276-915d-fd5bd7a4fc2b} + {f96d44dd-35e2-4e10-b4e1-c291554aa135} - {6e9cbf02-a20a-40a2-b75e-e62a56f364d9} + {ff045bf8-08bf-4e43-9cda-c432d13602db} - {1d81659b-78e6-43da-a2b8-b320ed791b59} + {ec754986-f599-4790-bafb-5f5f55a9b668} - {4b66703f-f36f-4a7e-bb6e-a3d349d11054} + {83444c93-e1c3-4ac9-8205-3911b8884aff} diff --git a/Data/testsuite/TestSuite_x64_vs150.vcxproj b/Data/testsuite/TestSuite_x64_vs150.vcxproj index 094fa0bbe..d1dc9f917 100644 --- a/Data/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Data/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters index dc7584aa8..e986f1479 100644 --- a/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Data/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {d5ce2c41-15f7-47f5-a71b-5e5b28a6b2b0} + {102e4ebf-dfac-427e-b3c6-0027feaaa309} - {bb89804e-a046-4a4d-9c5f-50627b0365b9} + {0b0ecc92-01e9-4586-90fb-62a49b5ebba0} - {9609da15-ff79-4e7a-bf25-c37b95fcd437} + {a93e4ce0-3113-42cf-872d-9ff6e27d0930} - {7e3a27f0-5a66-43d9-a526-162fc7adc422} + {00747992-a837-4976-bbe1-11465635801f} - {26c112e7-1152-48d8-a679-acc83202b5c5} + {12e84a45-4cbf-4a08-9ec2-13f43d5d984b} - {a4e41eae-fd3b-49ca-ab67-73d7baf810b3} + {1ae4af67-f85b-4637-bc6d-60faae6d1bed} - {57849d35-1004-4fda-8b32-75e82a02e58b} + {b6b513f9-8a81-4bdc-8c22-499093478f4b} - {b2aa73ad-913b-49c6-acf2-64ebd48f50de} + {ca4ad6a7-363e-412b-8363-bb007516dccc} - {8192bad2-c0aa-4a85-89fa-ee9cff776ec9} + {d41cbfe6-c0f0-40c6-9ba2-827b429c76c9} - {7406c484-7d52-4d67-ac93-4c5132d1abae} + {50c6104b-78a3-42c7-82f4-45425006bfdf} - {032c2918-00e5-4a6e-8fa3-e3ecccb6322a} + {59e42c24-86cf-4a26-8b0f-878872e8b22d} - {73353bb2-e263-4568-93c3-c9e63e50c0b2} + {efde8dde-d939-4ba5-9d00-0fa2c5689aac} - {a39df0fc-0f5f-471f-b447-78da13964653} + {60850a05-ce5e-4c61-bdcd-e56d487cb7b2} - {79583080-448d-4286-aa5a-1a46392c6b76} + {220368b4-f947-4592-ab71-73999be48705} diff --git a/Data/testsuite/TestSuite_x64_vs90.vcproj b/Data/testsuite/TestSuite_x64_vs90.vcproj index 8fe9994f2..47d4bf641 100644 --- a/Data/testsuite/TestSuite_x64_vs90.vcproj +++ b/Data/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoEncodingsMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoEncodingsMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoEncodingsMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoEncodingsMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT diff --git a/Encodings/Encodings_WEC2013_vs110.vcxproj.filters b/Encodings/Encodings_WEC2013_vs110.vcxproj.filters index aa44a4de9..8ecc79002 100644 --- a/Encodings/Encodings_WEC2013_vs110.vcxproj.filters +++ b/Encodings/Encodings_WEC2013_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {fd123da8-38fa-45b7-9284-7d1bea4fb58f} + {14a88729-aeb4-4321-a68f-05aa0f876194} - {425cbcd1-e53e-4013-8f6a-b5f685d5f052} + {9b83316f-1dcc-4abd-b982-b9836e8c9a55} - {d389e869-eb73-4003-91d7-44d56c080718} + {95589d33-041d-4053-bc09-894dc391d94b} diff --git a/Encodings/Encodings_WEC2013_vs120.vcxproj b/Encodings/Encodings_WEC2013_vs120.vcxproj index 2d19f8269..c861e5ab0 100644 --- a/Encodings/Encodings_WEC2013_vs120.vcxproj +++ b/Encodings/Encodings_WEC2013_vs120.vcxproj @@ -43,11 +43,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT diff --git a/Encodings/Encodings_WEC2013_vs120.vcxproj.filters b/Encodings/Encodings_WEC2013_vs120.vcxproj.filters index 10e9d6a18..c6d0fb449 100644 --- a/Encodings/Encodings_WEC2013_vs120.vcxproj.filters +++ b/Encodings/Encodings_WEC2013_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {c0756457-1f59-4d98-b292-030f8f89c7f9} + {643e041c-4eea-427c-ae4f-8ed053c31adb} - {6b4258da-76e4-4371-928d-d1eebc8465fe} + {f36e7fea-d947-4c0e-96cc-858bb9a4c430} - {ca25b02c-477b-46b5-b2a2-02088740b3e5} + {0771bf80-463e-4eec-813b-03738250ca29} diff --git a/Encodings/Encodings_vs100.vcxproj b/Encodings/Encodings_vs100.vcxproj index 7b9a042a7..0f54ad990 100644 --- a/Encodings/Encodings_vs100.vcxproj +++ b/Encodings/Encodings_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Encodings\$(Configuration)\ PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoEncodingsmtd.lib + %(AdditionalDependencies) + ..\lib\PocoEncodingsMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoEncodingsmt.lib + %(AdditionalDependencies) + ..\lib\PocoEncodingsMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoEncodingsmdd.pdb + ..\lib\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoEncodingsmdd.lib + %(AdditionalDependencies) + ..\lib\PocoEncodingsMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoEncodingsmd.lib + ..\lib\PocoEncodingsMD.lib diff --git a/Encodings/Encodings_vs100.vcxproj.filters b/Encodings/Encodings_vs100.vcxproj.filters index 838590676..333f70130 100644 --- a/Encodings/Encodings_vs100.vcxproj.filters +++ b/Encodings/Encodings_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {b7797f76-af58-44af-add3-4ed6aa03e28f} + {d1f399e0-ec15-4764-93d0-04139fff6be7} - {debeba5f-688e-4f46-9491-33b9fe450de8} + {80466115-6347-4bfa-ba55-74dcaec5dca6} - {cde2625d-b701-4d27-a56a-951b05f4a740} + {34128bda-40c3-4c09-9bc4-cacac7d0419c} diff --git a/Encodings/Encodings_vs110.vcxproj b/Encodings/Encodings_vs110.vcxproj index 033bff248..1f93fe480 100644 --- a/Encodings/Encodings_vs110.vcxproj +++ b/Encodings/Encodings_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoEncodingsmtd.lib + ..\lib\PocoEncodingsMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoEncodingsmt.lib + ..\lib\PocoEncodingsMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoEncodingsmdd.pdb + ..\lib\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoEncodingsmdd.lib + ..\lib\PocoEncodingsMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoEncodingsmd.lib + ..\lib\PocoEncodingsMD.lib diff --git a/Encodings/Encodings_vs110.vcxproj.filters b/Encodings/Encodings_vs110.vcxproj.filters index 518e5affe..8ff7f77c8 100644 --- a/Encodings/Encodings_vs110.vcxproj.filters +++ b/Encodings/Encodings_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {5d887b7b-76eb-4ceb-9ad1-c981c5ea6d97} + {480f70b3-f4ea-4e1b-854a-9952e1bee1e2} - {4f54d27d-6238-448c-95c4-bc6b8e9df108} + {f8210d11-8733-42d6-b555-cadcfba8c98e} - {c185a1cf-9bfc-4b19-a2c2-de1752f095f6} + {9bbb1892-0edb-4b0f-bfca-f1b623c52f3c} diff --git a/Encodings/Encodings_vs120.vcxproj b/Encodings/Encodings_vs120.vcxproj index 77ed03a10..b9f1322f6 100644 --- a/Encodings/Encodings_vs120.vcxproj +++ b/Encodings/Encodings_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoEncodingsmtd.lib + ..\lib\PocoEncodingsMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoEncodingsmt.lib + ..\lib\PocoEncodingsMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoEncodingsmdd.pdb + ..\lib\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoEncodingsmdd.lib + ..\lib\PocoEncodingsMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoEncodingsmd.lib + ..\lib\PocoEncodingsMD.lib diff --git a/Encodings/Encodings_vs120.vcxproj.filters b/Encodings/Encodings_vs120.vcxproj.filters index 3ff7ad8c3..fefc05b20 100644 --- a/Encodings/Encodings_vs120.vcxproj.filters +++ b/Encodings/Encodings_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {c168d0b6-c8f4-45c3-b6e8-2e0c5d7f175a} + {a8f56860-aa18-4805-9e59-49e741e9a458} - {0b668360-962f-4a97-9afa-7a0e9dcc9aba} + {557f20f7-1e17-45b7-b3a4-7d0a3b937ab4} - {ba9f521d-205d-457d-b739-97ba60f906d5} + {d4bbab24-abbe-4c15-8763-45d487fb72ca} diff --git a/Encodings/Encodings_vs140.vcxproj b/Encodings/Encodings_vs140.vcxproj index 9a8c2eedc..fcb2fa1df 100644 --- a/Encodings/Encodings_vs140.vcxproj +++ b/Encodings/Encodings_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoEncodingsmtd.lib + ..\lib\PocoEncodingsMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoEncodingsmt.lib + ..\lib\PocoEncodingsMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoEncodingsmdd.pdb + ..\lib\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoEncodingsmdd.lib + ..\lib\PocoEncodingsMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoEncodingsmd.lib + ..\lib\PocoEncodingsMD.lib diff --git a/Encodings/Encodings_vs140.vcxproj.filters b/Encodings/Encodings_vs140.vcxproj.filters index fce57d6f7..8e71ea41c 100644 --- a/Encodings/Encodings_vs140.vcxproj.filters +++ b/Encodings/Encodings_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {46441dd5-f910-4f58-970e-093e46e6efe0} + {66da1f26-b4f9-433d-b2fd-b5267b23cd1e} - {66bb2c8b-3d47-42ca-8c01-584b8caa6eaf} + {7f146171-4e98-4aeb-b06c-6da4288c55e1} - {1a0eed93-c5b8-455e-8b9e-35d96b2506f4} + {b95d21a1-5522-4848-bca5-7e57f519bd4f} diff --git a/Encodings/Encodings_vs150.vcxproj b/Encodings/Encodings_vs150.vcxproj index b045398ff..d3a365eeb 100644 --- a/Encodings/Encodings_vs150.vcxproj +++ b/Encodings/Encodings_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoEncodingsd - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoEncodingsmtd.lib + ..\lib\PocoEncodingsMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoEncodingsmt.lib + ..\lib\PocoEncodingsMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoEncodingsmdd.pdb + ..\lib\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoEncodingsmdd.lib + ..\lib\PocoEncodingsMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoEncodingsmd.lib + ..\lib\PocoEncodingsMD.lib diff --git a/Encodings/Encodings_vs150.vcxproj.filters b/Encodings/Encodings_vs150.vcxproj.filters index 0966f5053..c73914d54 100644 --- a/Encodings/Encodings_vs150.vcxproj.filters +++ b/Encodings/Encodings_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {c58d78b3-187a-449b-bd82-f78877046f86} + {8009f6e6-7b3a-43e7-810e-2c70de5e6f08} - {0da67222-7053-42f9-90b8-4b878b9ab28d} + {3d8655e4-3cc0-4dd1-8cfe-869d42273e15} - {96b274e1-0a0c-4a0a-a17e-7c84e2e6a4e2} + {af1cecda-f66c-4aed-96ce-9275531b51f8} diff --git a/Encodings/Encodings_vs90.vcproj b/Encodings/Encodings_vs90.vcproj index 3c371e554..fc44b43cc 100644 --- a/Encodings/Encodings_vs90.vcproj +++ b/Encodings/Encodings_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + AdditionalDependencies="" + OutputFile="..\lib\PocoEncodingsMTd.lib"/> + OutputFile="..\lib\PocoEncodingsMT.lib"/> + OutputFile="..\lib\PocoEncodingsMDd.lib"/> + OutputFile="..\lib\PocoEncodingsMD.lib"/> ..\lib64\ obj64\Encodings\$(Configuration)\ PocoEncodings64d - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings64 - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoEncodingsmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoEncodingsMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoEncodingsmt.lib + %(AdditionalDependencies) + ..\lib64\PocoEncodingsMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + ..\lib64\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoEncodingsmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoEncodingsMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoEncodingsmd.lib + %(AdditionalDependencies) + ..\lib64\PocoEncodingsMD.lib + MachineX64 diff --git a/Encodings/Encodings_x64_vs100.vcxproj.filters b/Encodings/Encodings_x64_vs100.vcxproj.filters index 8bf4c726d..39b52e15a 100644 --- a/Encodings/Encodings_x64_vs100.vcxproj.filters +++ b/Encodings/Encodings_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {34d08c09-0c7a-4f3e-b034-2a1afb4b8d41} + {04c3742b-34d8-41f1-9fc3-0eb387f0a242} - {1bba0102-1d98-49f4-8c86-d6cc964a5fcb} + {a0947951-5999-4da1-b44e-00c77a3c2d9f} - {727f3ad2-44cd-4059-87ca-3ce3a8bfc723} + {61b7d7c1-4b86-4987-b5d6-6ffdaa625d9c} diff --git a/Encodings/Encodings_x64_vs110.vcxproj b/Encodings/Encodings_x64_vs110.vcxproj index aed120f91..d0fa9a3fb 100644 --- a/Encodings/Encodings_x64_vs110.vcxproj +++ b/Encodings/Encodings_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoEncodings64d - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings64 - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoEncodingsmtd.lib + ..\lib64\PocoEncodingsMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoEncodingsmt.lib + ..\lib64\PocoEncodingsMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + ..\lib64\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoEncodingsmdd.lib + ..\lib64\PocoEncodingsMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoEncodingsmd.lib + ..\lib64\PocoEncodingsMD.lib + MachineX64 diff --git a/Encodings/Encodings_x64_vs110.vcxproj.filters b/Encodings/Encodings_x64_vs110.vcxproj.filters index 783018eb9..bdb88aec8 100644 --- a/Encodings/Encodings_x64_vs110.vcxproj.filters +++ b/Encodings/Encodings_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {c8e1ce6c-25f6-4cfe-ac2d-cf6a835abdb5} + {003bdb35-c02c-4d4f-a54d-b06a9d639b7d} - {e0989893-d4e5-4bfe-a198-a880483a2d68} + {ae8ce8f3-cb3c-46a3-9fd6-3bf26f3e7e47} - {c7addbbe-9e1f-4021-83ad-4ca6e0434e51} + {266e40ad-5420-4812-90c6-a7651a079448} diff --git a/Encodings/Encodings_x64_vs120.vcxproj b/Encodings/Encodings_x64_vs120.vcxproj index 05be75861..045224a23 100644 --- a/Encodings/Encodings_x64_vs120.vcxproj +++ b/Encodings/Encodings_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoEncodings64d - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings64 - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoEncodingsmtd.lib + ..\lib64\PocoEncodingsMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoEncodingsmt.lib + ..\lib64\PocoEncodingsMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + ..\lib64\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoEncodingsmdd.lib + ..\lib64\PocoEncodingsMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoEncodingsmd.lib + ..\lib64\PocoEncodingsMD.lib + MachineX64 diff --git a/Encodings/Encodings_x64_vs120.vcxproj.filters b/Encodings/Encodings_x64_vs120.vcxproj.filters index 94c569320..a8e0406e6 100644 --- a/Encodings/Encodings_x64_vs120.vcxproj.filters +++ b/Encodings/Encodings_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {be7133e4-003e-4b06-b9ed-acd180699a56} + {8daec8cd-8da0-42ec-9d6a-a85c151537cf} - {cc0f1338-56d3-4e74-8f01-24a1740086dd} + {739d106a-02f7-457a-aad7-ef7a82951e14} - {a1511967-70a1-48c4-9245-d0125e9b8992} + {0ea469bf-38a3-4039-93aa-74c864dc6a7b} diff --git a/Encodings/Encodings_x64_vs140.vcxproj b/Encodings/Encodings_x64_vs140.vcxproj index f8c9f1d23..b0dba43d0 100644 --- a/Encodings/Encodings_x64_vs140.vcxproj +++ b/Encodings/Encodings_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoEncodings64d - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings64 - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoEncodingsmtd.lib + ..\lib64\PocoEncodingsMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoEncodingsmt.lib + ..\lib64\PocoEncodingsMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + ..\lib64\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoEncodingsmdd.lib + ..\lib64\PocoEncodingsMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoEncodingsmd.lib + ..\lib64\PocoEncodingsMD.lib + MachineX64 diff --git a/Encodings/Encodings_x64_vs140.vcxproj.filters b/Encodings/Encodings_x64_vs140.vcxproj.filters index 806c514ec..d988f4207 100644 --- a/Encodings/Encodings_x64_vs140.vcxproj.filters +++ b/Encodings/Encodings_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {44025d70-192e-4d43-97e8-6973713b2682} + {63d884e9-56ac-4067-afab-cea65e3285de} - {4928ce16-cb65-4730-bc80-cc972ef5d192} + {e01dba65-c6e0-46c2-81da-3ff94b7b3fe6} - {811dc66e-8f41-44e4-bc56-dd81413fe892} + {e4ce8d98-dc9f-44e7-a2d1-836f691c8c24} diff --git a/Encodings/Encodings_x64_vs150.vcxproj b/Encodings/Encodings_x64_vs150.vcxproj index 4931a9b93..85f4a1640 100644 --- a/Encodings/Encodings_x64_vs150.vcxproj +++ b/Encodings/Encodings_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoEncodings64d - PocoEncodingsmdd - PocoEncodingsmtd + PocoEncodingsMDd + PocoEncodingsMTd PocoEncodings64 - PocoEncodingsmd - PocoEncodingsmt + PocoEncodingsMD + PocoEncodingsMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoEncodingsmtd.lib + ..\lib64\PocoEncodingsMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoEncodingsmt.lib + ..\lib64\PocoEncodingsMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoEncodingsmdd.pdb + ..\lib64\PocoEncodingsMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoEncodingsmdd.lib + ..\lib64\PocoEncodingsMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoEncodingsmd.lib + ..\lib64\PocoEncodingsMD.lib + MachineX64 diff --git a/Encodings/Encodings_x64_vs150.vcxproj.filters b/Encodings/Encodings_x64_vs150.vcxproj.filters index b803370ff..25524cec3 100644 --- a/Encodings/Encodings_x64_vs150.vcxproj.filters +++ b/Encodings/Encodings_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {80b8a764-78ad-4662-9072-64fe64be2042} + {690909f0-70c1-4882-a47d-7db9c37a0b29} - {64d859fb-ba8f-454a-a331-5c5f1ee13ae2} + {3ea957df-8a2f-4960-804a-785df0b41885} - {18e06686-5d18-4013-85b0-418ecf4adc86} + {a9a99c69-9c98-4691-a79e-e98f2445f2c5} diff --git a/Encodings/Encodings_x64_vs90.vcproj b/Encodings/Encodings_x64_vs90.vcproj index af98ab2aa..23cf8892a 100644 --- a/Encodings/Encodings_x64_vs90.vcproj +++ b/Encodings/Encodings_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoEncodingsmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoEncodingsMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Encodings/testsuite/TestSuite_CE_vs90.vcproj b/Encodings/testsuite/TestSuite_CE_vs90.vcproj index 7a4e56dde..188c2e542 100644 --- a/Encodings/testsuite/TestSuite_CE_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {ab75eece-c934-4669-a986-2728a8f6c11e} + {9d3beaec-c070-480c-8ab1-a7f587ec094a} - {25029889-3ffd-41eb-b755-96bac21218ec} + {e2f4e369-bf28-42ef-89ad-2974d89ebf61} diff --git a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 19df20ae0..3b068450b 100644 --- a/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {0862493f-1ef9-41ed-9309-e698de0e189c} + {19bbb448-0a57-42cd-baa6-0b3b836db4ae} - {72ed1cf8-63fb-4e91-9a64-c62661274e19} + {204ec69f-7c5a-46d4-bd5d-f543e69058c5} diff --git a/Encodings/testsuite/TestSuite_vs100.vcxproj b/Encodings/testsuite/TestSuite_vs100.vcxproj index 22026692c..84db664d7 100644 --- a/Encodings/testsuite/TestSuite_vs100.vcxproj +++ b/Encodings/testsuite/TestSuite_vs100.vcxproj @@ -201,7 +201,7 @@ %(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ %(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Encodings/testsuite/TestSuite_vs100.vcxproj.filters b/Encodings/testsuite/TestSuite_vs100.vcxproj.filters index 20c4bba55..6290de7bd 100644 --- a/Encodings/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {7b795fdf-617c-4c9a-8169-b16fa0c3bf0b} + {e8b6aaac-d1e5-4db5-ab59-4886536b6525} - {5cd6a950-8d6d-49dd-9bc6-fd60ecff47ac} + {3565a5b7-4c4c-486a-b795-6d7d86265f25} diff --git a/Encodings/testsuite/TestSuite_vs110.vcxproj b/Encodings/testsuite/TestSuite_vs110.vcxproj index f656d713b..082d581bb 100644 --- a/Encodings/testsuite/TestSuite_vs110.vcxproj +++ b/Encodings/testsuite/TestSuite_vs110.vcxproj @@ -208,7 +208,7 @@ bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -239,7 +239,7 @@ bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Encodings/testsuite/TestSuite_vs110.vcxproj.filters b/Encodings/testsuite/TestSuite_vs110.vcxproj.filters index f8f2131d6..598e56a46 100644 --- a/Encodings/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {e3f210c6-c173-4f7e-8cc1-6d1bfb0ce1bc} + {71e1f5ba-e306-4bd0-84f9-e55406f3f578} - {3c331928-8f2e-49f1-a7bd-ab85a669e00e} + {09f108a2-34d7-498d-aee5-a24ce3d50483} diff --git a/Encodings/testsuite/TestSuite_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_vs120.vcxproj.filters index 96e7d0b1d..d17aac48c 100644 --- a/Encodings/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {c1e0781b-4fc4-4117-b1a2-b33cc4c60d0d} + {8426819b-a5d4-49d6-9cef-69db62e3a789} - {7988a6d6-36ef-4a08-b750-3ad4ad6ce120} + {13d474c6-8bde-4ced-bfb1-313ee8b62f30} diff --git a/Encodings/testsuite/TestSuite_vs140.vcxproj.filters b/Encodings/testsuite/TestSuite_vs140.vcxproj.filters index 33025f4ea..2484b0682 100644 --- a/Encodings/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {635c052b-3214-4d63-b3f7-7d9051a67ad5} + {20b285b4-56d2-4813-b3c2-0cff6deaf6b4} - {44e0d005-32f1-4f8c-add2-2e223ade2fa7} + {8862bf4a-1229-46dc-862c-2c5c464e6740} diff --git a/Encodings/testsuite/TestSuite_vs150.vcxproj.filters b/Encodings/testsuite/TestSuite_vs150.vcxproj.filters index d892fd867..f57796cf5 100644 --- a/Encodings/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {b84f6ba0-a789-483c-b7a4-34fe9a5a1cf4} + {77867420-a945-4bb0-909b-4b6588bf697e} - {f72d23da-1351-454b-9537-6421885998a2} + {39e227b0-13ae-45a5-9386-b916fd0bb300} diff --git a/Encodings/testsuite/TestSuite_vs90.vcproj b/Encodings/testsuite/TestSuite_vs90.vcproj index 80d8603ef..e9d0127d0 100644 --- a/Encodings/testsuite/TestSuite_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ %(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters index ceb45c8cb..eadd1923b 100644 --- a/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {9d5a5caa-6e54-4b9b-a7f7-e42ff73b107b} + {8a4afd1f-0548-40fb-aa48-46151f1fd35d} - {01c85d58-ab31-43f2-ae11-9fd7480dcf77} + {c1ffb5d9-173f-4d5b-bd72-feb3dc1958ac} diff --git a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj index 69e9ee15d..98c66eefd 100644 --- a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj @@ -208,7 +208,7 @@ bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -239,7 +239,7 @@ bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters index af96ec43c..e79da5472 100644 --- a/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {f3fac9f7-5fcb-4bc9-a1cb-e74b4663916b} + {eab8b621-f7b1-4b06-8772-88afeeb5cef5} - {0ec2cf4d-2f89-4d39-915f-53b1dbea4885} + {dddaf105-1be6-4128-aadb-a77a07046315} diff --git a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters index 583410c95..ffa52ea8f 100644 --- a/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {d60cf7dc-a706-426a-8bd0-4e8fa4928c46} + {cd2334c3-ca88-43be-aee8-6874ab3aff3a} - {e43e4e28-631f-462c-9ee5-50461c64c09b} + {0a707121-e5ba-42e3-b98e-6175476f9c66} diff --git a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters index f8b24bb1a..c7928247a 100644 --- a/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {0daf700a-1988-4c77-9419-09e7a7b7434e} + {9d8070b2-9952-4059-a7df-009ae524bfa7} - {3f4d45de-6888-4e14-a0cb-8908a322c5e6} + {6ed2a898-c870-4b5b-a11c-800a9895948e} diff --git a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters index 6073315e1..eea100558 100644 --- a/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {24450d56-34d5-4f83-a068-7140d7da615b} + {44b39249-b84e-4d36-8bdc-27ae50421237} - {19be3fb5-3645-4a6e-859d-df3a0bc0acb3} + {a177f74c-ff3d-4988-b32a-86462b60b8da} diff --git a/Encodings/testsuite/TestSuite_x64_vs90.vcproj b/Encodings/testsuite/TestSuite_x64_vs90.vcproj index 18e25e639..237119518 100644 --- a/Encodings/testsuite/TestSuite_x64_vs90.vcproj +++ b/Encodings/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoFoundationMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoFoundationMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoFoundationMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoFoundationMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT diff --git a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters index 85bb93afa..299e53a4b 100644 --- a/Foundation/Foundation_WEC2013_vs110.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {78bea417-5d9d-4461-a225-b3bdc41ed346} + {7abaeaa0-f01b-4cb4-8e38-ed65d4069c9f} - {8b5b3c99-dc41-45e5-b98b-9410a0c0fe88} + {66a69ab6-3827-4186-b9ac-6c8d8c1bb597} - {0588d0d5-1318-4af7-aa28-0db07f0fc873} + {a213c168-f675-44fb-a9ba-84c6bc362183} - {3ed468d8-e9d9-4a35-ac3e-bc6cd69448db} + {b98becd7-7f4d-4529-8360-c14319e451aa} - {609de201-a24c-4431-afb5-e6beb798c249} + {07b175ff-1d7a-4eb4-8006-7b64aa038cab} - {84928494-f329-4734-a28a-22f8bfaaa62e} + {3b51c10f-15a5-4489-bab8-807e0ce5e56f} - {0c6eaf16-2f75-47de-ba3a-6c0c29b744e4} + {d3e39d9c-3834-47b8-abd0-f18bbdd926a8} - {f77ede58-612c-429d-b524-c3e27808115b} + {5bf526ea-c529-45d2-ad8e-c17cd8700a20} - {c2546b06-ae9e-44c9-9e50-ad8ed113f0f4} + {bdb5e3ce-188c-4b1a-b3f7-9e0872df59bf} - {bdef5bd6-e3e7-40f5-b4fd-595a52899c8c} + {ee204c33-2581-4a96-9383-599a5efe2f55} - {457ba010-95d8-4d89-a5e9-3dff6d5ebd06} + {96332212-2ffd-466e-8c4a-94c08f4b7fdd} - {c6c4ec03-161d-47c4-bff0-3a9dcc9f27fb} + {efebfd3d-a89b-4eec-be68-bdd19a6f7719} - {c621205c-5091-4e93-a088-5edfc997884e} + {0585da03-1a9a-4b14-ae89-2de194943991} - {cdd53e93-ebd4-4109-bf20-69e82a1afc0b} + {d428e00c-2fee-41ce-83e9-37fb5b2e69f6} - {60226828-7a54-43bd-ae7a-b194f0cc18ad} + {9bda322f-4aca-4e0c-a392-120f8955b41f} - {f5a466d2-8719-4b81-8148-5761ed093944} + {8315ec35-49aa-4673-bdb2-9bd61980a472} - {9b56b8c9-20ff-479f-8740-2c9deb814106} + {a5976941-9094-46fe-8a37-96f63f048273} - {92854f17-ff9a-4e53-b2d4-bab099707047} + {b05e47ce-e123-4d09-a59f-8d5adf302478} - {a5c72900-cc75-4c21-b9e6-3ea90b06dde8} + {f2e92336-2a2e-4482-b920-123b15f39c94} - {ea17bf51-d7f6-426b-8914-e9aa6c547047} + {08263b15-1551-47bf-ad41-66cb30eeb492} - {b30e8fb7-baa2-436f-8f2c-e7fa33f9524d} + {82f8be96-ee38-48e6-99de-15293fe071a2} - {f2ee217e-96c4-4316-8952-f5c849aa8661} + {062f7413-7974-4556-8835-f7438af725a0} - {6aa1b393-3d04-4e14-b9ae-7e99fd02cde8} + {649e59a5-e411-4b70-b76b-ca9f5303628c} - {49729d79-ebd7-496b-88f9-deeb2de8f50c} + {0fbd9d6c-b900-4f4d-9105-69135afa9f17} - {3a978819-34f8-41d2-9814-07d7afa59d31} + {740f0525-5ecb-434f-9060-736bcf1ab217} - {fa9586fc-7951-41ff-9034-0a6277fcb82d} + {46615f29-486b-4a00-8302-72a18c111b75} - {922b77bd-22ab-4fbf-8a66-a585c6826db9} + {67bfcf8a-4cb5-4cc4-8c96-3c86e4fa7840} - {65a155f4-4506-4998-9ef0-11c213a8b0e3} + {92bf9872-f03d-461c-a8c9-444a1600cc10} - {26a3dfb2-abfd-4451-970b-ad642ee6577f} + {ead7f0d5-7bc6-456f-bb36-eee92b7094af} - {1d45f089-6894-491d-880f-b60186609e33} + {ace70cfd-d92e-43a6-bb0f-868af32cdee3} - {d70bd62a-e2ff-4b07-8524-adcf2ef70b99} + {a1327424-c326-4d92-ae5c-af745b3300ee} - {7426dd17-1e9b-41e7-ab4b-89a3198727c9} + {d68f7b19-a43a-468d-88c8-393e1e9603a2} - {dce49618-b67c-4d25-b445-75ffe3a06639} + {560bcd20-c942-45d5-9891-b33f8f74ec46} - {409ced24-fd86-419f-bb07-d5457deb73ea} + {53967073-cd76-4c70-b120-fae1cce20660} - {3f9052a9-9da6-4d98-8e91-c29c8b076b75} + {127da083-54bf-4c2c-8306-a3755291bb84} - {f6769cce-2e75-46fa-aa9f-c953a2019819} + {e0f55f96-0a08-4615-a648-1745feb407d7} - {8f529a2e-120a-4259-8278-da54d5b80e76} + {8b79cbbb-5767-4a24-9685-2ec7927bdbea} - {d7f24490-be94-4505-a445-b15f57697f5a} + {b1169403-c7ba-480a-91da-50095acf607c} - {045d8af9-49dd-4049-8c59-52b2aac983ff} + {c8045851-197c-43c3-8246-7fb1d60cad38} - {b3bc33d6-6f3d-47e5-89e5-e9d2c807d484} + {71e907c1-55e8-41fa-af99-2c1a5caf0b68} - {04a80598-6f4d-4036-89b2-d1a9c9d04b5c} + {64b1037b-af9b-426a-8750-c834745ecfc2} - {9e165880-4857-4173-8548-adc30acafb68} + {97f40b49-346c-484d-b32d-8d2a34cc6904} - {cde0989d-65f3-42da-bc4d-66d0b6d444e6} + {b61f6750-9fc8-46c3-9e6b-5ea85128220f} - {f9232ee7-e315-4181-adcf-a474d63a1ed7} + {3359ceff-e74a-4fba-a51b-2f9edf42e156} - {49b4bb8d-37aa-4827-98fd-dc6ffc817901} + {78a72ea8-959f-4abc-a690-e41f927b6ae4} - {a0f5ff84-3188-41a5-8f2a-0ddad296a62f} + {83f18d86-3c73-4ee4-b244-ad56dbe80a31} - {6c2bc1ba-8672-47ff-acd5-f7cabcbd8126} + {9c414655-19c4-4e5f-b91b-976e70b395ba} - {a58c6f1f-ab85-4dd9-8d58-beac73d37534} + {725507f2-bc14-4d57-9ddc-a12538bc11f0} - {e6624acc-138a-4a7b-8d15-453ea0cd4ef9} + {ead0c6f9-f41b-4c84-bc98-7c9f361f04cc} - {37cec8d6-b4c5-4605-aea5-4a237d5aebb0} + {7d9e2257-d2c2-4fc0-a944-298c3e7bfc9c} - {548cb19c-cc0f-4bb7-8d3f-b622a960760d} + {1ca9240c-0ccc-4c88-aaff-eb5891267d35} - {edc126ec-077c-48f0-af6b-7ae96bbca8b8} + {2d33ae79-fc2e-45d0-86fb-225875959a10} - {8adb3d8f-5218-40ad-a1e8-52b3031325e4} + {2ac16354-e72f-41a9-b079-0ffb669ab133} - {51713fd6-170a-4d34-8ffc-91d6343adb17} + {3ba5d21c-7bf9-4e8c-8e5c-5f5858ea76da} - {cb3567d3-1ac7-4f97-a65c-1f6523832dd3} + {75daba1f-fde1-4b98-a63b-03f90d094eb2} - {59e54732-2d3c-412a-9db5-e34d032e7419} + {2b984f29-fcfa-43b4-8085-e3655a4aad5b} - {4a23cec2-169d-44a6-8743-6a7fb6fd5b6a} + {8f217412-6a4c-4cc2-a754-c8f50936048c} - {1cbd40b8-a0d2-416a-8747-a38427aaadad} + {4f01d300-e518-4701-aa15-a38a41894e9d} - {5ffbd909-1a77-4c5d-bc20-7b909c8eba50} + {8d8cc7c7-9553-49bb-b6a8-63b1b4db213d} - {602c73a2-0d74-4696-8712-aab56dd97774} + {376f3462-1de1-4ab6-b351-2023adcfad62} - {a952f60e-e0cc-4381-814f-5c14c0e21769} + {885c6719-a0fc-4d93-a84c-74f4f490874b} - {2b96e931-8eef-4d9a-89cf-0cb69b8c7ec8} + {9e7255b7-966c-4fb5-8178-0aed6934b203} diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj b/Foundation/Foundation_WEC2013_vs120.vcxproj index 32e4e1158..e891e8c0d 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj @@ -257,11 +257,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT diff --git a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters index da39f5ce7..7b19531d8 100644 --- a/Foundation/Foundation_WEC2013_vs120.vcxproj.filters +++ b/Foundation/Foundation_WEC2013_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {383edbd3-fc9f-498e-ae5e-d38b8f84decd} + {789fe560-3cc0-490e-bee4-11d43fae21a2} - {0e3eb482-51f9-4475-9dcb-e4b70c5f2af6} + {4f7558f7-6c82-400d-889a-90be6c62c5b9} - {38affb0e-8700-4177-ac71-7a659f9c79fc} + {4b1f44c1-6a0f-43e9-bff2-20d25da8e02e} - {f4ca4888-9d33-4c29-9b2e-a823d82a3e21} + {ff28b5c3-dea1-40e9-b321-b3a8f9d564d4} - {4fb824a8-8af4-4b68-acbe-b9e9b2b922f4} + {abd7d56f-8c86-4e2c-9fe3-90768a9b1df8} - {6ab506aa-b16f-4d0b-bfe9-30bb4b0b914f} + {898d1d7a-dc9b-40c8-82a8-ef6e71e7e49f} - {b6ce9e83-2ab6-4f01-a5f8-bedf99d89191} + {48e5cfcb-3c62-45d7-8652-84dfcb38262e} - {48e84cfc-c865-41dd-9436-6aaaa00fdfaf} + {7611fe2e-a2e2-4c25-ae04-fc17163b326c} - {b96a1b01-3230-4640-adea-6816cf784120} + {d689679a-d0d8-432f-a28b-49f281c482d6} - {99ba9947-918a-4e2e-9f0f-5782464a243d} + {0a0a691a-2039-471e-ab74-6e967dbf075c} - {b8ed8d12-8048-4c95-b65c-d9215c7c5c38} + {200167a7-333b-46c8-8645-a74b62d8613c} - {75f8140e-9504-4beb-bccc-db7313d6f622} + {c9d7701f-b9cc-4110-851d-287f438fc9f5} - {0303852d-7dae-49de-abc4-0888851ba4df} + {b55c02c5-1ddd-425f-a9f4-331735c89aa9} - {c2b1bc37-9295-4afb-8cfd-7626d03b1fdd} + {c54a550a-88cc-4c53-be50-15ed1ab5ca26} - {524db27c-22fb-4f2e-a54a-5fa714e3a48c} + {28622954-879a-404c-b790-c0d4298c97a0} - {2407b905-ce7e-48ac-851e-84be5be98e2a} + {1fd47504-011c-47eb-b86e-577c9b44dd6f} - {42979991-6b87-4614-9b10-9d9695a3881e} + {8cd3c6b7-915c-41b2-9f12-e1c625abb8bd} - {7912f417-9c9b-411d-b842-2d1521d09522} + {5227be11-0deb-4ab2-abea-9492b9685e98} - {bcacf2cd-5524-4aa9-9eca-dae0abc2b77b} + {bc1ba5cd-579d-45aa-878d-43f01d24f769} - {b5f40a10-f468-46b3-9c7d-8dbee912154d} + {c1f41dca-56bc-48c2-b3fe-fbe6376bda3d} - {9920e90e-7a07-4635-ba63-6835050a17d4} + {eb440749-6a7f-4402-a7e6-6af8a8fbcf88} - {9ce92f66-bd8e-4531-8399-d72606289829} + {04559640-7727-4c19-be55-cdbfd04025fa} - {caae2cba-b49e-4a70-ad20-ebac4e2c3f47} + {f59460e7-f7a4-4ce3-8365-598cca8c26e0} - {47bce673-02c5-4f21-baac-3aa345e12aec} + {0dc1d977-f97a-47c9-a9ec-50f1a846ab5e} - {34ef49c9-6251-4db5-b3e7-b449cef2d46b} + {dbdb75f1-21b5-4f36-abc2-b45236ab324e} - {62dc9a26-7a7c-4cb2-83b5-644b3d67d61c} + {3bc0db50-e6c6-47f3-b3d1-23e923e9dc5e} - {9b9dc4db-4bb6-415d-b7a4-82b7449e9419} + {3466390c-5306-419c-9706-825911a3369c} - {3ba4e3c1-50d4-43ce-bb0b-f242dcd042df} + {c851d941-b827-4887-b690-3e598f5bbdb9} - {dc49258a-8ee8-401e-a2cf-3c902a259f70} + {c17b8964-87b0-41ec-98c5-58ab2fff62e9} - {b16461e9-f4fc-47f3-8fc6-7bef9a9a889f} + {071e85e5-220c-428a-a897-804cc0add804} - {2c81bfdd-6ea4-4ea1-8c52-3c379c191b45} + {474ba170-317c-479b-afd4-914f3ae4d742} - {79d030bf-8db0-4308-bc2c-218ae683d12c} + {be349e35-df69-4993-97aa-29306f6bc84c} - {9391b769-d3ce-487e-bfab-f90cb3e8ace8} + {dd777173-8bdb-4bc8-b031-72f09550b251} - {1870d4ac-586a-4653-a4fd-5be5a2bb278b} + {8ad81746-19bd-4708-b05b-86f96080bf66} - {70168f0a-e045-4a75-a91b-2f83cac98c4a} + {4be167f2-9064-4421-90df-8dffc45b910c} - {39598ded-0c45-4028-8341-7a4f24a9e11a} + {c0cec85d-6337-4ad9-8d10-ec8cd6f413b2} - {6499451a-49af-4c0b-a1dd-2ef9192aae23} + {e8129831-d2a9-4b1c-b62d-f8a990e7036c} - {4c5ce1e8-8058-4765-826d-e90b899be861} + {277b2fb2-5505-4e8b-a19b-1732fe8a72b0} - {e0f55ffe-fb1d-4d3a-80a0-e58676ec9f46} + {6ae7569d-440f-4eb5-9214-0d00ff1e22d8} - {1ed0be10-98be-4900-ac5e-714f4532f4aa} + {e92c21ba-d2c6-4c4f-9cb5-4f2b5e6bc280} - {6baa2e5e-18c2-48c2-bb24-4be80bfb5902} + {82cc2abe-6f86-4635-b5da-f26ffea958b9} - {edbe7ded-c813-4151-b2e3-c81faa29d261} + {d64b9102-6377-49c3-8650-8b8e5406af68} - {e77021c4-6568-4207-b5c1-2191a3e5b9bc} + {4b4e25b3-2d1a-4527-a46f-2e950eeef13c} - {5b77876a-b6e6-457c-a03c-17543aa0a6a8} + {cd2edf30-9b29-4fbe-a269-3652e99b123b} - {516ce7d9-a9f7-4c3a-ab47-f244969ad479} + {093f2316-b86c-4c33-ad87-871d7b530eba} - {a9948ee6-8207-45b0-8d44-12649eeedb69} + {dc475743-56c9-4e28-a2be-4b8130d9793e} - {ac6593f8-aaa3-4f1e-aecc-80d52e7e0735} + {b9c9ca12-f12e-4b69-ad06-3247c857e585} - {4bbe15f4-c980-4450-a351-2cc5993ccdda} + {847596d2-0995-4ee6-964f-99e0f0718bbb} - {9aa51fd2-9a28-40c8-9721-06802e1ed60b} + {e05ef5cc-074d-42b2-9ea9-919cefb13655} - {8caed74d-81b7-4e80-a816-73b8b794b5df} + {4a0868ca-27e1-4485-b96d-a823f0371d8a} - {6ac15795-93de-4397-9650-f04b504ec64e} + {c71bab2f-d810-4eec-af9d-f9b20fe3ef09} - {065f74a7-ab8e-438b-bb56-dedd671725e5} + {29218b44-5f7d-4ee4-bf20-896437ec83de} - {eeb57074-22fd-475c-b8d0-60d4e78235cb} + {eddfd583-b3ba-4a29-b5ed-bfe905a348d4} - {90751ed6-c85f-418f-aded-a35e8053a6a0} + {884d8e14-e1c9-4839-8bb6-eb9f01b2db98} - {47a4fc11-e824-4b43-b8ef-b04fa677604f} + {7579f27f-63de-41c2-8f63-7f77f08c84d3} - {ffd35eec-9c8e-41c4-8560-c8652bcf4683} + {8f525e81-38a5-4137-a012-04848ca2869f} - {ddcba694-7748-457f-8b1b-f762f16795bc} + {c6260b2f-3c6a-4f9d-b9d2-cc299aadf28b} - {aa908e6a-03be-4e28-9c0f-09593f865921} + {5e38ecbb-36a1-4311-af77-60137cc676bc} - {61657d2b-a861-420d-b0fb-a690f8bc47b5} + {b5356580-c5b9-4666-a7d5-da94a93aa109} - {4e755808-0e4e-4397-8ae0-b5f91eed0689} + {3ea77d23-8eb0-433d-8305-7760f1b80979} - {6dbb21c4-313a-4198-bd21-fea0ccc7aef3} + {11615358-e538-4ba6-90d3-c1d71396ef35} - {3fb2fd86-5236-4a8d-94a7-a6d9e5acdc90} + {e9718607-35f5-4f76-bc79-5aa5be65c32b} diff --git a/Foundation/Foundation_vs100.vcxproj b/Foundation/Foundation_vs100.vcxproj index 0ff25dae4..b76510187 100644 --- a/Foundation/Foundation_vs100.vcxproj +++ b/Foundation/Foundation_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Foundation\$(Configuration)\ PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT @@ -122,7 +122,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundationd.dll true true @@ -157,7 +157,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundation.dll true false @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoFoundationmtd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoFoundationmt.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoFoundationmdd.pdb + ..\lib\PocoFoundationMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoFoundationmdd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMDd.lib @@ -270,8 +273,8 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMD.lib diff --git a/Foundation/Foundation_vs100.vcxproj.filters b/Foundation/Foundation_vs100.vcxproj.filters index 8cc688f26..b7d8712cf 100644 --- a/Foundation/Foundation_vs100.vcxproj.filters +++ b/Foundation/Foundation_vs100.vcxproj.filters @@ -2,190 +2,190 @@ - {52cba2e2-162b-494b-922a-21f1e3c16255} + {9f6b9890-18d5-402d-9018-22a82d7d5eff} - {339020b6-c45b-4a42-8bde-d1867eda8931} + {5d269f04-663c-4f5f-8b2e-a77193bdffd5} - {98a47f21-d49c-42a7-a309-c7936ba45e72} + {a37f9295-dfff-49b6-a7bd-4a13596fc334} - {b758e8a4-e703-424c-9dc5-aebff277cd9d} + {e91554cf-1288-467f-bf0b-81a98f3b162a} - {0cb8bf2f-41cf-49c4-8479-5cf3f537b965} + {fb5ffcac-4383-4fa4-aeb6-e047f5333762} - {b7ce8eef-1957-4503-b4bf-1879a5f542c5} + {06f4220a-861c-4471-a9b6-b1de362e5743} - {c30278f2-ba4c-4185-b426-f244a035acfe} + {de9c3a4e-4737-4a8f-be3a-690d3da392b4} - {d5a6c9ed-b42f-4d5a-8023-30e2badc0f67} + {d7497623-c254-4b0c-a705-3c5d25ee28c8} - {c003796c-48fc-4bea-bf55-8d8f88d3a5c5} + {8ed76f89-3e82-4aba-bd41-2399fbce0d98} - {7dc23971-2351-40bc-b3b1-657adffc85e0} + {e2e6be1c-8716-4db0-8004-711a0a7dfee0} - {930bb813-bb57-4e10-aab0-f39251501f55} + {2e2742f9-b713-41c7-9b4a-dd9ec084b174} - {b875bb55-0732-4bc5-badf-3cc957fd12cf} + {88c73887-2fcf-4c18-a847-4313be1fdced} - {092593e0-2b1d-4ab9-99af-9be36d1db999} + {bd7cbb13-b4cb-48d4-b055-ceb9176ad096} - {f94ca9c4-9cf5-40d1-aba5-112350824b7b} + {bbfd072c-d2c0-492d-bbbe-4fa718b04c26} - {fc4815b3-a9da-4e9a-a2a8-88a0e0b504da} + {389461ee-b893-4db9-90d8-259ce429d2a0} - {6409890e-211c-4f9a-ba64-62c138461e0e} + {72ff716f-bbd2-4958-9578-5b68a6e0080c} - {0e0e0d8a-55fc-4216-9dd2-14076e67a56f} + {4aadf13c-66dd-4952-b7af-37cc130d7e27} - {e3c825e5-1778-4fd8-a82f-5f6feae28864} + {f408301d-8ff2-4b97-91e9-206cd3aa7ceb} - {e29a283b-804d-4f83-9f52-4749061f2395} + {4a4c5580-fbb3-41a8-9baa-bf0f4110edf6} - {241cd7c0-05a0-4701-8b22-7f4ab4bf346a} + {ff315a04-126c-4db9-b994-555ccbd81db7} - {71c203fc-ce0c-4468-9d73-258dfbff2903} + {0fd7463d-d932-4787-945f-dbb6e8a064db} - {4ad20cc4-691e-42c5-a5fc-a795fc949f17} + {de1ba688-a927-4fc3-8f66-35d947f980d2} - {70a0bf00-41a3-4e25-a3b9-269003ad0201} + {79b49661-99a9-4203-973b-1d27fc4fcf36} - {114fb7d2-ddcc-41d9-bc26-ebbbdbe4ae4a} + {6981c815-6480-4bf0-82db-5887cef87401} - {a11b852b-79d6-4744-8b42-9a68a0b5a928} + {2040e062-37f0-4af6-99d7-ed25c13b06e7} - {3aec826b-907a-4572-b0d6-df1ea8846ef5} + {3f841361-e990-4c33-b88c-c40473fedac7} - {0308a9de-26f2-46c2-86d7-8060ea22ce17} + {244a30c9-f613-485c-8ddf-8d11b40177e8} - {1e093607-5e05-49d0-8523-d48855eefdf7} + {ea82718c-345e-4648-993f-cae148464b49} - {a13a4ebc-35f0-422f-a279-62b7aef688ba} + {0e7668d0-0618-4776-b898-ee1b6fbecd30} - {0b0b08f9-ee86-4a86-a277-66d85f7ab61b} + {6446e5b4-f069-4dfc-b5a6-f9e9c5333775} - {96b5f945-aba5-4eee-842a-897a6cfcc300} + {9ff8cad7-6300-49a0-b0a6-767db2cab36c} - {26486aa4-9006-4966-ba17-2b19b120b9a7} + {d517b8a4-3452-479d-b21a-a24abc275406} - {124d754b-a27c-4742-bc4d-3a60b5991594} + {7c6e3d1a-4023-4a22-a4a8-c8e1e91e84c5} - {f0d75592-bde0-4771-9bbb-455f83de5c0c} + {fde4887e-c6d0-4e21-9ea5-43aff040b27b} - {938aaa8f-c856-4e2f-b09c-bebf4eacf288} + {1dd5c11d-350a-4be6-9c10-eec1823287b9} - {7237bf1e-9b7e-4080-8c03-16a85c426f4f} + {3addda6d-fe0f-4d9c-99c7-52fb6a245b84} - {70efdc34-e977-46f5-a501-533108fb8ec1} + {e8146eaa-2f7c-46ff-80cc-f2938c80c261} - {6e6f58eb-d27f-43b7-a589-66cfa3d91a4a} + {4affea93-975e-4891-a1d5-4cc1ee99aeac} - {4a479b5e-6660-4d9e-b0aa-4188dcc2778f} + {fe5b1658-2ee1-4acb-9ad5-a2814a3bc6ea} - {c5f1e239-1744-419e-aaef-23bf5cfa88ec} + {10988ecc-66b1-4272-89b1-08276ed1b5bc} - {5df25ca3-879d-4841-a459-cab2d77cff29} + {b862049c-943c-4c97-bd7f-ef5b2d2b41b9} - {4f6d720a-3b67-4a65-89e1-85c006f5165b} + {f208668b-b2da-426a-81f8-54885369c62e} - {fa21a963-a7f1-42af-b8ac-724ebef27c09} + {8b7858ba-03e8-4919-8b91-57ae069c6ec9} - {b27b567a-4e7e-4a9f-a9f4-992114e0a89d} + {c03d6a6e-fb4e-4833-a62a-f4a76880382b} - {8942ca53-5d83-486d-ae7a-503617dfb863} + {00f5b89e-fbdc-4e74-8029-35a98bfaca85} - {8d529571-6ae0-4f3d-a888-8b0f7ec346d2} + {bd840a55-429b-4139-bc37-511756f178ae} - {38db0c40-9d10-45ed-af8a-a5746547419b} + {2aacd616-5696-4306-aa8f-1fd17f2b6ab3} - {3accb9e0-4c7d-469a-b96a-2d0a6b8fef10} + {edd4d561-7afc-43a1-a9cc-aca72738d099} - {d5919b64-a572-497f-ad40-eb6f4c2b1dd2} + {bc76845d-2331-4493-b5a0-a4b7660725c8} - {b0185421-b29c-47eb-8d0e-4b6916f38c5a} + {c043844a-d08b-4846-a555-53d075b15d0e} - {81b8dfb4-7efe-4dc7-b0c9-ca6323e934a3} + {77a1221e-4b22-4595-a282-8e1070661e15} - {8c90da37-72b6-48f5-8e9b-50da3972928e} + {089f5d2f-151d-4cbc-8f57-ff340859663e} - {df929f68-0665-4979-bea0-a0d25ead217c} + {74d884d3-2718-4861-9a00-53b2ea236808} - {7b100dc8-5233-45f7-9544-bfa316a7e82f} + {94048c0b-9ff9-4189-bead-0fb375396205} - {33896767-a954-4ce2-bc3a-498f5eaf93bc} + {25b621b8-d833-4eae-89b9-d21f8da833d3} - {986e2c01-e885-42f8-9656-f282acae1ae4} + {0eeac274-7ab6-4a24-9cab-ad3d4dee748e} - {b83ff634-e348-4673-977e-af02b7955566} + {5c735933-c1c1-4370-9670-1d498772fc2b} - {2d9d6047-ea66-4d70-a5b2-e6ab9ba50d3b} + {8e5b1dba-6dc1-42f0-bc3d-ab2e78b2f5a4} - {be6f851a-2faa-4e30-befc-253753ed0cb8} + {1c1a9760-0ebd-4127-aa26-4550d73c7fa3} - {e885cb09-bc30-4c2a-8909-b7fbe71f7214} + {e3d539a5-f002-4df2-bfe7-78d3d334bed5} - {3dbf1768-08fb-4380-bb53-879d996f353d} + {19280327-bee7-4ab1-9ea3-b387f1ce8196} - {c23f9eb1-ad36-4c94-9c2e-a27b9e3277d6} + {2af8e336-0eef-4145-a465-49315cab38f7} diff --git a/Foundation/Foundation_vs110.vcxproj b/Foundation/Foundation_vs110.vcxproj index 722da196c..cdfc6a3d9 100644 --- a/Foundation/Foundation_vs110.vcxproj +++ b/Foundation/Foundation_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin\ @@ -138,7 +138,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundationd.dll true true @@ -170,7 +170,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundation.dll true false @@ -202,7 +202,7 @@ Default - ..\lib\PocoFoundationmtd.lib + ..\lib\PocoFoundationMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoFoundationmt.lib + ..\lib\PocoFoundationMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoFoundationmdd.pdb + ..\lib\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoFoundationmdd.lib + ..\lib\PocoFoundationMDd.lib @@ -274,8 +274,8 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMD.lib diff --git a/Foundation/Foundation_vs110.vcxproj.filters b/Foundation/Foundation_vs110.vcxproj.filters index e4948674b..b77446d25 100644 --- a/Foundation/Foundation_vs110.vcxproj.filters +++ b/Foundation/Foundation_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {41b5ba8c-3c3e-422c-a42f-9e2d767e2ee2} + {ac05e5c2-dba4-4184-a899-5e3f6d61f672} - {87434da4-2ec0-4dbd-8aaa-428d0b7ef02e} + {c26a320c-9102-4542-b910-15cc92edb4e5} - {45777816-798f-4256-86ed-93b1d4a3c619} + {4651ab9b-cca5-4fe2-955d-9a7d648ab737} - {5795b431-b90a-467b-9100-19a0abc66824} + {7d2e81db-b9e5-4e15-bf6c-e70498bfece7} - {e67beeee-3b61-4b29-a92d-9e9de30f6655} + {e09cd0b7-94ce-494f-ae16-e931ef60c8ee} - {886b6218-4627-4209-8813-a53b94e5f26d} + {d7d8eba3-4dfe-42d5-bb8c-fcdbed580194} - {1aa709b2-6f80-4bb8-bc96-5cee482dc280} + {e10b23f1-45d7-4a1c-a6df-634e7eeca217} - {7e61c09f-6cb1-4443-b906-2cbc3fb83654} + {697a6232-dd1a-4435-9a88-28189f50e03c} - {16b63361-f06b-45d2-8c79-5135ae81d751} + {186a190a-79c1-469e-830b-e002a50ab820} - {e156af29-8879-489d-abf4-8b17f4093aab} + {8c6ff7cb-4d60-43ee-a853-d3e295156662} - {6ea770e5-9bc7-4b4b-a884-eb1f5786f999} + {39aebf2a-8be9-4151-a3e8-fc594b65c202} - {adc5e3dd-e3cb-460b-8f1a-a0b7e33e2b7b} + {9fd518b3-7028-41c1-bac2-8a7f6dbb4cfc} - {adac77e4-d9a0-444e-bda1-471156bf1be2} + {91618db3-9105-47f0-803f-df77461730f5} - {34b28831-7570-4673-a48e-f11500b8714a} + {8d6f668a-a9ba-4202-b03b-38731b21a260} - {ced64246-f94c-4bb8-89ec-de6cfd5953bf} + {7e692dc5-6273-4308-b026-c53023451e85} - {bae6ada8-c82b-441b-83be-9ee030ba087b} + {6cb6b0e2-eef9-4b67-ae24-7a10395ba188} - {fcb48608-c8f2-44ab-bacf-472f9d5a2baf} + {8a8261ef-5712-4d39-af81-40535c1d604d} - {90cb497e-765e-4a47-8e9e-5e9641d59af4} + {94fed0a2-cfb9-4a6a-9881-e3915e32645e} - {bf5df3ed-5eba-4d40-a336-05ba406eeda4} + {77d42fdc-9afa-4a8b-ae3a-ffb588d780fa} - {10082dfd-970c-479a-9595-c065be277594} + {884412ff-365d-464f-bbf5-66a8a091ab3d} - {5f154a7d-3b2f-4e8d-9f35-49fc48b83fd5} + {45391893-5bba-4f91-bc67-0e1b05c71757} - {2b1ed49f-2951-45cf-8586-a760cadc8d48} + {e1704587-1613-47e7-9099-f86cf73078b8} - {63835493-7204-47ed-a2c2-dc6e37bf0c5e} + {2393d77a-4275-448c-8fc4-bfa84b67c73b} - {2ae507bb-2791-4307-8bee-4111fca9f01c} + {abf326f1-6ba7-4b77-bd92-6e60f67a31ea} - {6d1eaf7f-fd32-43c4-81f4-b3864b539dfe} + {43402f02-7b09-4e70-a6ec-8b7de23a2075} - {e34f8ca0-9a10-41fb-8695-05f3391a30ce} + {09340e37-b7f1-4c80-98f7-9b700505839a} - {f8f3a6de-c721-4977-ae2a-6e0278762bb0} + {eeb9443a-3fc5-4c45-99e0-39720cac56a4} - {368ce686-12ff-4580-9372-fb8aa8b33fb7} + {cace54a7-ab43-4ae4-b8a2-a465e0c129a7} - {453193eb-cfbf-4605-9a14-561948fb4d6b} + {b9a0a15b-05ed-4499-8534-255865c958ae} - {aa81958c-69cd-47ad-a713-fe60d6169956} + {0f385212-f0eb-4829-87c5-e8c20776c5c4} - {160435d3-1897-443b-bb9f-b8226ca4fe18} + {9106fa36-013f-49cd-a55d-b761dac28cad} - {59938b5c-cfac-4785-ba51-3e09747c7b98} + {b70b1883-7c06-4fe4-b13a-5570afc686a6} - {0c6b2baa-2e44-4e2e-a973-f89d08663a89} + {4bdb3e82-29bf-4861-9174-a5d3af16d3a8} - {4b706973-3779-41f8-ae9a-c9f45425ae7f} + {4c73cbf8-cfec-47d4-84bf-f51cf9ae6a34} - {a31aba6a-fbf8-4666-9399-6b681f6ee9cf} + {365be9d7-146b-44bb-8ad7-f892081b1cc3} - {2e951320-6426-4d70-a9b6-19a4c9cca520} + {8f7c9e12-aaf0-4ace-8c03-48d03a9505d7} - {d1b9f267-bcde-4718-b468-17862dd35792} + {4c108ea9-a3ef-4ddf-ac80-17e655ca1861} - {392010e1-15cc-4f45-b0f9-ba61016dcf5f} + {ba80220e-6426-4d77-8c1e-f2d8a5844189} - {bc36af1b-fd5d-44b3-8de2-5c012099dec6} + {c15e9f7a-601c-46d0-a753-4a0ebb4df526} - {ea2d0543-c075-4a3d-af40-89876af3230a} + {a0e2acf1-2674-4b97-b748-3a4dcb43dbd8} - {ae200e6e-ad36-4e94-8cc5-2cf86655ead1} + {88d3b4de-4e73-4f52-b165-59893af89657} - {d50af406-b8c9-43f0-a4a7-57af420a4c83} + {83e0b517-b201-47f7-8ed0-f2988da0e982} - {a3e7d2a2-62d8-476b-a957-c1c3c720b6e1} + {3acd847c-6d93-40e8-8f6f-7c256d925c18} - {ab9e4766-60af-45c6-aae4-a5eaca76c2cd} + {e0a77282-38fb-4e90-84cb-12d823ce052f} - {a4dd8fc9-a260-4060-94b0-84fcf624ec1b} + {a3f6b564-29c7-485a-a7d0-589a318c472c} - {c4da5088-691e-467c-8c91-ee6036cc9886} + {17153661-4271-4e42-86bc-8a1a53498962} - {364db276-d1ab-4d40-b68d-ed45754328c5} + {cd4c8d11-604b-4ead-9077-a2ec2e0d5e47} - {0c6306ec-4038-44b8-babc-50dac71fd822} + {98624418-0d69-496d-89f1-05120756b249} - {775493ba-54bb-4679-93cb-515b39f4e501} + {4783995a-c825-47f5-8d3a-2a9042c2f8e4} - {a90503a6-40e7-4090-afda-bafda06b7d61} + {2be78d55-d052-4571-bfdf-5f236ca17760} - {6ba43af7-0a4a-402c-8528-c9febc23cefc} + {81a61eb3-bd1c-4f5d-a137-ea6565877cc2} - {8a67fb95-7271-4948-855c-f4553c8da9ec} + {81bb8075-b7c4-4e3e-a48f-2057f1528af1} - {bd3393f6-3d9b-4f9f-9c8f-d276132203d7} + {544c37ea-f8e5-4956-be2b-08d179934ab4} - {317e5db9-097d-4dc3-a22b-78858b022c60} + {beccb376-ca7e-4d9a-8635-963bd3f804f0} - {0e3ff088-4665-4360-a138-96a8f0fc6006} + {06185c47-dabc-469e-8941-8972881ffb9d} - {9502a7c7-c00d-4579-a4c9-610ce3f3d081} + {7f70b5bd-e2aa-48d7-be03-aa7a9c138b1d} - {ef8968b4-bba3-4eba-bc22-3613eb9a52a4} + {a7afa396-6290-4c3f-84ff-7dad78487cc9} - {444f6aba-9fdd-49fb-b7a7-b44ad97065c5} + {26ecc69f-8867-450a-a115-7de1a7b89eef} - {7771a394-e373-44da-a10c-fd14f1a71661} + {9502a50a-648b-479c-aff4-9b484ab00139} - {366c9306-34c1-4385-a6fb-501f7e59af24} + {f11b621c-80e8-4696-a018-53a4c1fd18e2} - {08be8ec6-fdf8-43ca-8676-4d2622b414c6} + {ab218cdf-9d86-4a84-b28f-def4c59362e3} - {c3e7ac0e-5932-4e48-8353-0e8d0b091ef5} + {100aef5a-872a-45a1-8638-590d2c1f21b5} diff --git a/Foundation/Foundation_vs120.vcxproj b/Foundation/Foundation_vs120.vcxproj index 919869904..79246fe15 100644 --- a/Foundation/Foundation_vs120.vcxproj +++ b/Foundation/Foundation_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin\ @@ -138,7 +138,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundationd.dll true true @@ -170,7 +170,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundation.dll true false @@ -202,7 +202,7 @@ Default - ..\lib\PocoFoundationmtd.lib + ..\lib\PocoFoundationMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoFoundationmt.lib + ..\lib\PocoFoundationMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoFoundationmdd.pdb + ..\lib\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoFoundationmdd.lib + ..\lib\PocoFoundationMDd.lib @@ -274,8 +274,8 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMD.lib diff --git a/Foundation/Foundation_vs120.vcxproj.filters b/Foundation/Foundation_vs120.vcxproj.filters index dc10e8120..f72e16b67 100644 --- a/Foundation/Foundation_vs120.vcxproj.filters +++ b/Foundation/Foundation_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {bdf2c2f0-9d44-41c5-bd23-72d48d005272} + {b3a65ffe-82e0-4b87-8cf3-499be4ac2bdc} - {002e0871-b541-411a-8db3-74899f33bea5} + {420805e3-8841-4283-927d-d36a2f82dd27} - {a1bb2239-61c9-4cc8-9ff6-357b145dd5b8} + {4428a42e-7eb7-4a1d-9d06-a9f2797474bc} - {6cbdb636-a15f-43cc-8592-dcde38680f5c} + {4813511a-0f50-4fa3-9399-b02a80147a4b} - {024cb185-c686-4c56-9e97-56f88c8c3236} + {b5007849-6f30-493d-b12b-f7004dd2de1b} - {8311d56d-f9ef-4781-985c-fe0c7e0483bb} + {54a7ee30-51d0-40fe-ae64-9fdbb2025540} - {40fff905-8e57-4d1d-9c3d-dcc5b44eb9e2} + {97b23cc7-bacd-44f3-95e7-92e607a653c1} - {8f5c2d81-ffa1-462b-a332-bbee9709c07f} + {185f4f38-4513-4ab8-9e01-5beced87943a} - {66358f0f-7b8e-4725-9437-045c9397d211} + {74a07ec6-bc01-40d3-b496-9ad9aeb252e7} - {6f33fdb8-f745-4ba0-bfc2-42e1ec1cfb08} + {8b986f2b-a1e3-4592-8a70-8055b4db5aa4} - {7a9e711f-3866-4b61-8436-b03b2ce59f60} + {956c3ddd-d3ea-40ee-9ee4-618efb91cec9} - {47c640d2-5087-427c-8032-9194e05d0370} + {9fef8e4b-e7e3-45fc-8b64-c13c61a15dbb} - {9e57158e-6afc-4985-a51c-592609981192} + {56d8b3b9-442c-48cc-959b-d9a9a1e5004a} - {5873deeb-cf46-4274-986e-57d15e2e327f} + {ff07e6f8-0fd3-4cbc-b3c6-a62cb64bbd27} - {4bdf2057-32e3-4e25-b03c-2eb865016c76} + {72e1ce8c-6c9e-4c94-9d77-ff3a9feb55e5} - {7f97e359-0e16-419b-90c5-1e4e18304699} + {68f3ee94-af66-4551-b8a0-32b039bd8a20} - {93534f31-a335-487f-b50a-dab8e292b9a0} + {e3330754-6346-4b6c-959c-ceb6d82d11ca} - {0ffcca20-b7a9-486a-91c5-e81da3401d71} + {62b32a2b-f44d-4b1e-a6e9-143b39e58a77} - {24ac78a0-8e86-432a-8867-37d3a6ca0c2d} + {00214b97-9a81-4570-abdb-d2f6960e10c5} - {7909e70f-715e-4947-98a9-06c206aaf2b5} + {03b2357b-001d-4150-9285-0f73c8d5de32} - {a122a6cd-0485-4b8a-8db6-2b1e1d39029c} + {2c29fc05-17a5-4fef-b9cd-8bc5fcc25104} - {7a273870-9473-45dc-94e5-11418d82c86c} + {702a0aca-0bf6-4d56-93f7-da46ba54ce6f} - {d5658ed8-7ef9-4cc5-9680-7c9b54356078} + {3d77f1f3-65b1-4091-85c3-a6754b99fbc1} - {229c6198-4d22-487d-a388-05e80ab36f2b} + {6fbe14c2-3293-409f-b5c0-dbb2b1b6e395} - {7fbec778-9d8c-40b4-942f-d91915aa4911} + {9a6f4070-a84c-4753-934f-f110b49c6ff1} - {b0dfeecd-c4ed-4a1f-b4e1-4ecd262cfac1} + {cbb48f07-5213-48d3-a30c-85826c66780b} - {d2b4b204-00e1-4c20-ae5c-685999098442} + {e25efa47-74cb-4339-a173-4afc64c61008} - {b01689ae-c28f-4ffe-9924-8c6e2506c5ce} + {98d0cc23-d2df-4696-9e1e-0abdfbff2798} - {f0d90687-ccd9-4649-a1c9-13b93f570f16} + {42e10c1c-5f5d-4446-b851-69c9506f2b69} - {b3056754-20e0-47a4-8c81-633509ad9088} + {3e0e0082-2693-4ad6-89ad-90aa6f20a443} - {3bf0c2d3-3a78-4dd8-b287-58069d5c155d} + {03b79fbc-38cc-4ed0-87f2-92882a91b66c} - {a2e9aacb-e807-4ad5-9563-b9cfa1d0aa64} + {3d66a07d-9efd-4595-acd2-0c3788f12c06} - {34287f29-3545-47e7-af9f-2f3bbb9f3862} + {d97cf26a-7f42-445c-b4bd-222baa162d5d} - {83fad5ab-1394-479f-b151-e8ba3c031bff} + {e728de47-39ac-445c-89cd-8a3f75e76e89} - {8fe5cba3-06d7-4f8f-ae36-20c2be221f79} + {62387905-e347-4255-9e0b-e5f0aadbb172} - {724aee4f-eb01-4158-975b-60be6b52bafb} + {f7c06b03-fa5f-452b-ab9c-317c8f70383c} - {ee7e7b53-12b7-4d05-9ad8-d1be05917ee6} + {0f08dc20-28e8-4a6e-b555-589c5efbfe28} - {169b8212-e727-49fd-82a0-fba1cceccde7} + {05614b61-9b21-4f12-8919-e31be4033f33} - {53b31728-614c-4163-b577-d1552a8e32fe} + {86041b4c-6db6-44b5-bc4a-55480b406c26} - {e98e47c1-6e07-4f0c-97a7-9491cc56badd} + {fd3815b2-16fb-47e5-8118-8a9837c0390b} - {975c3ded-5533-4b3d-8db7-27b25b43512e} + {afd3298b-2e55-4fe0-b7b9-db780cb600da} - {344235ba-93ea-4e47-89d7-38af0300ce5b} + {e91becb5-6f8d-47ad-ab28-eca4b3121120} - {4a288fb8-aac7-4645-9513-e9088b6063cd} + {7d055a0c-9d0b-4690-90ac-f15df6066d7f} - {e6a28f2e-087e-4725-ada0-4cb7d8c3f84f} + {e2746c99-e085-4752-b99a-a03c7cf1b8eb} - {1119e321-f3d6-477e-a1a9-325090c03fb9} + {c8cb8bf7-5c78-4597-9daa-e7515753843a} - {73e08604-7dbf-4a06-a310-0f812c3a1e69} + {da612e14-1a32-4058-a2b8-79ed550f6d5d} - {e0180476-33ed-437f-a9fc-36f942b18539} + {82180e96-03ae-4b3a-8f0b-2d35767964e4} - {50ec99b5-3c25-43fd-843c-e81373916c6f} + {539647f9-7133-441a-824a-316287e8718c} - {080ace04-a37e-473b-9e1c-8596ca3b4c1d} + {8859abd5-fd47-4d85-bc63-7e13dc8fc96d} - {f968d3d2-486a-4bf6-9a19-1f67136f6233} + {240f2418-e280-447f-bf8c-08705fc43f43} - {a0edd351-dc0e-4432-8f9c-eb22e8f7ff0e} + {0e1c70cb-5c42-42f1-b212-be5f2b3a5683} - {23dd0fbe-bac3-482b-8ce5-e8c11de31488} + {de61dfed-feec-4a9c-b8cc-a1cde2d66870} - {74066b32-90c6-4892-a984-1bf785c3d16a} + {c6fd71ba-cec3-4f4c-a8eb-e9b0fb7c364a} - {3ac8f95a-56a8-45d2-873b-856b7334c029} + {321ffaf2-a8a4-4225-8240-af44c4db3c34} - {e96125cc-77cf-4d55-81bc-68756b4e98b1} + {dd346994-1b40-4ff5-b1a2-1edccfb7104b} - {ddcaeef7-7272-4fa2-82c6-d1b9e0e79028} + {68ad281c-bb2e-4614-83bc-3ca9f9a837ff} - {bf736a23-89b5-475a-96fa-6fa7956d3fbc} + {fec0deac-0a73-4759-a75b-22ddb9184fc9} - {b7b83ff7-8290-4291-ab54-bc39271dbfb5} + {c819ea64-fcc4-4d3f-aa4f-4f12c6eb0cc1} - {d54291b5-8aad-4909-a8dc-7c0e8a751d00} + {d19bb5be-f3c7-4c82-8b9c-93c4b91325d2} - {8e5e8d6a-eeef-4f5c-8b87-5ca7813695b3} + {92ce6499-e146-4784-a9d1-a3e7a58aaf76} - {64808beb-9abc-41c8-8775-0f90d5c7c659} + {b489a484-01a3-4097-a52b-ad8a6f5391a2} - {dadce1a7-1bde-4153-911e-fc73c978d04c} + {94728546-1035-4f7c-8520-f782b1f04966} diff --git a/Foundation/Foundation_vs140.vcxproj b/Foundation/Foundation_vs140.vcxproj index 789801610..eec9189b6 100644 --- a/Foundation/Foundation_vs140.vcxproj +++ b/Foundation/Foundation_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin\ @@ -138,7 +138,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundationd.dll true true @@ -170,7 +170,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundation.dll true false @@ -202,7 +202,7 @@ Default - ..\lib\PocoFoundationmtd.lib + ..\lib\PocoFoundationMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoFoundationmt.lib + ..\lib\PocoFoundationMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoFoundationmdd.pdb + ..\lib\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoFoundationmdd.lib + ..\lib\PocoFoundationMDd.lib @@ -274,8 +274,8 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMD.lib diff --git a/Foundation/Foundation_vs140.vcxproj.filters b/Foundation/Foundation_vs140.vcxproj.filters index 57b3164fd..f5032e2de 100644 --- a/Foundation/Foundation_vs140.vcxproj.filters +++ b/Foundation/Foundation_vs140.vcxproj.filters @@ -2,190 +2,190 @@ - {3a9f9533-4af1-4f99-a855-4bb03b37a02f} + {7b73f161-1c2f-47dd-986a-fcac97992bc7} - {7b33cc7e-37a8-4349-be80-4b2279643deb} + {fd4977f3-11ba-49c0-8ee8-633892fbb799} - {f0cbed52-9189-438a-bdbe-df4d579b813a} + {3c15efc6-3f8d-4116-92fe-cbcd35f8c4fd} - {b3d47c94-42f5-4120-9a9a-f119a0e83c6b} + {970abe60-040b-4001-9005-3a4d44b2c364} - {6839304c-d247-4768-b68b-fdfdf3e138b9} + {9fc52d48-deb1-4504-a06b-a3bee40f7f20} - {4eae0491-74be-424d-ad37-1c8925ca10ef} + {75e01217-ab89-4055-8718-463bd82aeba1} - {5f0ee561-41a3-464d-8e98-46dbdbeb3842} + {89edf49e-a207-4dbd-8b6e-0035b6ba6254} - {3d70c50f-ac3b-4246-b5fe-737c4addeb1d} + {01c5db63-2432-4ce3-9cfd-a664c57364e0} - {4d98d9a4-1ff4-4829-a4c9-f7f6413ad4c4} + {598cd60f-6b77-4194-8e99-d46c2377ecb7} - {ad4c23af-623d-46b9-92ae-c98441ceaef4} + {4f95d0ae-a2b2-491c-8f30-7ddc752abb02} - {3422648b-9103-4b09-af16-a5ec8bd86991} + {cd74d937-19f2-4f84-8235-2de636793d10} - {4bd88e98-3ac5-4281-bfaa-44b39c58ef70} + {42aac432-6cc1-4143-b149-3c788aa24565} - {cfad16e6-d178-4017-8970-e45dae1b46dc} + {70e1968e-74fc-4a01-8187-6c11dc369232} - {2b370316-1df6-4cd7-be3d-b8a78a0c2f3e} + {4601e8ef-e1b7-4c81-bd5a-5def889498bd} - {2c27e247-e051-4ae2-8c45-cd6dd647897e} + {5dc79d0c-a53a-4b32-9868-e2f103f8c87b} - {7ccca224-84c9-43dd-8888-47a79c70a03d} + {cf645b33-b6fe-40b0-b208-0c77a76885a1} - {43f07f0d-31cb-481f-a7aa-58a41be3d950} + {9b68aff9-3620-46b9-a1e8-d22959fbe3df} - {ed9c3d1c-dd60-4ee0-a312-90440793849b} + {7ff290ed-7ba1-40e1-883a-1500955b3151} - {e0bbac9b-5783-4b9f-a78a-7b1f872cfa59} + {a91b7585-0c34-4347-b4f3-523073a78f56} - {29cf0db2-8407-40f9-9ec0-9ad470cb8ec8} + {76e836ac-3228-42af-a07b-7700a856019e} - {ef46aee1-692d-4da0-9ef6-b16586284dc1} + {a8a62872-206f-4982-9ae9-9ee02246bb7b} - {1a34a726-a09e-4927-8192-1c867f3595cb} + {ccc62ff0-5a17-412f-81c4-52529371dc57} - {660de2b8-5c91-4e12-bcdf-7342f8c5d2d7} + {f30e5b2f-bb18-424f-a6fa-302110b2ca05} - {169c3a2b-bf9d-4612-93fb-14501a8bea98} + {96856fd8-b2bd-44f0-997a-685f19a7746f} - {26005e37-235b-4b8e-936c-70161a51c04b} + {1cf78b44-d34f-4aeb-9586-784f4bec9ac0} - {8b85183b-5079-4470-ad61-3f29030be93d} + {18560d3c-cb93-4a21-9f62-45d9b01652bb} - {dc92f1f8-af3b-4149-adf8-8a6ac907db8e} + {a3c62f5c-73c3-431a-a952-ca2889cbe387} - {920824ad-2afd-4fa7-b99f-48fb79a679d9} + {c20e44eb-c45b-4838-af68-c1566f8a0e34} - {7f188339-c688-4c86-a884-d2455581d320} + {18a5d073-3ff6-4f3c-8a80-a6af2ccb1daa} - {6b6ec6cb-473c-494c-b6e7-d92926607a4f} + {9853a4c7-3cb1-4f7d-995f-e42056d8ed7a} - {aa20c9d3-2718-48c3-a71a-931dfdbeefd5} + {43a8a68c-6e48-45bb-aa1d-cc47e4466e7c} - {00cebd98-8837-4857-8c1f-30a34a509f11} + {ecb01473-8eae-4f6b-b777-f0f076234c1c} - {dae0380f-1661-4332-af4b-bcdc2636d9dd} + {3ff32a21-5f37-4a3d-9498-2243fe01a5be} - {2dae9699-88d5-42c8-9a60-9b5ed2e3fb0c} + {c13eea58-e7fe-46c3-8ae8-c5165ff117d4} - {771b888e-da3b-4af1-801e-e4eb25d91a0e} + {1f9f7a87-e80c-4646-9aab-f827b4e761ed} - {200926ca-875f-46f0-a8e7-2e0ad29f156b} + {0df27cf6-cabf-42b1-ba49-72254f6a5d74} - {81803cfc-c78b-4c66-b9e2-87032d34a620} + {e97cd090-02c2-4e2a-9a3b-88f8aca22401} - {4823bad5-91aa-4bfc-823e-d962801b8d56} + {ed426155-029e-4bb0-9cd5-657a266b5fb1} - {3cfda263-9490-466c-8b02-eef5dbdfbef9} + {220eaae2-f952-4282-894b-e38d6318024a} - {5dabbef2-e04e-4081-81e7-6745b9946ae2} + {b337e26f-1447-40eb-be17-1a9845c453cb} - {a2583012-1511-43c4-986b-35976882d41d} + {2063a032-6a16-4d30-8a9f-b84cabfeec9c} - {3260f65e-ec4a-4ba5-9157-075b5aee818f} + {64f62533-8d4c-4f99-87e8-49b054a3c8ee} - {11a6f94a-5247-4985-9070-4be4d568c825} + {50a6b882-22ee-4814-82d3-0ffc83e0ca51} - {ce889420-92e6-4dc4-b234-a6378f9ddb30} + {6cbb32d0-8fe6-4c1a-855e-74e7eba577c8} - {189c10fc-ed89-4f2f-af81-53628e427c17} + {fa93472c-dffd-4a8c-9252-2711e935f3c9} - {991de0de-cea9-404c-8ea3-44c4faed3aac} + {5a7a7f17-364e-4208-9274-68f97bfaa821} - {8802191d-08b5-42d8-809e-030749db74ef} + {af520caf-a13b-4d29-ba34-cdce0bda4969} - {2a84f750-ea77-4170-9534-80df8a0e29e8} + {91abc8ae-e475-4db6-b51e-2c6c12fbe681} - {e28cf7ca-46e6-4efd-9135-620f599f57e3} + {6cfa0113-1d74-463f-8ed1-717cfb6e07d3} - {fc678075-f458-4ba3-a47b-9b31483b7f28} + {7ac43165-31f6-4d5b-863b-b19d093d49e3} - {5a724854-6514-43ff-9740-463fde1cb2eb} + {0cec8faa-eeb5-4028-a40f-a727d9cbb11c} - {4d1cada9-2de7-4061-ae7f-9ffc46fc5be9} + {b10362af-6695-4d5c-91fc-54777d860eea} - {9fa965fd-719b-41b9-98f7-c9d5817b23d4} + {f3c4c933-0a93-4294-98b8-6148b05e2fba} - {0b787529-43fd-411f-8100-dc580df757c8} + {59fecaab-a90e-43b7-a4bb-0c7cceb8bc3e} - {ab419774-5139-421c-8616-5e3427e9c13c} + {41d1f5eb-6a9a-49df-a76b-ea90c95ae3e6} - {7d2d5610-1a46-4c33-9585-90eb3d50adeb} + {c8ec91a2-95c3-466b-98d9-23bbd7eda78d} - {97d3d0dd-46ea-455f-9ff7-c015f3b86b15} + {bf1eb4e7-9eb8-46f0-b8af-60e681b0b754} - {219f84ad-c5e6-44f0-aa7f-2da58f400c52} + {7a130015-0634-4780-a786-b6e40c2d08b2} - {bca561cb-b31d-4661-b69e-32c6481a2aff} + {a761796d-87bc-4a02-bc26-5523de9da8cd} - {4ba25e05-5cc2-4a26-a58f-ada788fdeb5f} + {09caf8df-aaf5-4a5d-8d73-f63e46d53545} - {aece2588-f871-4196-9951-ce4b696325c5} + {b2305e99-4701-4945-a39c-bb99a2acbbe0} - {84f67049-a19d-43cd-b3de-1f47b3db3b11} + {aeac0354-9689-41bb-b0b3-f031b9c0cc4b} diff --git a/Foundation/Foundation_vs150.vcxproj b/Foundation/Foundation_vs150.vcxproj index 68c29e6e7..2169f0680 100644 --- a/Foundation/Foundation_vs150.vcxproj +++ b/Foundation/Foundation_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoFoundationd - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin\ @@ -138,7 +138,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundationd.dll true true @@ -170,7 +170,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) ..\bin\PocoFoundation.dll true false @@ -202,7 +202,7 @@ Default - ..\lib\PocoFoundationmtd.lib + ..\lib\PocoFoundationMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoFoundationmt.lib + ..\lib\PocoFoundationMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoFoundationmdd.pdb + ..\lib\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoFoundationmdd.lib + ..\lib\PocoFoundationMDd.lib @@ -274,8 +274,8 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoFoundationMD.lib diff --git a/Foundation/Foundation_vs150.vcxproj.filters b/Foundation/Foundation_vs150.vcxproj.filters index f8211a6e7..3f7a09711 100644 --- a/Foundation/Foundation_vs150.vcxproj.filters +++ b/Foundation/Foundation_vs150.vcxproj.filters @@ -2,190 +2,190 @@ - {b43fe869-70c3-46e5-93b5-2eedec5fb0e5} + {e336145c-a24e-44e2-b12f-edee21045e2b} - {26c01ae6-e9e1-488c-bd93-923e420b082e} + {fc35dcfa-b186-460a-aebb-19cf6862f6a6} - {abaf10de-d03c-4339-b0dc-621841126989} + {3682f0c0-a7e5-47ae-8725-a5cc8b3fa69e} - {d1118a77-bb51-4663-8487-361675fe2943} + {a67959bb-c19c-4e8b-a0d7-dc25423cbc2f} - {61984ce5-ed84-40c9-bbc1-ad60e00924cb} + {c2b68f51-4c30-448c-881b-f5a66c337c71} - {68c637b9-0c5b-4807-87b2-482792170c13} + {808d5f16-152a-4918-92d7-7fbcfa2aa8a9} - {f798c5a4-d88c-4f07-b810-49709c30d789} + {ca9c5804-a342-4e49-ab03-17de3ea325f1} - {f9d96824-718d-45a2-a562-cc4b03ab0f83} + {a94322dc-f74c-40fa-a67c-18eece2192e4} - {59736458-f603-4895-8834-59b2a3324c6d} + {593aefdb-35c5-43cb-b05a-a9cc943d3db4} - {ef2c265c-659f-4ed2-8cc5-1eaa3af60355} + {d4adae01-f449-419c-8d60-cb436ecccb18} - {75c831ee-ce26-457f-b7a0-113cf5fa68d3} + {05432196-971b-4342-af19-c12b271e8f85} - {61ca55d3-8366-4ac8-8b7d-7d8eaceeb262} + {3c99ed9b-4b8d-46d3-a371-99cb3e1c61ca} - {84c9e630-b1ad-4eb6-9a73-dbf14a6f6744} + {67077a4a-8e0e-458d-8a8a-27a3dbe8e704} - {ca3769ff-6d1c-4818-ae28-69698274b5b2} + {f932c909-66d4-40d7-a071-8d715b42d3b1} - {2a73a164-38b6-459a-b9b7-69bbbef1aa9f} + {7cd0ebc4-2862-4ac9-99b7-a71170979979} - {0d45b9fb-8f18-42fc-857f-0d8ad45b99f8} + {c8eae403-4ae3-4cea-82d8-3c6050637f77} - {6cf56ef5-38be-4bc8-9e6f-f1ab09e3476e} + {5efea591-b9f6-431a-b6dc-1c6efe3e4dbc} - {e344427b-d197-4f28-8009-cc55b8e698bf} + {6913714f-857a-4083-bd23-90a0a401e412} - {b119b884-a9fc-41b0-baaf-95f098b7e5ab} + {cba1b987-22ac-4153-96e4-51a85c668e8c} - {6ba97e98-c42c-421e-b822-7f34c13a99cd} + {e80fe7bc-86ef-4489-8946-862f1f55fc9c} - {85ae1744-483a-4940-b1b8-6a198e297674} + {7daaab78-c142-47ac-844a-eae3ed4b019b} - {16a49f83-1df8-4e7a-80a5-9f2e9c65618c} + {aa850f6e-2675-425d-81c9-7f6f85468a5a} - {224e9eb3-8115-4f36-bb5e-be98097b4af4} + {d1d09b7e-e4f8-4046-9fe0-07504f39c10c} - {61a3dfcd-d78a-48d8-ad03-2c16a87dd130} + {a69eab9b-4abd-436b-b181-ae41b326a971} - {7d10e041-132d-4098-900b-60ef642b5f10} + {fdc0e653-1a1d-40e8-80d3-f8fbe254f320} - {a276039b-222f-4387-a4c4-1bac4f3f8dde} + {ea113317-c7b7-417d-b270-ecc37c6b9d55} - {d9575bf1-356d-46a8-83b5-dcdf639534f7} + {06c3095c-3fc5-458a-a7c1-9f252a5531d2} - {a255ab83-085f-4c33-8042-e52f0c190687} + {51140b9d-566d-441c-ae69-63c5018c1f3f} - {a687495f-ac9d-4156-9638-419757c4ce5e} + {e75e0571-a852-4fe2-b8ec-00409207b917} - {efd876d8-e043-4246-b0e4-a484b597c90c} + {0eeec660-29d8-45f7-9197-cbc3cd022710} - {d4d547b2-d236-4c5c-a2bf-547f77b490b4} + {d1379670-2985-4c75-b4eb-540082af84f5} - {1a6bde07-4f60-4cb9-98b2-602008e0e2a8} + {694c1bd5-2d06-4642-b0ff-391d44d38498} - {85591070-9e97-4473-9cca-d88e2beb4b02} + {253438f3-5ca9-4c8f-8df7-05cdfbcf83a3} - {a3288357-266b-4e1f-9e0e-c71d55f2ec33} + {70df5100-a24f-45df-b275-17222901aa4d} - {f34ecf50-440f-41a5-a232-8bb63b579aac} + {95aa735e-c92d-4762-b636-a2ed2825d05b} - {27757d4d-0323-4d32-a0b1-ab358b0bf396} + {782c76cb-8105-4ab6-b983-5b29ec9ea731} - {bd8ac8ba-29f3-406c-b5de-d37a62eaa0cb} + {fceceafb-91e2-46d0-855e-88cf0a2e4e5e} - {3d406974-b11f-461c-8778-53ba53b7e65f} + {55c0eee0-13bd-47c3-8300-0d9624e49077} - {36cfd4b7-1322-41e7-ad9a-c1df4e7006e4} + {ffe1ba59-7274-48a3-8407-38effe2215eb} - {830201f8-9e0b-4809-99a6-44546de51077} + {cf61e7b2-38a8-443a-a4b0-5a5ca737a435} - {f8698cc5-6800-4a0f-8e52-c5d725381333} + {967d2782-b756-40e6-b8a5-bf71e93a6d77} - {da61c406-1718-4ef8-a52f-2f28221c5374} + {7ab36529-a756-42f2-8c63-4578838f8020} - {98391c7a-0b6b-4fb0-ac3b-9db4b51bd7c1} + {1f9f8bef-9c07-4a9e-b467-f006878be130} - {ad197afd-1bc5-4b0b-99a4-3c44f4a6bb7d} + {830a8ace-4b7c-49e8-89ff-08658a932daa} - {74ebd284-e25b-43a4-8a14-e21e36c1c9bf} + {4df1abb6-5c9d-408b-a499-421e86ec6865} - {160fc2e4-5064-4aea-8f25-6af1e338c17a} + {dd90d7dd-acd8-4dd3-8c9f-6b57879c3f8a} - {f0572b30-2cc2-4529-9490-615f212c2019} + {fda14c59-4026-462c-abc8-5e8a747594af} - {e62c0e73-11e1-4329-8228-4fdab09a9910} + {3800f7b1-5a5b-46f2-895a-98c7ce02939b} - {f3d0d395-3f70-4575-95af-d56e0cb3ce38} + {8e96cbf7-f403-4315-a457-8594d1b1a66c} - {bc7be3e3-9c1b-49fa-b8aa-b5bf68a94578} + {d161d8c9-32b6-438f-a345-01b55cebf69c} - {62b50d54-3559-4bf4-b643-acfe1d3ef0da} + {28d3b49d-7ce0-4d5a-b4bc-0127622de264} - {456ef2df-595d-4479-877c-b2582cae7265} + {b0433ee2-c24a-472e-957c-82e47085cb7e} - {7d1a0ffe-8ae7-45e9-a74f-585d69223897} + {13a2fdb0-109a-4f8b-b3b6-a0448e5e8c8b} - {0071316e-b442-4680-8f71-2ff0a8f48122} + {70a5141f-b6ad-43c9-a8a0-ebf28e48de91} - {cd484e5e-2b89-47ab-bf20-3617e96a9827} + {7706d2a8-b720-41ab-87be-c5234d9cf9c0} - {132bd3b5-775d-41af-9b57-78539098bb7e} + {4c19c6fe-ec4c-4790-8aa7-b74add21459b} - {2adf3dcc-199e-488e-a187-f3acf5e001dc} + {89d37492-1cd1-4eaa-826d-01dc4f089b9c} - {e3ea8557-78a7-43e6-8c0e-8a267258b79d} + {72668af3-b7a7-4133-b4fa-3771f2c32ccc} - {cadf0869-7e61-4156-86a1-36ed6b3a89c8} + {9d72ce3e-1baa-4047-9232-9e41bccb88bc} - {605dfe57-0f3b-4b9b-a7fb-4804d3f071ce} + {7c6e0a3f-631b-4246-81f9-6b9c5cbbd147} - {d4d63a6e-03db-483b-bd48-3d841ab6e839} + {9475c824-7c6d-407f-b319-76476b84816b} - {5ab8a5f4-aefa-4eb5-9c33-fa0926b35f39} + {9d79ce20-58b0-4834-8b96-26b1789382ab} diff --git a/Foundation/Foundation_vs90.vcproj b/Foundation/Foundation_vs90.vcproj index 9e347935c..40822cf52 100644 --- a/Foundation/Foundation_vs90.vcproj +++ b/Foundation/Foundation_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + AdditionalDependencies="iphlpapi.lib" + OutputFile="..\lib\PocoFoundationMTd.lib"/> + AdditionalDependencies="iphlpapi.lib" + OutputFile="..\lib\PocoFoundationMT.lib"/> + AdditionalDependencies="iphlpapi.lib" + OutputFile="..\lib\PocoFoundationMDd.lib"/> + AdditionalDependencies="iphlpapi.lib" + OutputFile="..\lib\PocoFoundationMD.lib"/> ..\lib64\ obj64\Foundation\$(Configuration)\ PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation64 - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib64\PocoFoundationmtd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationMTd.lib MachineX64 @@ -219,7 +220,8 @@ %(AdditionalOptions) - ..\lib64\PocoFoundationmt.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationMT.lib MachineX64 @@ -237,7 +239,7 @@ true true - ..\lib64\PocoFoundationmdd.pdb + ..\lib64\PocoFoundationMDd.pdb Level3 ProgramDatabase Default @@ -245,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoFoundationmdd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationMDd.lib + MachineX64 @@ -271,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoFoundationmd.lib + iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoFoundationMD.lib + MachineX64 diff --git a/Foundation/Foundation_x64_vs100.vcxproj.filters b/Foundation/Foundation_x64_vs100.vcxproj.filters index d74bac1d0..f20b02bbf 100644 --- a/Foundation/Foundation_x64_vs100.vcxproj.filters +++ b/Foundation/Foundation_x64_vs100.vcxproj.filters @@ -2,190 +2,190 @@ - {153a4a73-cc45-4307-bb8e-2bfbb4e43be1} + {00d9dbb2-6d9b-4ec3-9e0e-0505fa2b7bcb} - {e0b7226b-61e4-4258-9027-c8d153365527} + {43066dff-ca62-4359-826b-0809c5ae28d5} - {3e1a8fb6-0a71-40d7-bab5-b6bb02a93906} + {54acbae3-1ace-492f-920b-d03afd9ef88d} - {d4a6bee5-1069-4e96-a21a-992eea1cd1c6} + {a17d675c-a80a-4029-b5b0-b2f52636a80e} - {ca32fe90-680e-4686-9219-f6027f1a6a52} + {7ea1ee6d-ff88-4312-a367-eb3ba535a6ca} - {2b7e1260-2270-40b7-9ca6-01aa38e7a672} + {e82fcdd3-65d4-4ed9-a15e-9aa6960737f8} - {ae5f9e4e-edf4-4ed5-9083-4fb3e508ddd0} + {61ed5c2a-24b8-4dea-80dc-e06de16b4aee} - {d99b0aab-8807-4aa2-99fb-30eab7596fca} + {fb18eb10-1bc6-412c-9bab-727bd3684dd3} - {cd82204f-7c1a-4805-8824-ee383218444d} + {43715245-8094-4152-8a6f-cf42af3d9a80} - {b2b479f5-9430-4efe-a6b8-c672df8b25bb} + {3315989b-9a38-4b89-94bb-d71d563547af} - {ed62161a-fed1-4ce0-aaa5-13d71657c596} + {3d930f77-b8b5-4716-a567-0ae978892a73} - {9437dbe0-68a6-46f8-b687-03d83ba8605f} + {baae2395-268e-4238-bdbb-7985b431b9ca} - {601edad1-d7de-4f8d-905a-4f6c230c67a7} + {01d83fae-88b0-424f-9b87-8184459c02f2} - {8f2cd978-02e3-4f5f-b9a4-01bda6dafa36} + {88ec863e-5f92-46c7-aa65-2c99486e02f3} - {9a5717e4-3f2b-4ddc-b640-04729c335868} + {de276b77-228b-4065-b86d-3af6d102f3d4} - {936b9637-3ce0-4c20-80e4-d8da9ae7030a} + {1a6e5b1e-1a5b-4eff-80d4-1696bf34c287} - {2c871766-17de-4949-b3c2-dceaee053c6b} + {3ccc4dc7-f5d6-4d7f-93a6-0e3c37a60739} - {7429aaeb-646a-435b-a1a9-6db2706bbaa7} + {b38c36d0-c464-44f5-b152-06c13c78821c} - {7e4f5a12-7ec5-41a7-aaba-d18dca7750ef} + {345e9b57-53aa-49f6-a1ba-b518c71ef100} - {acc8a2e0-f358-42df-ac61-a2e5bc3ad911} + {c7dcc88f-c197-4790-bd69-70e046a3b692} - {b79f9f21-4b23-4f63-aee9-1f838d983901} + {78e39a7f-2585-4f3e-91e7-42e73b243151} - {7c17cbfe-f89c-4718-b97f-665dfb4fd111} + {035401c5-d7d2-4837-bdec-b8aa4896bc3a} - {a303e7f0-810d-47e3-b4e5-b479bf8b34e4} + {b6622b77-c84c-4daf-80f5-5e646d6b82f5} - {1df5b44e-1553-4fe8-bc02-9c07f728b1e5} + {925c009e-953b-4b9a-83b2-a38c07f9b7aa} - {a052809c-4d27-45d2-b72d-40c10828ecbc} + {581a2f12-f676-4225-a0d8-7e1c471cb5a0} - {a9ad3f96-ee62-49d1-89d0-296fd6c4010e} + {dc313a36-615b-4874-b45b-d04a16c9058a} - {b82669d0-4f30-44ac-b2db-5417b57468c7} + {4674cad4-413b-4b3f-8dcd-ffb80690f552} - {b151e110-052e-4e06-b616-d198ce1e456b} + {2f3439dd-9729-4c6e-ab96-ddb4c7a60b38} - {648b3e3d-9e0e-41fa-8b77-1a0d9aeaca12} + {7ddd7f06-f5e5-4648-8b02-0a2d5eff21fd} - {9d58ff27-1053-494c-b11a-1e70f11765b3} + {a0cf103e-eef5-4bd7-b736-5522808b5f88} - {3b718dda-910a-40fc-aa37-d5d59adfcf7c} + {bc0ea43c-801a-4c01-a523-b1d618860cdd} - {7086a4d1-0ca0-4ff9-9853-033b91b84c5e} + {ef2d98ef-cbde-498b-85be-740d475dd4a0} - {43c26c01-256e-4576-8464-f0fd0a9b503e} + {77e75545-22e4-44fb-b39b-11ed1f5525ea} - {28c58a43-dccf-46c1-9f91-45593543abdb} + {e5a80491-c163-42fb-93b9-86b8f2526dd0} - {1dc9e9a5-a0b6-4729-ae51-905846235f12} + {83007e0d-9c21-4feb-84c9-97ca6cf88698} - {c5e64d0d-c6f5-45d5-bc29-a815b4a0a828} + {0a63f44d-ba6b-4667-9110-420b9e380ec8} - {37f77088-f341-4c24-8078-8b61c144dbed} + {f32853e5-b297-45dd-88d9-89b623fd7bc2} - {8e5ae426-c89d-4d93-b04d-974ccf0698ec} + {5426f4b9-134b-4986-82f1-85926fce3f83} - {f9852d31-32c3-4645-8a9c-e0de84db0046} + {c912b42d-6c15-4e70-8355-c90458be7d21} - {068fa217-5b2b-4559-9538-ee6e961af87c} + {645b480e-0fdb-4e21-baee-bc049f0410c1} - {e49a9ee6-00d9-48ef-b561-bbd2d9958023} + {32f310c5-0885-4978-b18a-e1e9a0690940} - {2ecece09-03e8-433b-a7be-bb5dabfcd65f} + {20ebb0f1-aeb9-4b5e-8975-8bd045736401} - {604dba4d-63eb-4c9f-a784-e1ddd1ca30d7} + {3eda686f-2fb5-467c-ba5d-b0cb6d0eddbc} - {88a6f265-503b-4a98-aac8-2e14a7846460} + {28ec82d6-2c5b-4a06-b459-75b129646ff4} - {6850256d-1cb5-420c-86b2-e6c1af48fb03} + {674f25f9-aa6e-4add-942b-93f17100031f} - {1c245ec1-3033-4ef4-91d7-e05a9f1931c3} + {8c3ac6e6-132b-497e-83e4-1cf2e76eb58d} - {0038641a-77bb-4817-b14f-4bd4b73edb20} + {baf3bdc3-45bf-40cf-9cf2-548347273579} - {30dc118a-daf4-4921-8d81-998286c0f35b} + {9156e60f-1f92-4d16-89c0-890d42f74593} - {dba95ac4-7979-4099-9d55-618c0a877ca5} + {a45fc110-dd3e-45ae-8f68-2813509ab338} - {c32ec75b-0164-4196-9c2b-dbe1068ffc8a} + {4014cc87-654e-44b5-afb4-601acbcb97ca} - {1ab02b0c-826a-42ff-a8c3-d8910d416a8d} + {9acdbd84-8563-4d4a-bee8-0d8463306e35} - {031d1ae9-9096-4798-84c6-32bab2faeff4} + {252a0a2e-148d-4463-ac17-039d7875cf49} - {a5ed1392-0502-48ba-8841-991ab3295273} + {97217939-9a26-44b0-8c55-ff481affd47f} - {b276506e-37a0-49fc-964d-f75303949fd5} + {fd35b80b-0783-412d-b86b-4090b6d3ba30} - {d3e840cb-c8ce-440c-bffc-6d8d83ab30b1} + {105c4a85-d450-4733-8aa1-d1658973cad3} - {9d9abdb8-4707-4e68-ab76-de54770a6711} + {e46bb8a2-73af-409b-872f-57f98fdf0553} - {bf8ac50e-0e1f-4e88-a210-756481568b65} + {6b4a739d-712b-4a1c-a113-40c6256a96f3} - {0c43481a-e22f-401b-a081-5c39a1405365} + {b0eb8610-c816-430d-91e3-ee931b80f2e6} - {401c2c0f-aba6-4434-8b17-08bb02bf2c88} + {fb5974ee-8afb-4b3b-b864-68d37745a904} - {8e4e69e7-9ac2-48af-a98a-c7e571a168a0} + {8a92eb29-c2d1-40fe-acec-a03eca248726} - {be70cd67-accc-4e92-9bd6-f805ad8b9cd5} + {6c9f2ad4-f23f-43db-b321-61dc63088665} - {232e3443-b1d6-4782-9fed-48b568ab79c2} + {8ad1a9d8-1705-4704-a261-03426b754753} diff --git a/Foundation/Foundation_x64_vs110.vcxproj b/Foundation/Foundation_x64_vs110.vcxproj index 3457cad72..511318eb3 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj +++ b/Foundation/Foundation_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation64 - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoFoundationmtd.lib + ..\lib64\PocoFoundationMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoFoundationmt.lib + ..\lib64\PocoFoundationMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoFoundationmdd.pdb + ..\lib64\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoFoundationmdd.lib + ..\lib64\PocoFoundationMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoFoundationmd.lib + ..\lib64\PocoFoundationMD.lib + MachineX64 diff --git a/Foundation/Foundation_x64_vs110.vcxproj.filters b/Foundation/Foundation_x64_vs110.vcxproj.filters index 285c5ecf7..791def30d 100644 --- a/Foundation/Foundation_x64_vs110.vcxproj.filters +++ b/Foundation/Foundation_x64_vs110.vcxproj.filters @@ -2,190 +2,190 @@ - {8e474ea2-00f0-478d-a791-ac91b65f323f} + {1fce3792-dc04-42c2-972a-99898375a0b1} - {ef8db1a2-05e3-4832-bc70-cdee9d2b8d7a} + {626a9540-7727-491c-9345-275f9d6f1c25} - {dc898815-22c8-4e3c-a0b9-77cb227cac36} + {5512ef06-0c87-4252-8bea-871d7e5bce3c} - {8ee3cc3a-306c-440e-9798-188f33e93ca3} + {8a49082b-f97f-4eaa-aab3-2efb913965c1} - {c053bb84-0bdc-4948-8268-f1c9bda0adc7} + {f3d19a78-40b3-4c11-8605-dcc7b77e6788} - {d9fd72de-95ac-4e58-bc66-c2cfb83e9f97} + {dd861d29-0fc1-4f72-ab0f-e3b20dde4382} - {2c233f4e-9721-44b2-83ca-5af3fdf5ec85} + {2de3e7ae-e648-4e4b-b3f1-ab7b18a5cc42} - {c1b8a6a3-c954-459b-869b-25f3b2e21341} + {7db95fa5-d438-4721-97f6-4d85aa5cda5f} - {bbb37169-2380-4ad1-a862-92d62d79b444} + {3e13d791-4d9c-42df-a656-b1509956579e} - {29b5eb8d-3232-48c8-a28c-6786500eecfe} + {671a78f8-fe0e-4280-93b6-dc07d14b02d0} - {47c26f96-4cd0-439d-a206-cf6a27cb775b} + {1ea0efdb-0baf-4725-a341-5a73d2babd4a} - {9e89f738-9b97-42da-8f3c-4940d671b4f6} + {4ca3af71-7684-4c28-8a0d-e65ab3d4cd04} - {9cc623aa-e351-496a-ab42-1407b4e82f31} + {6462d012-77ca-49c6-9539-a9c1f54bdbc7} - {25064556-7f49-45dd-9f12-a374cbd05e1a} + {f8200c17-1745-4152-97dd-15ea6dcffb07} - {ef67d075-2170-466f-b648-8071eec3f9c4} + {fb75f62a-50e4-4466-ae1f-c9b88cd76873} - {f0ac4ba3-8bde-4267-a087-6505ee700d6c} + {cce545ef-3d7f-4f67-8a6f-46fa154f57a5} - {915d90ac-5ac3-4e6a-af69-eb0721979650} + {472022aa-acbb-4226-b35c-f91461302da7} - {a541d6c9-f64d-49fb-813f-9470229ab64c} + {59086af1-26bf-469b-921d-0c20a452b245} - {162e21c7-5391-4256-9dca-ddf715e3a216} + {eb3f2387-3e97-469d-be0c-e945bc6cc514} - {effc2266-84ca-481e-ab60-d6ef10f64fa7} + {8d330c6e-bff3-4c94-9710-992e212405ac} - {cf316847-547e-4376-b660-f122072dce3a} + {656db684-7bc8-4313-8e7c-640508dbc2e2} - {fdf79a5d-8a96-430d-ab44-296c8983fc0e} + {64e01079-575c-4463-adfd-31f43c8d38a3} - {59ae0338-db07-4f76-86b6-d2ba2874f5e3} + {9a0b7814-33c8-4d2c-bddd-8bcde9e5fb1a} - {803c80e2-16c7-43e1-9835-4944a15b1098} + {355b4250-f2d7-41f4-ae99-ad603587f0a5} - {5cb834bb-a993-401f-9f19-a422dcf51199} + {fc8cd568-cb81-4254-8919-e02b1444c0e1} - {bab05fd0-0595-4396-938e-455137e5a3a9} + {251ad73a-6c7f-4ed0-88ab-e1d53d1d8ad0} - {e02a4e32-8b44-4726-94c1-45e3b3a876ff} + {ac9f176e-41e3-4a24-8a8b-087c835d7e0a} - {67ae6962-c11f-4e27-bb64-440eb8da8938} + {0881487a-0438-490b-952c-a37920190335} - {d6671d89-e065-4666-88b2-25a18d609c90} + {4c7847a8-7619-40a8-9827-e1e60c567280} - {4196aad5-d456-4ba9-80cc-48a212616de6} + {7fc317dd-29ce-484f-a7ee-61f2d974fc2b} - {18142b21-afa4-4e1b-972e-57f663dc5ee3} + {b94e44ed-5960-40d4-95e1-facbbb8d9ea2} - {ea710b6e-a817-45d2-ad7c-1e21d0b7d351} + {27a2c382-20a3-48a5-8301-2cb3d5cc2a8a} - {195d4ebc-9b1b-4de7-a205-e11a7c593c64} + {54a3b3bb-34ba-4cb6-895e-de97812d650b} - {4a7f4e06-9b07-493f-a9d5-534b2ec41f9b} + {ba8c6e52-90d8-4879-b884-fd5db5215bd3} - {ecf97dc5-a086-4204-b9e9-457b9aaac650} + {0e271db1-39c4-4661-9d64-073f1a9d60fe} - {b66567c1-e720-4312-9969-1697ace5609c} + {b76c37e0-1e06-4b6f-98b8-edcfbe058e41} - {d59909b6-b5f3-464d-b0b1-42e750bb9c8d} + {3dc73dea-f53c-4eb8-82bc-bad052282262} - {6b2ea5e6-9f31-4813-ac70-32fe03529c30} + {586c5847-3a27-43ca-92b1-7220cff0d9d0} - {7ec62c73-4f83-46a6-b124-4723ca9877b2} + {650fcca6-862b-4a6d-afde-627a2c68b5dc} - {4cd64e12-d803-4524-a7bb-0d403a0eed26} + {3405109d-3a95-4099-aa38-a5f5acdc90df} - {8cc7b4c1-b87c-42d7-9bcd-d654a869e530} + {2daaccaf-20f0-4bab-9671-cd78b5ee7438} - {c8385a3f-4787-4ce4-84e9-f53222665976} + {150c263c-c175-45da-88a6-927571420114} - {ad15ee31-c11b-474e-afda-767930819eca} + {52e93e4e-deed-4e21-b484-511a3aad3eb1} - {07e60d76-2bb5-4877-9888-affbf090e8c3} + {998db300-1819-40cd-a650-559c8eb85e8c} - {b8ff3f91-47d5-4674-9e3d-7ec280b15400} + {e5fdb967-b80b-4bdd-9263-dfdaf64f63a3} - {66bd8ed5-d6f3-4a14-ae50-f256a5257527} + {7d28389e-579f-44f9-9e4b-0ede53c8d468} - {eeb8f1c4-8e26-4b67-8c5f-8bd9eb41a74c} + {63822ddc-86a8-499b-b73c-44317d7cb331} - {c2eea5f6-f70f-45c6-9c72-f15308b354b3} + {2d028498-f3e0-4c7b-9925-18704410a2e3} - {38187c6e-1cd4-4596-a224-8d3310aebb7f} + {cff40e2d-8e08-4012-9651-a8df47c6fce2} - {2cd66cd7-5101-42ba-88a2-3acc4beeec4c} + {c003ac8f-848e-44e8-b3c8-5743e6b6faec} - {4e8ea193-b1d2-4e6c-ae3d-a9037bdf021a} + {4c6a7f59-32f1-41c5-bf61-c57a97e6ab54} - {a2d11785-deaf-4f1b-9637-a6fd2644850a} + {0d3d2a04-0360-4aa1-8fbd-c49a11ac84f4} - {766b18b1-a462-434b-afbe-eec17091c907} + {b48753e4-91f8-42f9-8dd4-e9a37a7a03c1} - {f3919cf3-1acc-4f8b-ac55-ab15ad0d6f91} + {d7cb28b0-7f5f-4cfe-a533-c821cfb560d8} - {884f70e6-1496-45a7-91a4-746b25543e9b} + {0b1e551a-2c98-473d-a354-39edf7a40e9c} - {c64c4ef1-18db-4b42-b632-7e3b3e147c1d} + {a9f6fad4-46f7-4021-a696-7d88de7042f1} - {f732695a-48f2-463f-9f64-42568ab775c4} + {eaccedad-500b-4258-abe1-b1df14ee85a1} - {789f5dba-d6f5-462f-b654-0dabaaca3e1c} + {5d57072c-796c-40cf-b025-7159abfbd827} - {f7730268-d0cc-4284-bc45-b2035617a6e2} + {33668e82-44db-444d-9f45-4c1cc24fadc8} - {f1ca1b6f-a9cc-4327-8057-d5da93433274} + {e596ba36-91d6-46a8-9f0f-55bdac50110f} - {54352605-e8a4-4f8a-9fba-827e8a40b071} + {6eb5a986-6229-43dc-9ce7-eecb18bfcbdf} - {50d70556-e97e-4b77-bebb-4781d6e568fa} + {b5062d65-f689-4f00-bb94-90520d6f4469} diff --git a/Foundation/Foundation_x64_vs120.vcxproj b/Foundation/Foundation_x64_vs120.vcxproj index 78df89d5d..094d229e2 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj +++ b/Foundation/Foundation_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation64 - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoFoundationmtd.lib + ..\lib64\PocoFoundationMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoFoundationmt.lib + ..\lib64\PocoFoundationMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoFoundationmdd.pdb + ..\lib64\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoFoundationmdd.lib + ..\lib64\PocoFoundationMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoFoundationmd.lib + ..\lib64\PocoFoundationMD.lib + MachineX64 diff --git a/Foundation/Foundation_x64_vs120.vcxproj.filters b/Foundation/Foundation_x64_vs120.vcxproj.filters index ffd5fcaaa..ecccec009 100644 --- a/Foundation/Foundation_x64_vs120.vcxproj.filters +++ b/Foundation/Foundation_x64_vs120.vcxproj.filters @@ -2,190 +2,190 @@ - {97e8a458-671e-4d59-8f01-5489c7e49283} + {401098cc-8361-4f0b-bc50-612a494bc504} - {a3ad01dc-7939-4ab3-b0d5-2a7295a9191b} + {9f10a973-6686-4f3d-9824-6d5561591996} - {ec12eaae-48c5-4c3f-b493-bde4a272d041} + {f18f5d57-c214-420b-b796-2c30abf4d97e} - {367afbb6-ab74-45d3-b601-b18c30710229} + {b002697a-39b9-49f3-9189-c402a97f3512} - {680a9f7f-f740-4c92-9684-dbab04272c94} + {0a03f3c0-5f8b-4df6-a334-89e479f4debd} - {e4281361-81aa-477d-b7a0-8e37dac3b3fc} + {a0970a43-3512-4c91-b4db-3f2e8a32e2cf} - {b7fe71e1-e73e-46bb-9ab7-8848c27baf7d} + {2fc7869a-a212-4f64-b6ad-ecc0e968ddb5} - {f883afec-b42f-43c2-a114-be74c9b7058c} + {3ad42881-17d7-4445-a830-5c23102d5048} - {6dea5fe4-634b-441c-949c-45d7055d2372} + {5e56b1e0-92c5-4b4f-8ef8-034ce320022f} - {36f5b46a-3e24-48a9-8cc8-96ff807eab51} + {f76cbff7-664f-4fb5-a0b9-3ddcc84ce867} - {95f6d6f6-6bc7-4e90-8378-983bed0c60ae} + {bc89678b-346c-4fc1-abc7-af45ac56b83f} - {43fd7f5c-4f74-41d3-aa52-8e85c490b76f} + {620132f9-a160-4fc6-80cd-4802e00e31f5} - {fdde71e3-b0e4-4cd5-af14-afbae5eada2e} + {09c671e0-14b2-4625-aae7-387def2bcf59} - {3e570a54-1637-4f62-8f9b-c6d9831a81fb} + {91847886-58e5-49f1-9472-ab94ecdec9c6} - {4675f943-a80d-4af4-b065-27e66193b37c} + {ca372611-694f-40db-af1e-293eb639654e} - {c795102a-6237-4234-b582-391b15de9b34} + {2333f471-d04f-4300-873b-ba5eb5ed0c23} - {a9de6594-7a49-403b-a1ce-50c19b03c622} + {4fb14b11-31a0-4ef2-a671-db6701f50f1c} - {cbb0f0a7-a706-4c75-b183-ee076623fc1d} + {c7d7159c-b351-455c-99e6-bd7d33a48333} - {dd8f27a1-5ff0-442b-8f1b-889946bbc351} + {b3473f23-f58f-44f5-88fd-79def6d3331b} - {a7a5576d-fd1a-493f-a5ee-4a9ec8f3cd5a} + {f0148b4b-4370-43b5-9d73-0d8175a45117} - {a7892e85-e440-4e7c-9558-425c95539222} + {52dbf31a-bd19-4669-824a-b7765a00caef} - {ad169458-1ec2-4043-8aa0-0451c95cdf9b} + {528206b0-fdcd-480a-bc69-1b468de1ed58} - {3da3feba-6ff1-4bdd-98a1-a667eba8797f} + {66a5bbfd-5b9d-421a-a582-6f6f97a5a181} - {5f4d30cd-b610-4fd5-8f5f-92e0d15768ea} + {5b2bf0c5-e395-4dd7-9a06-3f302cb465d3} - {3c1817b5-7cca-4576-82fb-bd913bbcf843} + {da4489b5-0929-4f89-8157-f0256f5bf81c} - {5f2c057c-8384-426c-a1e9-1931cfc60106} + {23ab400b-194b-48f5-a40b-e1d35d103675} - {bc0df219-4e12-43ae-b272-ad3762a37b4e} + {4c8b89a3-aee4-4169-93fc-04cad75864fa} - {3052447c-04a8-43fd-8d5d-72b458f47325} + {5b23a00d-85cd-4437-80a3-97d5ae0e8442} - {21c55d61-bc0a-4104-9027-e503119ee472} + {c8d19bd4-92da-4596-9861-2091c638b29b} - {4a2c192b-b6bb-4658-8da2-f72eca1fb119} + {5728a168-0b13-432e-acf5-11534befe904} - {6693395d-7a83-4418-b266-dfdb6581bb93} + {c2d5391e-5bcb-4ba3-9527-10db6bfce056} - {957926e3-5949-4666-8c62-14e10cf6419c} + {24e1af06-b8e5-43da-9d3b-b8a28c43fbd0} - {9496c192-4cbe-4238-9dd0-99948be21c21} + {4a7ce529-132f-4f02-bdd3-9ccee9830a69} - {49e2a84e-3af2-4c75-8e94-a2ea91ccd391} + {42b623eb-55c1-46b4-89a3-e84600f9bdf2} - {6270722b-da14-44ef-80e8-8d2697658546} + {9e8bb91a-6039-48d5-acc6-ce48890761af} - {8f6f5569-584e-4c1c-aa20-d0f089e6d7cb} + {ae47893b-c15b-4a72-8a14-1f3691fa8287} - {4dcda167-2791-407f-ae01-11af5825a47b} + {74ae8eb7-bd72-4f1a-b9d1-b42c3ab2cfd5} - {0aafc190-c31a-4a91-afb7-8a2af9a9b25e} + {57b4b84b-fa1b-4156-8a2c-b9d1b8568984} - {864453a5-d188-468a-bb1b-6cf37c1791e3} + {3446a641-626b-4015-b1f0-9b3ba8cd78ab} - {d85ed256-627e-4b2b-9e2b-b731fd72b39a} + {d5e2f4f3-8968-4927-a65b-6ff2c8be697a} - {c4dd4e05-f0f4-45a3-b656-40a8f1c7ac8b} + {0896cc8f-a357-434d-9d6d-9dc93da86033} - {2a1bcf7b-ed4d-4b91-b94b-4b48ac5f86a9} + {c89c8384-8abf-436e-822e-8f6f468697b9} - {4f9a35ed-d443-4430-8e19-455b722afca2} + {ee4a930f-02f4-4cdf-a0bc-e3710b559120} - {fce425e3-6375-49d9-82ae-60913ab5e336} + {4c6fe76c-8daf-4034-9189-cd28a947c86a} - {b6ed0740-d773-46cf-8040-f576c25c955b} + {8efc18b7-6a1b-45d7-8ec6-30bed269c8d5} - {cb2cf158-97cb-4f69-8976-31a737a56afd} + {2e25cf09-1af5-48b7-a081-1dbbc392cbe0} - {5217cf87-4fdb-4726-a71d-a3c9e606457d} + {0d133f94-660a-4e17-960c-905543ad0013} - {c8a6c1c3-4774-48e7-ab8d-81a6c8760f32} + {2e5750a5-ecf6-4505-930e-d8d5de47d7e2} - {a0636a77-99a5-4f66-beaa-f0450e9b2540} + {2802d5a7-d668-47fe-922a-16603a6fe1bd} - {88100646-2fe2-49dd-b67c-89450990eb51} + {c06b6b7b-4947-4f66-9092-fd2223d52c1f} - {7fd56610-4381-44eb-950a-850c9f5020ff} + {c6765098-e92c-42a2-9a52-102220444137} - {d7a5d919-635a-46ed-bae1-3ae8db6fe895} + {80e1f0b4-c15d-41bd-9172-8d091638219a} - {32f9ca93-8787-41df-8e4c-40a120800422} + {3f2d3547-9509-48bc-a726-785e6b839205} - {242c50ea-2cbd-4e30-91e1-951b7621a837} + {e67b84e1-e195-45fc-894b-32129e8cc2a2} - {72d3f08c-d230-4367-9925-e3f85ff47f5a} + {f2aba1e6-01a7-4d85-a69a-0601cc872962} - {f08bafdb-b1ba-4709-ab75-1592d902b2d9} + {02fefa4e-7902-41b5-8475-a9783639276b} - {5e6a07a7-e124-42a1-987a-5d60a00cc8cf} + {1e87facf-acdd-47dd-95f0-b1f77727db90} - {5348e835-4926-48f5-86e3-44ee792590cd} + {1db5fbc4-05df-4ffe-ab97-a7ffda257382} - {5c414a9b-41e9-41ee-ac17-c20ea9c5c9ef} + {12c66942-cd87-47cb-8e96-6573d845e871} - {2b7892d4-53fa-4b0a-9656-261c57e0fdbe} + {54ed5489-e1a1-4401-b808-784df6cd963d} - {17cd247f-c33c-42c5-add1-60c7e12c3399} + {6257da0e-8514-4674-9c08-09df4064b2cc} - {b874e13d-2219-4677-8d06-e07f9091bc17} + {1d813101-065e-4e0b-a7ea-b89eec56910d} diff --git a/Foundation/Foundation_x64_vs140.vcxproj b/Foundation/Foundation_x64_vs140.vcxproj index 31156226b..680bc605a 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj +++ b/Foundation/Foundation_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation64 - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoFoundationmtd.lib + ..\lib64\PocoFoundationMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoFoundationmt.lib + ..\lib64\PocoFoundationMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoFoundationmdd.pdb + ..\lib64\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoFoundationmdd.lib + ..\lib64\PocoFoundationMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoFoundationmd.lib + ..\lib64\PocoFoundationMD.lib + MachineX64 diff --git a/Foundation/Foundation_x64_vs140.vcxproj.filters b/Foundation/Foundation_x64_vs140.vcxproj.filters index b9a866497..b33973855 100644 --- a/Foundation/Foundation_x64_vs140.vcxproj.filters +++ b/Foundation/Foundation_x64_vs140.vcxproj.filters @@ -2,190 +2,190 @@ - {5b55f393-dba7-40fa-b071-d7d2ae1fcafd} + {2da30c08-cd10-422c-b5b3-88ed737c6a57} - {cab2a78e-490a-4bc8-b44f-e345ddf3d1be} + {2e7b266a-0e2d-42cb-ab43-7078884402d1} - {cc172f4a-f81b-4fd4-aaee-4b54d05d32b0} + {310f0fdf-3902-4c37-9d18-49b64e665b54} - {1640a075-1d9c-4625-b353-c7eb12508f14} + {ffb3afab-88f7-4fd1-858f-0bebbe6f2644} - {45c1bea2-c297-4966-b3ad-a3002d060235} + {21068bd9-cb69-40a3-9b91-73335407efa2} - {993d8812-7af9-4d56-89f3-284ca93ea808} + {841fd021-b67e-4b58-ae2c-0bf6d380b06b} - {ad38af66-4e34-4f2a-b81e-8a25b16af82b} + {7c436aa8-e912-4e66-a616-efccf5f1bf85} - {887287f3-6a57-448c-bfe6-5d19faf409ae} + {a8b10dde-f92b-4928-ae3d-418cbe4d2008} - {1284512b-d93e-482d-8f49-b15955201764} + {4598ca0c-cb8c-47f5-b2d0-c33ac8923fe8} - {f75ef309-df4a-4921-b781-be1c6a4e16f5} + {780aee90-35de-4031-9dde-8ae4cae4a9c7} - {a13f9159-f298-4c2c-b8f9-4ddc4b05dd3e} + {65b32de0-81d3-4bed-a6a6-36f0bd5e45bb} - {720a8de3-db43-47b2-946e-36bea23811d6} + {272ee832-5619-4635-80e2-f408fcd6accb} - {92b437e2-cfe1-4dad-a0d5-bb1037380f26} + {5ea6bc62-a901-464c-ad9a-331874ef98ef} - {8245d3bc-9cf8-4c12-81ac-0b74eaecae1c} + {d4f87113-8f8a-49ff-8412-fbb98d5f95ad} - {5de3e11d-0c22-4fd7-9eb3-d33ba5a7919d} + {a4439071-6163-4f44-9e19-87df8ee16b73} - {1ad1bfb8-43cc-4e06-a3df-26f98263ccf4} + {afc1abe6-94d2-41b8-93a0-019923fb58cf} - {f703018c-e58c-4cc1-ab71-d63dcdb75190} + {3c95931f-1ac1-48b7-b239-232b1bb98e88} - {f6ba95cd-e5ee-4f4f-8241-5a9340744d66} + {f2ab3aeb-69e0-47fd-971a-97259eb681ec} - {9428452e-7368-4a03-87b4-3931d10587e5} + {ad84b08a-5461-4b7e-af2b-769b62ac32e8} - {5ab0904c-0ed3-4f8d-a7d9-9375cce2ce2c} + {37b5c4bc-1187-4fdc-ace3-f7d1faad034b} - {c6bdcd17-3398-43b9-b81a-d609c93d6968} + {b8f729e7-567b-425a-b9e5-1aa91905f6d2} - {4ef76796-3dc4-440a-a453-d3a34972cc1c} + {a025221b-d4a2-4914-9da1-f1550fe40b0b} - {9e94a680-9e63-44b6-9f0f-1bff4e22482d} + {63e43a03-a4aa-4a51-b66b-a23c74cb1a14} - {c1c021dc-e870-449b-8049-582d2cf12c51} + {0b53a03d-d6b1-4c33-956d-44ae97a0b230} - {48732df9-b903-4326-a0f2-82d734067b74} + {ca73a1bf-78cd-4cf6-ab86-c884e49bd081} - {1ed0e990-9167-4197-9c78-c0f7470b23da} + {636f2e5a-e03f-4529-9fca-30b70b50e30f} - {854cb417-daed-47bd-ab24-636e41d2a276} + {8a45c060-c198-41d8-b6e1-546f4541ae21} - {dca2e8d1-57ee-4ba4-bd80-be1e781c12cc} + {9ba29eef-28a5-411e-b845-53f08ec7dd8c} - {6c7f05c3-6951-41ab-82f0-8ad33761c894} + {6fcfe362-2369-498e-9a11-82f52856906f} - {c47c05f9-97c7-49cb-aac6-f3a896ffc4a5} + {3c7cc7ce-912c-4970-a045-ba20571ac33c} - {5f5e5221-75fc-486b-84c4-3e04b3137e15} + {53644de5-0f3b-4021-9098-0fab8eaa0291} - {7e2ae042-8800-4237-b0d2-e445b6f690aa} + {3b9688c5-4495-4c7d-82fe-5d9770153c8f} - {0e44d80e-25c2-488f-8aee-0ed25857b3c7} + {5b4a70da-61f0-4c84-a34c-cbc2048a843f} - {2c445208-54ba-4b4b-96b2-5429f8ae68c9} + {2eee8610-8d5f-489a-b385-20e547c069ec} - {6a2acd35-2427-4eed-b61c-29234d8cca2f} + {d8dd0258-8d0c-490c-9949-4e56b4b4f18b} - {da0ca0e3-ea0b-4020-890f-995bc12d9447} + {87f50207-0d9a-443c-a089-be8cd4c8c37c} - {f5b6fa56-fe43-4bf6-93ae-ed74b564462e} + {e0cd7519-5735-4276-8c75-4bf29b2cff6e} - {c7faf65a-41b0-40dc-a910-97f728ffa209} + {cd54c515-b46a-4ea1-ba44-6fdf4ef24338} - {85646df8-6088-4a00-8ccd-d3b912373c83} + {a5d1c128-76fb-4a43-b2b7-a6fbeca08dcb} - {ace5f470-eddc-4f9f-b9ba-5ac825abcb90} + {e19626dc-2177-4e3f-b192-db4e9a8ab82b} - {337498ae-c198-4054-a1cd-ae02f24e20a5} + {80133b56-9a78-43bd-aa5c-f18f528fd236} - {0673734d-bb08-4cd0-882f-887dc57b9feb} + {9a0cd8b1-f294-47eb-88e9-a61beb1ff38f} - {00330a71-7edd-41a1-9d0b-f0678b6bad44} + {efce0d57-daed-4699-bb06-f81c799c605d} - {121b9ab1-1e6e-4191-b20e-d0b4b912767b} + {69b1fa3f-f218-40d0-bfa4-667fada41349} - {61cb4558-a5d7-494d-aceb-e26c0a4ccdd6} + {4780e3cf-c289-4187-8c64-2bfd54df0f0d} - {5aa6347b-a25d-4200-b47d-93728ef25fb1} + {c72704b6-1e1b-4154-b659-07e9a6043afb} - {0a031f5f-f890-46de-b412-905c14b84fba} + {0b041013-287f-4b68-af5e-5985b2ef68db} - {bd04b9a0-0ceb-4e4f-8f1b-fd1bbe1c1df6} + {d95c6f76-e252-4c5f-8cde-bed146eea3f4} - {7749ce0d-8b52-4151-ba3a-4f38afc8a03f} + {fbd2a341-55dd-4631-ba5d-f4ad0cf364ab} - {0344d264-831c-44f1-8fea-63cd70da295e} + {42dc842a-7a8d-4d54-8566-694c03853fcb} - {b48e0972-364e-4339-bddc-470bc224a1a8} + {bcb470cf-fa96-42d8-99b4-a222bf1097e1} - {4cf8dd2a-a86a-484b-9416-784cf5513ac4} + {d02c51d9-19cf-4599-b8bf-10be955d8319} - {3979500e-db81-41c8-8cb1-eb84c0084c9a} + {edeff862-a2bc-40b6-864a-47e07decea22} - {ed52db00-25df-4187-886d-117192d54c9b} + {dc84721a-421f-406f-8b20-eb199e3c79bc} - {b23ab93a-5f49-47b6-948b-d9b10a09e777} + {c92b63f9-73f7-435b-bf93-4a6e5127e2f0} - {86a46a8a-8ee9-427d-bad3-440944e02625} + {d7480df8-d955-447c-9195-0912b98ce712} - {83506617-9f89-424b-90f7-9bffbbfb74f8} + {0733bd3e-536c-413a-a9f7-89acf2f724bf} - {84937f23-8d9c-4a77-b25f-af1220b8f2e0} + {e847038c-fa0b-4166-aa91-d96ceb0c7e98} - {9172bd31-31bb-4774-881d-c417b8df4db8} + {2e0d2025-6e15-4aa3-9193-f84e6a31da1a} - {2d231f0a-56f3-4246-9178-bf1849563933} + {6830405c-5ccb-4efd-a91b-5320df41d977} - {8b0f1bcf-4d18-4223-a11c-613620630374} + {105fe5e7-dd76-4890-a445-d4366250c824} - {24b11b45-ab92-487e-8f4d-15a61dfecba5} + {4d1f5089-1ad0-41c9-a2aa-2eb506b1fd0a} diff --git a/Foundation/Foundation_x64_vs150.vcxproj b/Foundation/Foundation_x64_vs150.vcxproj index 7c0188e23..0fb6ebee5 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj +++ b/Foundation/Foundation_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoFoundation64d - PocoFoundationmdd - PocoFoundationmtd + PocoFoundationMDd + PocoFoundationMTd PocoFoundation64 - PocoFoundationmd - PocoFoundationmt + PocoFoundationMD + PocoFoundationMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoFoundationmtd.lib + ..\lib64\PocoFoundationMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoFoundationmt.lib + ..\lib64\PocoFoundationMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoFoundationmdd.pdb + ..\lib64\PocoFoundationMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoFoundationmdd.lib + ..\lib64\PocoFoundationMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoFoundationmd.lib + ..\lib64\PocoFoundationMD.lib + MachineX64 diff --git a/Foundation/Foundation_x64_vs150.vcxproj.filters b/Foundation/Foundation_x64_vs150.vcxproj.filters index 1d45ff650..223137ab4 100644 --- a/Foundation/Foundation_x64_vs150.vcxproj.filters +++ b/Foundation/Foundation_x64_vs150.vcxproj.filters @@ -2,190 +2,190 @@ - {40e183ee-ed5e-47cb-81ce-5c64237048fb} + {2056fd48-db3e-4069-9b17-e3a41d400333} - {40f067b1-a112-486e-8b34-4dcd2c566d6e} + {6ce99c4f-87c5-4aa8-a941-acbbd1060c38} - {e6ba7a3d-c89b-434c-b9e2-1810fdfca4f9} + {5e8def2b-4f32-442a-9fc4-3ded5346b7c9} - {af95b2de-5ed6-474d-89eb-e40c0133de13} + {8023650d-908a-4ed1-82a2-086bb4720524} - {a2c47132-2bf8-40a1-938c-30fbd2466bfe} + {2aa3f53a-11ce-4d04-96d0-edd7de5c454c} - {9ab04eef-6a5d-41b5-81f6-c6c73bfa0dcd} + {be78c4e6-97c3-4745-9618-98bf360b496e} - {635569ee-c572-4d59-96b1-864ee65cbe0a} + {89394abc-1a66-4239-8a1c-84b21a4c0d6a} - {54fdfb71-e68d-428b-bc43-6feb1ad6d196} + {2d1931aa-0127-4382-a1fc-f41b67e435f7} - {54137b40-d22d-4f01-8e29-f3921543788d} + {ac3ab508-e520-4beb-8a68-ac9d1261f059} - {1a93ba9f-4f3e-4c48-ada8-d6d6b12eff7f} + {d6c22dea-3c9e-4161-9919-8859a42c2203} - {0588e873-9cc8-4c6d-bfed-f42a05cd8a35} + {3174e5a4-6113-49f5-acf6-790542aaa18f} - {07e00aff-5890-4c4a-ac77-46d2ebf1aacd} + {b773328a-1f23-4f64-bf6d-b264b33c1d68} - {3ae28192-173c-4836-9c5b-1086a475914b} + {fe73637d-7ed2-4857-b7d9-c4200f26d160} - {240cfca8-b8a8-4da2-8243-97bcec2caf95} + {43c5b8e5-81f5-490e-8e29-c94b4ec3970d} - {961e0e0e-b10f-43c9-88de-8f2a16646196} + {9a660fd4-c255-4ff1-abc2-0266588ea236} - {8074ff6a-ef1f-4d06-8e08-573eaec84a0b} + {96bf93f2-2aaa-4290-aab2-20bc64542c4a} - {905baf77-de66-48b0-a0eb-0b4f17369f7c} + {fe0d5b62-423b-4964-8d31-9b3090d38a61} - {58931c30-a184-4d21-a7a1-24ff5234d60b} + {3584e2a2-348a-421b-95da-d93067dbe7eb} - {e3e82439-28a6-4618-857c-d94bf6b25288} + {63c5a9a9-e9c8-4aa9-9ab7-0debdbfdf134} - {eea1ef82-6a9c-45a6-a255-155e8d370a57} + {31a87571-f0f3-45f3-84b4-ea2b52b69002} - {4ccdff8b-e4ab-4dfe-af5c-22b95c791820} + {210c3699-79ab-493a-a7a1-e28224152bcb} - {8b2e0a08-30fe-4151-b7d8-ff8a868c0051} + {5e448efa-28b7-4d36-8fa9-962068f72e47} - {fd05e726-5fa5-4c8d-a694-d6974cc0a1ee} + {71f36a2a-7e60-45cb-8715-8eeec768f60b} - {11ea1e67-ad97-46c1-af29-a4ae9c1d72cb} + {fc29bca3-87ff-46cd-be00-f1c2a7e0ccef} - {994c7b19-d9de-4a93-ab19-e9dd5f9e7da7} + {baf5cd52-d952-442b-b554-d9a2d6592367} - {f3c0e05c-a3f5-4dee-a4f3-53b2fb85cfe1} + {d2eaa40f-e0d4-47a0-9ded-2c04f9440434} - {9cddef1a-5364-44a9-9c5d-ce6d53eabcc5} + {927f22f8-ba8b-47c1-8ade-9dd3bcc3e0c2} - {6d46ab1a-1938-402e-af63-a9f013d49d7e} + {4eb2e3d1-570f-4922-960b-8f4c75516aaa} - {74ea8f5a-e6e6-43dd-8037-b6471008978d} + {a8fb5405-800b-45b1-bb4b-342aebef82c3} - {f4002e12-f86b-45d3-9d48-f974d8c76249} + {895fa982-3985-40d8-9874-398da005b92d} - {76c4e1fc-5684-41ac-bddd-767fe0eea0b9} + {56dbbdf4-2897-45d5-bf96-3a75d31d5e18} - {fb137e4e-1580-4810-9dfb-8686962897a3} + {edd6e417-8a70-4e1e-bef1-1e711c63d40f} - {177fe44c-4456-4ef0-9327-5b3ca37a6eab} + {1053efba-cb67-48db-93a5-a1f8a3a550b0} - {787c1bd6-213b-4159-a715-420ccf6c769b} + {0ff05649-4561-4296-a178-a6a333cffb10} - {81a05cc5-edb9-479a-b5ae-4ebe7076c1a8} + {a6b0a3e6-9bed-4730-bd55-c5f7109717b5} - {53293e93-9aaf-4123-a271-7254b21ed6ff} + {f8543b45-0d3c-4b67-86ae-b36f1c95fc39} - {7c0d91a4-f9b7-4756-9ee4-430148f75ace} + {c8e65988-70e6-4998-9c7f-e0e50958fa48} - {facade73-c82f-449d-a3ab-42ff373e6bf6} + {90f035d7-63f4-4287-a5f7-2a673827cd64} - {dac5c2a9-27f0-4012-b2a7-d1fe00aab6cc} + {410fe0be-7d15-4962-8ac4-2458c5111a5b} - {194a1255-b34e-4c94-b6e8-b03306f0fb9d} + {1cea6347-0046-437a-8ff8-70d37b72121f} - {78123f91-2fb0-49a0-a654-01f360466f60} + {b3980517-bd3e-4771-9321-a1852c5b1b85} - {003c588c-d4fb-4225-8177-1c0d9f0dd9f7} + {ba12a0dc-f11b-4159-8fcf-643e1e97cc22} - {19f55414-d819-4ecb-bf6e-6e51271263b0} + {2b4b44bd-4d8c-429f-8fdb-51270badda40} - {c1b6dbf5-3a8f-42d5-9c38-4e769df49fde} + {b770b4c5-da30-46a0-94d1-fb33ba7505c1} - {b3cb20f6-0f74-482a-989f-b73b7da33f2d} + {1d896143-147c-480d-a163-bb7029637d99} - {53dd8197-f3f9-4e3c-8551-34070cf1f8e2} + {0d035e2b-8170-443f-ad25-ade798acc044} - {4d288992-80b7-460e-88e1-26c75b2eeb0a} + {4972c896-df62-4fae-b17e-28ff914c75d3} - {d4921c8a-1c31-4982-a2b9-406ce03af24f} + {59d7b18c-964d-4c55-a978-41c11c9eefe2} - {091c87e7-adbc-4f81-83aa-f315f65405cf} + {f5328c77-5905-43b4-be4f-2570ebca33c1} - {66e9fb1e-17bb-4030-a73f-365c8e3e423c} + {7381e97e-ea4b-4e10-851c-37b20f8b55b6} - {9ab2119a-8460-4912-9a57-9d1ad0b1ce54} + {041e49cd-9104-4c9a-8308-f9fca7bfaf1a} - {d99ca3b0-0cb8-4724-af43-0e9494dc8aa4} + {cdc47ae2-a9f4-4f47-b45d-8b4982e67210} - {7cfc99b5-640d-43d1-a851-3b85a0700842} + {195bb481-3c1a-4dcd-8844-9e49dedfeffb} - {35e28716-c765-4d4e-b630-d467aacffa1c} + {4ad7512e-4e76-4a30-9c14-ea9ae0c6fa16} - {ac35eab2-2892-4289-be6c-53ab7b00f4de} + {72bfd4f6-8eca-4685-abbe-407631a1c12f} - {24923c90-7bae-40c7-8dfe-8a047c4147ef} + {1f8bae11-e23b-4248-a7cd-3ce5164404cc} - {5ac5dca6-3081-4ee4-8952-6a15a58226c3} + {18e0c711-a455-4108-a756-2ebf8254ad6b} - {7b5c2060-e46c-4686-8e94-12ac41fa5854} + {ab88620f-97ec-43a0-a022-6ec54af92430} - {a8f6764f-7dda-4c48-9b67-720e1f430ac0} + {334aea6f-eb4c-48d7-aea1-e511070fbeac} - {5724fc50-ea56-45d5-a9c6-f24139640d4d} + {4024bcf3-b388-4374-88a3-77d7581e9968} - {67205d07-1c71-4eb1-bd1c-9b119d60ac9c} + {66a6138f-c192-42a1-b883-8d7c7528afab} - {9270e29f-4950-4c57-ae75-c10f8c561568} + {1e0a50b8-0bae-4938-be45-3637dab5e978} diff --git a/Foundation/Foundation_x64_vs90.vcproj b/Foundation/Foundation_x64_vs90.vcproj index f08a94bd4..4a6877fe8 100644 --- a/Foundation/Foundation_x64_vs90.vcproj +++ b/Foundation/Foundation_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoFoundationmtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoFoundationMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,8 +201,10 @@ Name="VCPreLinkEventTool"/> + AdditionalDependencies="iphlpapi.lib" + TargetMachine="17" + OutputFile="..\lib64\PocoFoundationMTd.lib" + /> + AdditionalDependencies="iphlpapi.lib" + TargetMachine="17" + OutputFile="..\lib64\PocoFoundationMT.lib" + /> + AdditionalDependencies="iphlpapi.lib" + TargetMachine="17" + OutputFile="..\lib64\PocoFoundationMDd.lib" + /> + AdditionalDependencies="iphlpapi.lib" + TargetMachine="17" + OutputFile="..\lib64\PocoFoundationMD.lib" + /> - {0156999a-8e15-4786-9450-94bfc3e13dd1} + {880fdca2-a150-4c9b-8b34-7b4d91b3566a} - {18441cbd-2dc7-41a9-9212-bdd1ed154b8c} + {bf9ec298-b5b4-4069-9695-883fbbe2fd4d} - {f222768c-e9e2-4106-b6cd-41c1d7b050cf} + {336ca3e6-dca6-4112-a10a-051a092c695c} - {49cc2b3b-034b-4d25-a871-6224bd44b6c0} + {b37fa032-cbb6-4c18-a557-e74d63601f30} - {eabd3ec0-072d-40a0-8f3e-4f2f2cfe6748} + {f87309c2-95c1-4fe7-8fa2-b2ad2a435eac} - {b6c73738-622e-4baa-90c8-aaeaf4672023} + {ed1dd178-ef14-4f91-adc2-ab63ba3fd242} - {3927a6b0-fd51-4f78-95d8-4f71851daf25} + {1c94c76b-363c-4e25-bfb2-e641680cd840} - {1a4ffe3c-4ab8-4a74-9ad7-d757fb1a7776} + {d7e87c2f-9f6c-4f40-97ea-68892b90a01b} - {b8cdd775-9dcf-4c95-8184-7b013ab80306} + {a7eb996a-3540-4991-b72a-ac5e06e42ca6} - {55e94b45-2f51-4e77-89a8-3b33b18ca4d7} + {0213035a-0a25-430c-9fda-edefe7457153} - {f160adc2-956d-4086-a2cb-16204b22ea12} + {81fb4809-f907-4633-9db2-d85cfeb0a358} - {3d8f63c0-9a45-4f2d-aaaf-d8ff15da9183} + {cd89b55c-f795-494d-a79f-69be02ae2c7d} - {8fb4eb41-1171-4947-8ff4-0146836d160c} + {415b5090-bb25-46ef-9390-995958265a8a} - {918bc742-4175-4ec8-b1cc-84560c6357ba} + {378a5643-6b20-48da-97e9-b9a7f88c932a} - {c6413548-7d2c-4713-bcb5-b2b75a831f47} + {7ffbb1cf-a9ea-47de-bf14-ae1ee11c8784} - {0c0fff47-2248-4b58-a09c-3ee006b607a0} + {f8b2a43e-4c97-49b9-956f-2e4c2e8c10b8} - {8d08b285-c7a0-463a-bff4-97b445b396d3} + {6444a90a-8a67-421b-ac3e-2f20b0a8b92e} - {2a256875-24ee-4876-970f-9a9af4acf154} + {60c14c06-9610-478b-bff2-6b647f87dd8e} - {e2252a3f-4ec8-43b1-8eb2-cc1137f3ed59} + {937eea37-9be2-4f25-9080-abe85c2b7d15} - {eab00576-0564-4a44-bb97-8ebd84622ecc} + {455923e9-1699-4807-b2ad-93f916d11967} - {a7ede6c4-ef72-4532-b367-851868fe27d7} + {caf26d57-e17f-427e-b72f-014664f348f5} - {26a7b1dc-476f-4894-b53c-f3429a14b09f} + {a2bb5856-f822-415b-b1f0-37cf25486f63} - {f849e52a-460a-4b20-813b-bc12db3b10a5} + {c075facd-a1bb-4f60-8862-1d85fc8aabb6} - {21450f1a-c665-487c-813d-c7ac6f0d9de2} + {7520bd4c-4373-482b-9599-8883a69f49c4} - {653f6fe4-e526-47cd-9c7e-32f71d778b4a} + {f350f9b6-c13c-4c47-9b5c-33d367a22667} - {2ea4aac9-4f50-45d2-9af8-4b2e527f4ec1} + {fb821b4f-681e-46a8-b8a4-26a310b9b1d1} - {ba9accdd-66d7-4995-9342-0e08fac5e06c} + {d0efc359-9c2d-44b9-bf07-dcbe580c8275} - {62540cc4-b695-4fdc-9e0b-b0a6ead77d97} + {1ab3c4a3-a675-4540-a799-54a920decea8} - {30567496-472e-439e-87a8-fe9feb9cceef} + {ee20eead-a1f7-4ec9-b435-6cc6de74a70a} - {ba3977d6-6f13-4725-906e-53aa9a815124} + {8dac6254-06d7-4ecb-ad65-2be0f433f6b2} - {4c9dfd90-74de-4130-adb3-20efd8da1f43} + {f4bb95e8-f447-48a9-abee-f074cbd4a5e8} - {31262cd2-526c-4461-a0b8-986e23ff365c} + {21a24ed6-7f69-45ec-b63c-075c31cd5526} - {5e2aead1-a4ba-45a7-8d15-bd962ed9a4fa} + {b7f181b6-c656-4567-9f59-bf0f34010bb2} - {bc75d22b-e3a5-4902-b74e-aad74cc49600} + {79fcf9a0-158b-468c-b8e6-e9975bed4ceb} - {06df8dde-56fd-4ced-b86a-79ee94fa5a68} + {03863ee2-2f42-4e76-8084-f951967b598c} - {fd43e604-99fc-43f9-92bb-c344697ce074} + {942b4d41-15f5-4fc6-a2c3-fee9707232c3} - {1f31b8af-8638-4a98-ab14-79466d7ee532} + {ba4c6f2d-70fd-4d0a-a133-dfd2d868f821} - {3881796c-7d07-47a1-a82a-40ae63cd9ebb} + {e863016c-4572-4277-b50a-69ca038cdebc} - {d12706e2-d501-4af0-b515-64280abd2481} + {aa2e9193-961d-4b5e-a780-24eebb24f5ae} - {6c4afca5-8b9e-47f7-9783-d1ed52b7b831} + {92e32add-5ef4-4527-a3c8-b5767230e096} - {c80549b9-b0cf-4833-a6cc-ac61d333a905} + {193f88fd-8f68-494a-a1aa-10b3fdc0559e} - {9ac2cceb-3c64-4046-914d-13c1191211b5} + {3328d8c1-46ea-4e5b-97d3-216c346fa5d2} - {743186ab-967d-493e-9af6-b84309acd093} + {041b63f7-949e-4adb-956d-243ede9706bc} - {2a28bcdf-c798-466f-bd3d-9c3ad3fc9cf3} + {cfbc00f1-07b9-4d31-84c6-e7b368ce7684} - {cafbc256-ac47-4860-9b11-42fc04955d7a} + {867daae4-4f1e-4028-9dd1-db045238de32} - {4931b059-fb64-474a-bd7e-975790e19619} + {bf7af89c-860c-4ddc-98eb-52d382691802} - {75824cba-ebbc-49f0-b362-68ac86d98ba6} + {07e87c18-59db-442e-9579-636a68bdc9fa} - {4fb9fa0c-b343-4e4c-9fbe-3fa56ab46fcb} + {9aafcd27-6074-4fbf-83bc-9c479e2e56d1} - {74e46980-2da7-4e85-9221-9f773c914563} + {e784f1a5-0bbd-4d17-a54e-d08110667f5c} - {1ef17989-c760-4d27-87fd-719f6030ec38} + {2c5b0847-99d0-4c97-b618-e6efe0dc99e9} - {1f813fdf-bc69-4508-ade2-7cf0821ef6be} + {65aa3df4-4f48-4665-8070-a483a65a0cb1} - {37ba9d6e-e631-4238-b37c-7a2dc1867f07} + {befb8045-a9cc-427f-8e8d-44b55e1ffd22} - {87690fbc-94b1-467a-9522-0b032d7c21c7} + {349e5ba1-f2f4-4b73-9c11-ce1233bf3fc7} - {9483f5f5-80d2-4e8d-9761-f14288787fb9} + {5e957b67-d8b8-4979-88fd-a09a4f5b4459} - {f01295c8-42bd-4809-84aa-23a72a4f0ac4} + {e1f98c17-3bb1-464f-b2a2-6768a33f10c6} - {7fb57ff4-afaa-4428-aa9b-592823ada736} + {3447b9ef-d10c-4513-af17-1423eaba352e} - {3c55b62e-f6ac-452b-9624-b9cb14021050} + {6bd8253b-26e4-478d-aaad-553982cc0774} - {be955910-9e38-4e7d-b8e8-815d3c054d8c} + {5a511035-e773-4156-9441-21f06e1d358c} - {5526b542-c6b5-43b5-ad72-e23408a04824} + {341703d9-ba71-48f1-b56a-7f7c7336a473} diff --git a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 3dd39126b..d8ebae7c0 100644 --- a/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {c101483d-29b5-4df5-9751-5f444bc05c8b} + {e4ad5ba9-dafb-43c9-bf87-68275f99f6b7} - {39cba189-955b-4b2a-9b3c-cc62c1527402} + {e1bfd51b-4acc-48ae-8645-b3934a487d82} - {d31e64f7-33f6-4c9c-9d76-c50c756c225f} + {535a993e-5c4a-490d-bf7f-a86abe3fce6c} - {e43fdeff-64e8-459c-b5ac-4a7586732ad2} + {1d557db3-3388-4758-846d-c995f7e8cce9} - {37ab5c51-0369-4a13-b5a4-ecdb2647086c} + {f840764f-a500-432f-9740-6114fe11d954} - {a8287ac0-f57f-4493-8fef-d54fcc117142} + {0bd79b3e-68b5-413a-8ca9-d716841be517} - {1c765247-3081-4e1b-b963-23b825050f80} + {c7fefe10-4322-4f02-9295-8fe55f1c76f5} - {5e6cbbe9-f213-433e-bec3-0b34db8a2ab2} + {0d320a16-788e-4891-8e63-0fd8181341cc} - {b9ef71ac-6389-452c-bca8-e26532faa213} + {7d5fdde2-9222-4c79-baba-ca897959cdc7} - {0fe222c1-ce47-48b1-a441-a378fae806d4} + {e42c0b65-ef2c-4dd8-bcd5-e08c57eb7db2} - {ea93c694-d458-4f36-9249-7c1fa72bdaa6} + {aecc4449-cfbb-4fcf-88b8-3cadf695fa0f} - {4a2db124-8fbf-43b4-9765-115b4fb15672} + {7c388815-b865-4794-9589-00ef2e9ad5e0} - {91961e60-c568-45c8-a447-a605ad326018} + {20bd3f7a-6abc-4fcb-a515-2e91ec7ddb69} - {9341d217-89d6-400d-a35e-a5fb261d30d7} + {8159baa9-9aa2-499f-b38f-8ee77d3d866d} - {f8c2e231-1687-42eb-87d5-c1fa232dded5} + {c8785f14-e5f7-4721-8f09-40ba56b3e74e} - {083a2ff3-1786-4012-9100-549765a4b164} + {fe046309-4f52-4576-8be6-12fb75cb8e2f} - {fc8e92df-7c65-4ccb-9eca-bd5a48bfdcc2} + {318b29da-44e3-4665-b8cf-e6e7416702a9} - {95a74205-b5ca-4a9d-b7f9-0830ff4f23fc} + {a6536388-c867-4e95-a612-c0efd72943d7} - {4bf8acd2-a38f-43aa-83e0-5ae87900b7fc} + {aa5f78d4-9c08-4430-acc2-0290355d7e5e} - {736f4bf9-c34e-4653-8487-0892c6cb0095} + {054556f4-9b7f-48bf-954a-36f0bcddf3c2} - {1c3902e6-22bc-43e9-9dbb-418b228e9fb8} + {602c7de5-3db8-4281-be2f-05ceb33da89e} - {f0c100d2-fab2-4fe3-aa74-3f6b0f75ceb8} + {774f7a6c-c4e4-487e-b5e9-95db57ce03bf} - {14e6c276-0e7d-458e-816b-ce93e7c7bf9d} + {b0c9e9b0-32a7-4a6b-9b4c-90614cd230fa} - {8ca4ba15-bb15-427a-8d54-33005312357d} + {835dfbb6-6538-4143-980b-c47d857e9d2b} - {757fbaa6-e5b6-45df-b3e2-378825bd7822} + {548f2c79-c2e4-4bf3-a084-ec611e05be71} - {1d6025ea-5329-4189-8058-7abe38fb0ff0} + {a5a59f5d-ad35-485a-b313-0feead3a75f9} - {dc65f477-087c-4331-a41e-aa9183884930} + {3edd1164-423f-4d6d-8152-7a5f46406ce2} - {b109aa4b-56ff-4955-a3be-10568005f5d1} + {2c212fb1-609d-4dd1-9f23-d6685d49f1a0} - {86a784b6-8587-4dcf-8651-5d6cc7410e80} + {9fe193e7-0368-4b54-a05b-0421bbb0d297} - {9180ee72-6fa9-4cf6-aa92-7ed317b0f5ef} + {9a4028d3-25b2-428f-8484-f5947606c279} - {53e1a8b0-8cbc-456f-adcf-1293552c4ede} + {8177c3a5-1be8-4496-9dfe-f7f6decd0845} - {4d0cc963-23b9-4512-b59e-e15b983bb2bf} + {2008df00-56d9-4b1a-8031-eec65c8e49bf} - {de66db5e-80be-456f-8745-4a2b66cb850b} + {f04caebf-7726-4e4c-a565-273b25c6b3dd} - {0cb6f97a-20a9-4628-96e3-251b191c2541} + {11459404-2ede-4a32-b44d-cf9f544c9f00} - {b7891d04-31c0-4060-89e7-c719a83ab020} + {c80577f5-cad6-4238-87df-4d5c84de13a1} - {9d85b0da-73ef-43ed-bfe3-70000ecd6686} + {53cbb80b-55c9-41ef-baef-53228ea1d785} - {b8db9256-510e-4b2b-97e3-fdf42218da99} + {f38fa8af-d64b-4761-bd04-43e23212a539} - {c365a04c-66c7-4508-a52e-e47298cab2eb} + {82495d4f-05fe-4ca6-8fcc-a9f1b2c694ec} - {59d99c90-0cd4-4cc0-a5f4-efcc4b554ea1} + {89ee1b4e-53b4-42ee-a63a-d7019c0291bf} - {da7b678f-4a7f-4f04-b904-6aebd5374529} + {ede10e1d-2750-44e2-989c-0401b02aac75} - {6a2390b2-48d8-462f-82ea-908b1c3a7e2e} + {8622f8af-03a5-4e79-a202-6cdfd52216fe} - {c1be6927-088b-4c47-9199-8da2e2ff3b7e} + {cb29df82-816f-436a-9698-4bb056f654d6} - {4d648343-2d37-43c8-a754-5550e940ac40} + {569214f0-21b6-49c4-b9cb-9d35e60fa332} - {c14a1f94-bad2-4741-a8e1-73018c4cda8c} + {920c5cb2-00f6-425e-9fbd-4936e64e7256} - {152720e3-64a3-4509-999b-09024187d6e3} + {085da9ff-d8b7-40be-93ba-f94e6480f4e2} - {311d4fc9-c665-4726-8f0e-0839ad44823c} + {a838d812-855b-4480-bf9d-cff4187f8439} - {ee50f946-8c70-436c-a039-5412bf0dd704} + {405caf26-c7d2-4d41-9820-7b1e51edbd34} - {4fc8b1a9-ba37-4e83-a129-1a5c2927e67a} + {27b798b2-3029-42e6-9def-e7bb5a11a8f6} - {6037f16e-fc3e-423a-a138-4c4f23fdb40a} + {e77676a4-b267-4441-9888-224d4cf339b2} - {cc61e22e-5d11-46bf-bd56-7d6f17b13a40} + {ff29ae01-ab74-4d1c-bc46-e4066caeb7fb} - {346d2828-e1a9-409e-a9af-def31c46e9a0} + {311ba735-5354-4972-8a03-f8fea647840c} - {159b9f1e-2ef1-428d-93c1-9ef8ccc494bc} + {3030a621-960b-4bbd-ab9d-9e273ebdfd07} - {eaf601c9-2e67-48d0-b028-dc2cf144c83a} + {b78b0402-dd45-4f7e-9d08-8ed82fd08d6e} - {488b872a-55b2-427a-b99d-9bcc38624221} + {880e788c-b2d1-467a-9c87-c1f45e8b0947} - {bc23fc3b-1851-4853-928b-aa93b396d193} + {67c69984-06a3-43eb-a5f2-72b7caa034f9} - {c0b92abc-5654-4325-803f-23a1e6433be9} + {f9301417-a073-40fb-b0a4-ac5b8ed6ced8} - {130a4cf7-c909-443a-aa7b-880d52a48d02} + {4fb76c10-7b14-40ff-939b-2e7b2baea566} - {3049d550-7087-4206-9cba-21d6d3e48550} + {9112b760-6c92-4e32-acbc-898bedd0da62} - {c2746350-17b8-457b-8858-d46d411c3c02} + {20262f2b-15f1-4acc-858a-15196a2f5f34} diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj b/Foundation/testsuite/TestSuite_vs100.vcxproj index c85153991..a964fcdd5 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj @@ -201,7 +201,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters index 914e7c4d8..c33613b5f 100644 --- a/Foundation/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {64243182-13e5-4d49-8d85-f155a80b8efa} + {d3419351-e11e-4c8a-bd90-07a0afa01ea4} - {cd9814d7-9138-42bd-ad1e-0a83b8e0de93} + {d577b8cb-cc53-4db5-961d-e3c3774bc531} - {06c936ab-9172-484f-8447-42a9d997eae1} + {581ca8b9-b0ca-4c66-8eee-19fbfa995e15} - {239a55df-d260-4dc6-96ee-12f397d0b455} + {77dafec1-dbf8-45e0-83fc-7e91e0272586} - {097e4e49-2959-4da6-9f3a-19f13901f290} + {6fa2b634-ad58-402e-b25e-9e7a9b1738ca} - {322da607-ce86-4f68-b273-85f87f368a1d} + {3efb137a-1a53-4006-87e4-317ec011ce34} - {dce127f7-cd20-404a-9fd3-2f30e5b89484} + {92361b9f-1190-421a-a386-e1e1d9cab6ac} - {8a52036a-6529-4a17-a46b-40d6a4d69715} + {3d9e9693-007a-4a57-942f-b5adf16be7e8} - {7d64be28-19ef-4e51-b5cc-3ebda09cd491} + {9f183e52-94fa-4ae3-890b-d0b5c7a5cfc3} - {eef22837-2bad-4f34-b445-bdb3dfacd41c} + {cde8d0bd-e69d-43b1-926a-ab43302f49ed} - {41370af8-d4ce-46a3-ac96-004ebdffe80a} + {cbf1095f-9c9f-4ce6-8fa6-aec81adac6c4} - {f8ea5f7e-8903-4bd9-a46a-9521615baf72} + {a67375b7-bed0-4041-af43-b5c9728900e3} - {bee3b694-9189-48db-adf8-728a746cfdff} + {05a4a2c3-06e8-40de-922d-70b88e84d49e} - {845d0292-fc10-407e-bcbd-f5ec180481ef} + {8037fb22-9a73-4ff7-b113-89a2714b0bbb} - {49bfa4d5-a7f7-4148-a078-6459574b8e01} + {d5ff2bbe-c823-415e-842a-eef2fc1f8003} - {89d2cf4c-67fb-41af-a8e9-e9124938752c} + {2477975a-b511-4aaf-bebe-b9da6529ae23} - {18feca52-f134-49c5-9dae-79ba79470e3c} + {a3a78bd0-7d2b-4035-9a8e-282bb37709c2} - {dee0fe9d-ce5a-4b87-885c-4b63e03bcb9c} + {1c2e1e85-dbd4-4fb8-ae0c-1f3cdbedaf18} - {81ec9ee1-7d8f-432d-af47-54d185a96db6} + {fe1208dc-5f06-4447-97c2-7e010a402ca7} - {cd895049-e2a5-44e2-bce0-1af6c5b49032} + {6e30f681-9f6e-45f9-8a4a-5fcc5e74d83b} - {2a96c8c3-f8a1-4fe5-9ad3-9b0636992916} + {9a9c9f68-8fc7-4a91-b1f6-f0d969509edd} - {6301907b-a3c9-42dc-9385-7d633594e815} + {9f95af6b-657b-48ed-afd0-8333a72ef98f} - {c8627d0d-6d3f-4191-ad3b-6f217435609d} + {ee39fec1-0877-46cf-a613-0d9a03b38857} - {d29ca663-6f6f-4e5d-b50f-30659ee459ce} + {474ce682-7adb-4919-9586-d11a38c8d561} - {77a8ed66-5274-4d4a-8a0b-333380c90229} + {3bafca61-fd7a-4c14-94a3-f9eb5a564d5f} - {435f14cc-2408-4526-a9d2-0bb608a30b16} + {0e58ca7e-1306-4757-9dfb-01d8adfe1604} - {8f5c2789-5426-4a28-9673-1a6d4f688651} + {40ff85a6-ac01-45ca-8b08-d92c5971bcda} - {f4a17573-8cb4-4d43-a256-232f1647d26c} + {d92ed994-8394-403a-94bc-e028fe38a4da} - {1aec9366-00b1-4e00-b711-5ec3e5ae01f3} + {c5d4d955-43b0-4b93-95d3-8c9475526ad2} - {c0045c73-c061-4799-86d8-ad9bec92f1f3} + {5de67ee4-d357-4c81-ace0-e4b1e0168f0e} - {62e14ab6-fd06-48e8-80e5-ddf60f42a91f} + {a234cd8a-bcc0-4d64-aba5-bad9e0178196} - {48b85c66-e6fc-4935-91cf-f5bf3fc0dbdf} + {1409e716-4733-46d0-be8a-1c1839e92643} - {1b9002c0-226b-41c6-95df-bbd20f514591} + {64dd70f2-bcba-41ab-a4a3-9984ba336ac2} - {425fab1f-e271-461c-ba79-caf75e6f931d} + {a67929c6-1ee9-4faa-86b3-e4134b2ce557} - {738fcf69-f47c-46da-8c47-f845a48afd5b} + {8490a422-02b8-4786-a8f3-5764e9ca410f} - {4ab7cf03-2e79-42b3-b77d-a760f130ce62} + {a01141a0-b48e-4da4-857f-fb3d6e678c4d} - {fd0580f7-dbc1-4c29-8d60-bfcd242eb89e} + {256ed22c-8179-4210-838d-d14cf21d80b8} - {570a66f8-f3b0-4786-b8e2-60c3b60232a3} + {bade37b7-63e0-43d6-bb54-42254cbc345a} - {4f17e60a-a8a7-4530-aa8e-5df8906825a4} + {fcb4bc79-441a-4ca7-bddb-5ec8f49b0a63} - {282ff7ea-3c35-47f5-8b9b-5f2bbfa73b32} + {f6cfc2fc-6bd8-4262-b1b7-c46c16509de6} - {59b3fdcb-6de5-4e9c-a5d0-f2b3e8ccde08} + {663587fa-0826-4071-bfe0-8bc421790064} - {710f3acb-1576-4b59-a28f-905cc21d92a0} + {13cabf80-84de-4f8c-a8c8-1a51a8351f8a} - {f823bb5e-762f-4a9e-851f-358a5c811532} + {742a3232-ae92-4b6c-b7a4-5ecb1f41b729} - {acacd35d-f46d-430a-b555-3db4c77e6c92} + {ac2885ed-75c6-479f-bf0c-886f5567bd39} - {c417ddf5-2352-4aa4-af10-f49298458f30} + {6e6b7af2-f048-4ec5-9132-617089ad76bf} - {07c14b80-ee4c-48d1-8e9b-ecff5a870da4} + {97168892-f10a-4207-ae94-1dff1b5a9df2} - {f88eaadf-8eda-40e4-b924-3fff5b6916cb} + {418aa2c1-141b-4509-85de-f3daccf3fe7d} - {ae49134a-9c12-485a-bd5b-a77d636ca049} + {737f44e7-65bb-40a2-821d-2d40e348beb8} - {0643f605-aa07-4667-96d2-da53aed0299d} + {0b1ff710-5d82-426d-ad09-63591c4ee754} - {5650fd8f-d624-40a6-85fd-b66ae5eac8cf} + {8a35546b-f2b0-4e8b-b961-fc1a4c12de5f} - {b3ebb5ce-cf85-4607-8717-e1a14440e3ed} + {3cd9c7d8-4e3b-4890-849b-213916753df5} - {62e4e13f-fd1f-463f-a058-b904e09fe5ef} + {7e27df38-0707-443a-9a14-22c4fa920fd6} - {8b8d7fe8-9d1b-489b-ade7-dc42bd727c50} + {6710efbb-b041-40e0-b5b4-3c422d0f0be5} - {17fc173e-4ac3-4ed3-b461-3148391c62f0} + {351de252-6b9c-43cf-b443-d71e47b49ce0} - {dd495fbd-7ec4-4606-b608-5d08b1a144d6} + {6f3b104b-7874-4a72-8a4a-e55d177c7cf6} - {67874b28-1c33-4c64-a9b0-2a561e59228b} + {2b115faa-45d1-4f47-a250-3bdf34e37644} - {6ab69ee4-3bd5-4945-b6ef-9b602b763755} + {2c721780-e5ef-482a-8cbd-8fad9a14bbed} - {eca5767f-66fa-4b17-b68c-2cdfe7034ef1} + {afd5fe18-d336-4bfe-b7e6-8703b3636dcf} - {d0f6af29-1a33-4299-85ec-2a6c5e1d5887} + {5f9aab69-4960-4f0f-826f-d104ba4728b0} diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj b/Foundation/testsuite/TestSuite_vs110.vcxproj index ff39cd2cb..bfa3b3eef 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj @@ -211,7 +211,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters index e15920c33..95530f9e7 100644 --- a/Foundation/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {d3811182-5aac-42fd-a801-84841c2df51b} + {8418c17d-3428-449b-baa6-3ad3312ef292} - {49befa7a-2131-4c24-a78a-c550d9c82eff} + {e9bbee75-36d5-47e1-9ca3-4db0a091dde7} - {120d7663-cec6-4a34-bc37-8aec65dd92fb} + {0be80530-94d8-408d-8e57-64d781513b68} - {ac0a2b31-d4e1-4c12-9a80-bfd5d4628706} + {09703dd7-fb4c-4c35-a457-41b95d18fd4e} - {270e9a44-5b1f-48b2-8f8e-c7eaf81d09aa} + {d929e7c1-7740-4a6a-9a16-2b61e7c420fa} - {7214574b-304f-4f54-a209-515893e7afc8} + {6e6050dd-4f37-475c-98f7-cb4f0ef0a482} - {7c2da74d-91fa-4368-afe1-43daed77b116} + {b1f3a359-2a4e-45bc-aa47-459522a2462c} - {9e154dcd-ac2b-4929-beef-e4a7d48908fb} + {e9015810-0340-435b-aeda-b75c0d31608b} - {88fc6da2-331a-4a74-b2af-81d1bfd2c762} + {13a1d55f-c92d-4f63-93e9-3ae8679f7be1} - {54c51c91-e8ba-4915-a38b-816c6a5d1d01} + {ee437de6-c775-4b9c-a163-d2c78a89ee2d} - {18623bc3-e7f6-4e6b-a2ff-db3d87cfe85f} + {23ef3b66-6bab-477d-8d08-ac38cd636926} - {69edcaff-abe0-4f04-a4d2-9c075b82d19e} + {f35c6c54-a83a-4793-a322-e09759d2e9c6} - {ad208ce1-32f6-40aa-a2ed-3bd20857313f} + {4c080827-c673-4d3d-8053-9cb56835e549} - {e5f4e9b0-79df-4854-9e57-3c6e1ace0813} + {eb1bef63-b9db-415d-8cb3-9de0ee485640} - {61e855e5-e762-44cc-846e-49faaf86c70e} + {3cf9e3d0-3c38-4659-a764-cc49f791e92c} - {984890c4-2e0f-4cee-9a0f-d7e9a639a085} + {96e07e3f-578c-46bf-97e2-af6543a3e60b} - {6c729910-76f8-4e6a-9576-db58c3c05661} + {a2e96e4a-fd51-4e29-ae64-e0bb14d05bb8} - {4e7b005a-2648-4da3-8b56-662c1e2cb23d} + {37ca9464-29b6-4c70-9fd3-a60747c02577} - {77cf0368-c717-47f7-838f-80a2e724ce22} + {cc6a1653-adce-4291-a622-e49284991196} - {75de42fb-7b20-4cea-9b01-f71f4371b328} + {cec493e3-d4a3-46fd-995d-50a66b11c807} - {0ff8410b-c425-4b92-8da5-758c17c62555} + {d0c7bc39-a2d6-43e8-b9d5-f524bd3e512a} - {2e3d92c0-4b03-48f5-9db3-595d7f43222c} + {0179bf0c-4b2f-4d1d-977b-7151487351ff} - {9c6b1ae6-bb54-4f41-b344-3e44fd542946} + {456c7ae4-531a-4bdf-b679-a1f2a5991a7a} - {38382d3c-d61d-4d5c-b935-3988c3d658cd} + {40db290c-28f0-4946-a2e1-dfb6e6a51a1e} - {56e394bf-91c7-4ccf-9666-b25428a1a73e} + {f4ddbdef-b2ce-47d3-899b-f80cdd87c56c} - {b3823ebb-8da8-43c3-ace0-e3a4ef73e818} + {d37b2b7c-4f97-4399-9742-620b10bcec1f} - {22279583-a325-48ea-bdb7-c263adcd75a1} + {f6950968-9e46-4586-a206-4efb00be7a99} - {43b98517-47d9-41a3-af9e-102117550ec9} + {1027505c-a333-4512-87ed-5f4ce64a79f1} - {1f55b5c3-bfef-4979-9090-f1a8e9785c7a} + {8f39ce35-6cd7-4737-af4b-4adc8255e7c7} - {19b4fe53-affd-4e71-91c9-894a3e595100} + {70bd49af-ac23-48d5-9cf9-a91ccd084308} - {797a14c1-6ce9-4547-a7ac-74d0c48388dc} + {4f77dfbf-22ee-42b5-a309-e74e72dfa876} - {97b66a71-ab34-4947-9748-2703c30d9f6d} + {5eebf7f3-5230-4b59-882a-dfe2477213bb} - {e70bb686-39af-4e89-8a6f-250a15a0ad22} + {bbef2e0a-dad3-493d-8e50-e3b2866a6857} - {32535b3a-d499-4d3d-b96f-ed6c86d3f6fc} + {7a99e051-8cff-44cc-8e9a-fc0615db6302} - {d274e078-3dfb-4e99-8ffa-eee70d4bcf72} + {1f149ba6-be31-4428-b35f-80b3407b1396} - {8f7f5e5d-e327-419f-9e6b-9e61f8add4df} + {7f3461fd-77bf-4d95-a19e-fa4831514f33} - {3b43a601-c237-40f4-a367-966fa288cc44} + {b587df56-067c-47f5-a872-11e75f195953} - {2ca2eb4d-307a-4ecf-9b40-0bbfd58a2c29} + {048af30d-c20f-4bcf-be44-c532835eefe6} - {c5a69fda-acef-4416-8525-4a5693055bc6} + {08f3c718-0933-4bf5-98aa-f2af2c9a2a22} - {d6500df3-63cb-4e4a-806c-3b1b0420280d} + {b6d4e0c9-cd4a-4d94-b92c-9757146ccf18} - {f2346e59-f47d-4448-befa-5999a7d469b9} + {c2e7b43a-31e1-40e3-89eb-aa09bad61e6d} - {7572fda5-b8db-415b-adaa-230cde24e713} + {620d87eb-88a6-4f5c-af10-e8cbf8df2a8e} - {d09f2db1-405a-425f-9b1c-05fabbd667ce} + {46b8d0af-829e-4967-9655-f28d12068e00} - {52e8cfa5-1a02-4cee-af4b-dc8e6a7ed045} + {3bcb81a7-b2bc-434c-a960-401be1ffd465} - {bcc19506-deab-4406-9e46-50a979cb90d0} + {b3ee4944-1a30-4394-8e53-7a320c03183c} - {2d1115a9-89b4-4cae-9c55-bfb3e0caaf44} + {65055654-4761-4186-aeee-17bb7e281a7e} - {9e42bd3d-9c5e-40b8-b74a-338a46bae704} + {22e23ef4-1172-457e-928f-df3031e4ac51} - {08e9db47-3e86-4dc5-86d3-1a560376bf3e} + {eb1506e6-d543-4e96-b633-e1032f5ffc4a} - {6ef60503-9cbc-4b12-930b-5e3066623b3f} + {404f525c-20c0-48cd-a89b-72617bc7b2d6} - {0460f319-4b2d-4636-9caa-5b2debb1d147} + {3f49b8b8-1402-434c-8b6e-629e3935e6d2} - {6101a1ac-294e-4914-b965-724911827fc3} + {9cd69f59-892e-464c-8e4e-ada50837f29a} - {ad805cda-8225-4599-8c2d-6a9a1fe63130} + {e4b36a14-c5f5-4cdd-be6e-d94fd809a05c} - {2050b2dd-c208-42bf-bb84-82db27958da1} + {4a2824d5-2d7d-4845-a174-2c716d48f05a} - {ede015a0-e0e4-401e-8888-489439d3af5b} + {bccf2855-5ea1-4d38-bcd0-05675fbf57f2} - {7f701832-eff5-41a4-860e-babac7a9ff45} + {1d674091-6a7b-40d2-86c2-3a451521f1b7} - {9a083e00-5360-4fbf-9c36-f6370e2957fa} + {cc37fd80-6d2a-4284-a762-1acae434b2d2} - {a0d7018f-7b0c-48ad-b110-91b6cdfd8339} + {3337eac9-b818-4635-87de-2b2d38b24a37} - {49694cce-9502-4366-bf2e-70d027e10474} + {d81f4088-078f-4c96-b336-e24b8a11aace} - {28c72147-cb61-4221-adad-d9b485b7d113} + {f2cdb6a5-2152-4e71-86af-4102d9c0e093} diff --git a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters index afb4b6beb..10e49e875 100644 --- a/Foundation/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {0a1f3d58-f5dc-45c5-9497-4a48873f6203} + {9145e030-74ee-4b14-8cff-1f859c30f1be} - {7ba50222-a0f4-4679-8954-65278f61f7f3} + {e369a1b4-f2d2-4607-8540-27f72cf3e874} - {f4d6166b-e4a4-41ae-9416-a01dea80781c} + {5dbcaf63-8ba7-4464-88ab-1de898171167} - {f15dd775-2bd9-43cc-a53f-a8749d15360a} + {3df5d6ee-bdf9-4411-ad82-b2fbfe6d333e} - {03a36a8d-e525-4cd6-9d44-4874f7ea8630} + {82710ac0-ea21-46c5-8956-b0d4227fe93f} - {dd4d9c40-c630-47f4-b9b8-e94337ed1272} + {563cf3f3-4223-4c1d-b7ed-9d74bc58693c} - {bbe2dbbf-61c6-4fc5-941d-16b430ce03ed} + {812ed74f-9dc2-4b9c-a7f3-11560b3b55de} - {1f5a03dc-ad5b-4780-8601-27dc76bb649d} + {34dda8f6-b75e-45ae-a312-ad17168f2e29} - {cd9dadba-04a7-40df-bd2c-2d0854d67736} + {496ab01d-8075-4e74-aa85-c9ffb94b172e} - {da4ed5d5-fae1-4fa3-9350-d50dde6276c9} + {7a0068fc-8e9c-4a65-8f48-fabd23b4e2ba} - {d3b48d28-8ae8-49e9-b14f-e2e44d6aecfb} + {50492a78-80f0-4c18-8707-57ca37a65315} - {37b2bee1-c954-438f-9897-86e05318d284} + {9a96f036-9b4b-484c-9f26-864c2e022926} - {b560ad37-5e1f-49a8-b380-42fed1a618a3} + {078088ca-6e14-4624-a028-45c6cc6c000a} - {0e709e9f-5b9b-4387-892d-22b4f15221a0} + {8f508dd9-f6b1-450d-a6cf-f1a539e9df7d} - {4442f0a6-8e47-4d86-b312-a96a45d45f9a} + {a794972f-98d7-4413-a7ef-9a2cfe988a76} - {5b77a06c-1e45-4d3e-9a71-76d78c1f5627} + {4bc59ab1-a988-456b-95ce-871798b16e58} - {5dc89e53-f2d7-4696-bc05-68b2f35220d1} + {242cc01b-ba6f-49b6-9317-bf617f8054e3} - {a9ed2872-19bd-49a2-b4eb-417d7f504898} + {f71b9732-fe47-4119-8e4f-a63b996ea98a} - {e89ad3b3-fffe-42f7-98ca-f7b3a4d23d96} + {94783ad5-1485-4ab2-bf86-ce0b4cefc8be} - {b12e727d-d0ec-4779-9a94-d050fd98e3ce} + {729c4e5c-d509-44a0-a59a-189c8619b972} - {8eb86132-af76-4b92-ab73-230ad32d94e3} + {fd1d526a-3810-42da-97db-e1d1949eb5f1} - {6612bdb7-0e4d-4056-ada6-fcfc9b2dc3c9} + {216846f8-d873-4ae1-b217-ec2028302cd4} - {0b69f933-eb54-4d6d-aca8-129bd18b9571} + {f21bb108-0df2-4e14-bb6e-940f764a060e} - {5e593fa9-c7ad-4316-ac9a-90b67694c2b5} + {90cf6dd5-d5ca-433a-9703-ced1f0bf2dc2} - {64825823-9e55-41e1-b847-fc3df6e344ae} + {4299e404-4af6-403d-b96c-1db664729097} - {38416cf3-a9a7-4116-9df9-80e5959ea465} + {a18fee57-2a8e-493b-92a3-6c9e2a35ea5f} - {13280882-740e-4225-89a4-b6e74e048cc9} + {a7a59d77-094c-4f30-9935-046d60dc1da5} - {449b40d7-18c2-405d-8706-d55b021e8d90} + {88b0d189-cdca-4c3b-adf4-f5b1d75eebfd} - {c942022b-27e2-4986-919e-1e4d1a59c345} + {4c587907-b143-4991-acae-e4d8ccf94567} - {e8016a68-a509-4baa-98a9-6f0176b4c1f1} + {a67ee935-4bc4-481a-b032-ffd7179fab2b} - {1e961483-f373-44b7-9c56-b6a22cc21898} + {98632c80-5fae-477c-81fd-6a68cb809e5f} - {d5876e5a-ea2b-48ab-abb8-f04a62b94a44} + {e98a2283-7df3-4ebd-88d1-a338dcc4fab8} - {2c59dd03-3ec1-4ca1-980a-acf7c1d2c38f} + {680058e0-03c8-4ae8-b801-8825bdf13228} - {44766935-edf4-40fc-bebb-c1d09f5f4a89} + {81e3aa02-bd4c-49b0-a97e-f498ee997d7a} - {c7be408b-a92f-41b6-9cbd-7736d3d16a49} + {9fff7c7c-7b32-4578-9c15-75e83bce1fb7} - {7526dafb-75ac-4b9a-acb3-df9a408a3636} + {f0e60d94-aea1-449c-a9a7-6505415c7562} - {3622f1f5-f0c9-47f4-b163-6e2179a2d3b2} + {76c18a41-3849-418c-906e-1294a1de2dc2} - {3ca44f26-0701-43b7-a339-ec12214077a9} + {83a415a7-516f-4868-a036-35d39ca02544} - {c702836b-1c6c-4b89-8e6c-138fd3283c7f} + {bd789982-2f96-44fb-b639-63d17c3a510c} - {40c838e1-0ae2-4adc-8677-536228456a09} + {b9b185a4-8725-42e2-ac79-45d96247159f} - {dd9f36db-88c7-4b34-b2ed-2183050f9083} + {4e7be9e3-5399-4c12-8fec-c9e8663fa22f} - {04682295-ce33-4292-9991-ab8debcd83ff} + {ac8d94cb-8a07-468c-a01e-1d9cc4f50b79} - {fb9ca310-be35-46af-89c5-c2a2445e7632} + {a4b1f153-5573-468f-bc74-6a4cb500b677} - {b53dc06f-365a-4016-b6f2-685fda95dcba} + {049261d9-615d-47c2-8581-32e08238ed8d} - {1bdeaa00-02bf-4c4c-aff9-baab9d197998} + {bac7569c-b521-4679-9366-bd87165e9d41} - {b0ce17da-ec4d-4119-9bc1-9c077f0e153e} + {b70c6a25-f41b-4354-ba75-80575fa2073f} - {f97b2051-8dc5-40de-acfc-b0dbd21acde0} + {679f56d1-33dd-49fe-b09b-3aa32b778f22} - {9d4f9a05-3ac2-4dd3-b7f2-43619cc97051} + {eafbbf46-11d6-4850-a3fd-f7bb3cec70c9} - {3f93214b-bcc4-487b-af32-65d2a30f9633} + {709ea734-1f54-4726-b77c-f0dc91105ec6} - {cc1c6506-54e3-46fd-b1e2-4935b4e3b16c} + {e4327932-d5b2-4c2a-9154-65784f6fed9d} - {fa5d17e7-3871-4048-a668-1f3b8d588278} + {5eeabc19-d212-4f1d-81ee-516389d54058} - {fe769d9b-f3b0-44b7-91f0-fab1d46f9dff} + {2661d4d0-a519-4440-aa12-2523a839f64b} - {9d5f9976-9a2a-4edc-85e6-7f7449e5f2a4} + {93f6ccf4-c432-4efa-bccf-4e3185242191} - {928a24a1-0e7e-4098-97eb-e4ee5012a1b5} + {b29bdabf-46f5-4bce-9451-a15062e9ad4f} - {8944a75c-a1e4-4b03-b27d-56a5095329c4} + {e43da0d4-7cdd-4110-b6e1-1f158c5c12d2} - {13fc83bc-de9d-4a22-9d06-f999f2756262} + {4155043a-6ed8-45f2-b62c-5c489649fcf6} - {5a48129c-31b2-4194-b6fa-02ce22431521} + {c3335815-4077-4fd3-92ff-bc8fee9f9460} - {502fd4c9-68c9-46fc-b8b4-cefe0471d3ac} + {e5fde59f-2a8b-4738-b5a5-c4c2be15acb7} - {86d41af9-508f-42ab-b820-2780da6cd5f7} + {830d2ec5-2a75-4b12-80c5-e0c3f7a7a2ad} diff --git a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters index 1f1eae81f..0016d5ee3 100644 --- a/Foundation/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {b506bef7-a643-42d5-9fb1-52137f46deec} + {e0db1c58-c718-45a9-9aaa-53c0dcf2538e} - {99e8141a-07db-4528-959c-12b8624d4172} + {f7f280df-75ee-4674-a4e7-367e00e1c392} - {fa6efab0-e265-4b50-a118-ef600ea2ffcd} + {87357271-f9b8-4c7d-a5eb-ae34f2dade71} - {7dc55c74-8a1f-454a-bf8f-76d725b726dd} + {34495c6f-9466-4bf9-8e6a-67d25ce67bcc} - {6bb00ad5-910b-427c-b90e-07f967b10d74} + {34833ac5-a2db-443f-9006-cf898fec063a} - {fdc274b2-c052-48a7-8b0d-2c47b7a8d1c5} + {b44d328e-2ff4-4759-92e1-81023b88c9cb} - {692ef541-4e6d-4740-8658-93b169b7fa3d} + {d6862cbb-093b-4c31-b723-cbe1e9f3f7b6} - {71a16f3e-83e6-4783-804c-ad88f8bb39c5} + {2aa101c6-dd3e-4974-ae30-8d8b2e94b3f9} - {82a87c17-a04c-456a-8967-893c3dd03ea0} + {f83de9a8-b664-4671-8b72-f055f59256d3} - {d69fbd66-4cef-4bf0-a28c-a3413e0cd89a} + {7e055694-167b-4243-bbcc-d36967ad7f7e} - {4eef756e-66a9-437d-bad7-2a3d3fe1a91b} + {55426702-53f0-43d4-bdca-17697bfc8402} - {d852cfd8-3841-47a6-8305-2617e2fcf2b9} + {674626a0-1a5d-4489-be10-fe508fafda9d} - {c037626f-30f4-48ec-befa-fcb41f0c5a8e} + {a40bbe2e-15a9-40ac-b57f-d38bcbaac8cb} - {bea1a31f-898c-47e5-8f95-14670beaa93e} + {98daf841-2d51-4ad2-9830-66838ec41c08} - {e8d7195e-bf6d-4e72-bc3c-016c1b6972ff} + {340222f4-00f1-4a00-ad72-a0704ab96ab0} - {468f2b15-29cd-43e2-a434-1be911dc6acb} + {cc98b00b-dbd1-4ee5-911c-1ef511ee874d} - {83fc76c1-f457-4704-ac86-39926dae65fa} + {45dbf909-ec1c-4bff-9bdc-d2de3450b927} - {68cbc6d8-33b6-4099-85cc-df1b982fe1c7} + {b5a353f4-7dfd-4dba-96a4-bf65337f32e7} - {cc24d583-c6b2-4797-a687-ff2fd253797a} + {d0f6492b-e2bb-4008-979d-cf1be726ad48} - {8c74d653-02e0-43b7-ba55-3a240ce2fe55} + {473c134f-86bf-4f20-946c-8e70946954d2} - {24b4002f-0ca0-4aa9-a7da-d593bef6df79} + {dcd57e1b-d0b6-4ca8-b554-0c5520168e90} - {da1a582d-59b6-436e-8e7f-00837d8d4cd8} + {d437a84b-80c3-497c-95ca-64e94ae34c34} - {a779ae61-18a2-47d8-9401-99a4c5206b63} + {39e71bf1-c718-444f-9788-a69ea76feb4c} - {cd76daaf-6a76-4268-bd22-13ce6c07b64c} + {3865149b-ab00-4ae1-acc9-63626898f898} - {8038e90f-0243-4bca-a74a-c214bbcc482b} + {d2d1e4a6-e000-4b36-859a-bced4ee092bc} - {10526fb9-22c2-45e1-b567-f08a25a10066} + {3146ff3d-6728-4589-963e-bf8e231fedfd} - {fca673e5-2875-4020-b11c-02ee116df827} + {1180b8a9-a718-4505-817c-ec316d693ce5} - {6e1d5620-e9ee-42d8-b5d3-a16316924b85} + {0865c7f8-4f9f-4214-989d-60b4260ce142} - {1137a1ea-ebe5-4dd2-bcea-a1b1a774ae10} + {1331cab6-de0c-42dc-a349-436930485d43} - {7f39f19d-e0af-4d38-a7a6-9934dd9c6c5f} + {83e6714b-e0f7-461a-92ea-42d73f7305e3} - {46bda533-0785-441b-9868-3ab1b99fa1d2} + {bc71cbb8-09c7-4697-95cf-b70c10fdb497} - {9ce5274f-4385-471a-8944-6f1ed7bc4dbd} + {ec7319e2-cfc6-42b6-ba54-c0b3574e4df8} - {76997b5f-8b30-41f4-b190-cf9cef1da30b} + {8aac9afa-4a47-4adf-a415-d6f65a596e96} - {1bd86da6-704c-4db6-a6ce-02fe8fb08dc0} + {69880c5c-8dcf-40cc-8ace-17db051b48dc} - {a3ab620d-df81-4180-a7b3-b7cb15558048} + {586fff8e-68a5-46ff-87d7-9fe3af910534} - {973a8717-58fa-48ef-8b64-368e63b37ed7} + {ffbc9607-71ac-4b87-bf0a-70bb46539564} - {b3276ff5-0c21-4d16-b7da-e7f88d166cb5} + {f7ad299b-7a1d-467e-9dec-d07089c6fca4} - {b959df4e-5cbc-40b2-821f-8d5a3667ddde} + {5c5db012-0bb5-49bd-9d4e-fa574f4937ca} - {944024a6-75d9-45b0-9d51-b673acda6a52} + {0d6d2790-c11c-4d8c-a3e7-50f00a2ab250} - {b0cef2cb-b130-46f5-8e50-e96cc0af7e73} + {fe8bd0b1-1db6-47f7-80be-b4fcfe1751a8} - {d9c84ab2-f451-47d3-874d-b4a792100244} + {9ac57b21-455c-4dfa-8a7b-6f97ce0f3430} - {25b879ef-13c9-468e-ab24-eaa676f720cd} + {7daff24b-bcd7-4b68-9a64-25143d5f16c8} - {c6289add-13a0-4d44-8fc0-cece34551f7c} + {3aef01bb-5d49-44e1-852d-b2294e743984} - {8011523a-4687-46b2-815e-9320aeb9dfc6} + {17d1986d-c465-4658-93b9-0b4e077330aa} - {0e122859-de37-48dc-ad30-b6be34421eea} + {72239c58-a13c-48f9-aaf1-9a67931b93a9} - {d3f74b4c-fdff-41a4-a4bd-e60908878e33} + {904ddc09-7cf6-4f68-bb59-a8a527e68e15} - {b3a6fd53-0a24-4160-b8ab-e58592b99ecd} + {4f3b4392-bc6c-49a8-b9b4-7cac9fb5ee3a} - {0da8c5a8-f71a-4467-a7a3-2f88f2ab7106} + {5628804b-450a-4155-84ef-08f57f0e9733} - {cedd303d-3364-43ea-b788-8f76b31937af} + {eca97463-3184-4b76-ab6a-0a2c4f072fac} - {ed3d0901-7adf-4e1d-8d83-ac55537d6a57} + {c61d1873-7bc6-4483-9ac2-8fce90725bab} - {e13b28c5-42d5-45a5-9a78-1c57624f6ca5} + {241c96b7-3b56-4174-a003-cccbdbdbdb9c} - {2c7a8d6e-4d66-46cb-8185-b196997f838a} + {f407c71f-6299-497b-bb25-fb733ee08e4f} - {64a09b88-5b15-4efc-9f54-d5c11184d76c} + {3b820e33-58a9-4872-a3ed-28b39f4105fb} - {c281b48c-64d8-4fcc-9856-38de9db7d731} + {7d597bc2-0441-471b-9249-aaa29d08dfd6} - {4a8cd211-a775-48f3-90db-353ac054c491} + {143135d5-bc5c-49d7-b74f-6c7daf162f35} - {cfb341d2-23b9-43e7-be44-53aaaccb842e} + {a8a27227-5119-4fdd-9b7f-5bff7fae4f56} - {7acaacce-3ac9-4ee2-b0b1-7490717851d2} + {dd1d3019-0d12-4db5-8d09-8cafbbd70db9} - {fdf038ab-4c24-40b0-8db0-412bb66fafa5} + {5170d983-0f59-4372-9303-338d7fbb21c7} - {0c9d16ad-7a5a-472e-94c7-a17989684baa} + {cc0e763e-f785-4032-8041-2649ab7cdab4} diff --git a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters index 88566ee01..5aaa61c58 100644 --- a/Foundation/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,181 +2,181 @@ - {3793e3d7-5240-403a-bc3c-2129b011b3ce} + {11d9563e-1998-4f50-9b13-6abc1e64aa44} - {2bbb98b9-3a9d-4ab3-8e8d-8a551d153bd7} + {3f2439a5-55a6-4abd-a7fd-347ff5a35b92} - {8aaa8fa4-2a37-4ec1-b332-bdee375f6bb8} + {4a5773a2-359b-49b4-9cde-73df65a0d97d} - {70157508-bc70-4321-9333-f9a3418f42fe} + {158105d9-f548-47bb-b527-e108e7a82819} - {d7f0888e-caf9-43b5-a6db-dcc412414f32} + {e7b05124-9af6-4c5b-8677-a6a1b8f4bc8c} - {108fdc8d-81f5-4b0d-bb89-2f8964285002} + {bc9fdec7-3413-4931-9535-735cd27e55b4} - {1cd76d00-f9fd-40a8-b980-30d70fbcda4e} + {9cd2484f-1c4c-42f9-a695-4ae4a4c77085} - {570ecc21-dedf-41a1-91e4-2457d16a19e5} + {2df901f7-95c1-416d-bf47-d88a3c1b7a3d} - {e3a0ede0-0f75-4289-9945-81d0a22b1ea5} + {990ba745-ad15-43c5-b8cb-0893b0cdd6c4} - {22db7300-3c9a-46b3-9844-e11064ecc561} + {0a930963-1e2c-4def-bec6-c314c5cb5b2b} - {303739d2-c19c-45b4-928b-23ded1aa016a} + {be0d653f-03c6-45ff-91f3-16c463078096} - {e6e471b0-51b2-46bb-9adc-2f3bad53e3e6} + {2f777f6e-f270-457e-81a2-783b4a3ac4a9} - {0659a1ce-e384-447c-a2a3-8f8f1452c2fe} + {08359dd6-c17e-436d-b062-de1f36056435} - {4647598d-cc76-4f83-83e4-266f20337762} + {8ed1c9bd-a10b-466f-9a06-5c5a27cdcd24} - {27cc0789-cce9-45fd-a9c8-c30ac5c49fef} + {5d487fb1-a577-4e10-9181-c05c99806c97} - {5d913151-d7d0-43f1-9cba-008b6bdb11ea} + {ab23eeb4-5acb-4dfc-89b9-7a519d1562b7} - {4b26cccf-7ef2-42bc-b2b9-3550e7a81dc0} + {d521c354-d3a6-4a94-b853-303180cb0846} - {1a522d82-ea73-4ac8-8e9f-a4f4baa67a79} + {a4c309aa-f288-43b4-ac68-296b86d6d3ba} - {f5fcb110-19ee-44dc-ad2f-abaeb13c6844} + {483829db-4795-4b2e-9977-128c4535b54f} - {dbbca66d-09fa-4cf9-a9e9-2b33f3f16d1e} + {30400e54-48d4-4e4a-86e6-2dab2532e609} - {e6706e39-212e-4d8a-8745-f188affad19f} + {6285238a-861d-40df-b371-834fa683d3b4} - {9fce1db1-e614-4ed6-a189-0ca8ee4c16e9} + {7676e28a-30b8-4fff-a151-2f7bb98ada5b} - {451b4833-6ba0-430d-9516-9998fec7ab63} + {0a05a1ea-df8e-4a51-b6ff-c986f441a536} - {acf93f99-371a-4e7d-ab14-570741bbfbcd} + {a990bec6-c01a-41d7-a8e9-f965149e5ed3} - {b9cd701d-f66f-415b-acf7-133167476b34} + {b6f67230-559a-48ff-8968-e930f3b81c85} - {9dd16842-e86c-4523-a41a-669bbf187cb5} + {781cf045-8d3b-4531-81be-f670e58f07c3} - {fd739745-8b83-4ff1-bc40-4cbc2f04fb53} + {4b1aa233-c4b9-4c3a-a0bb-2fa2fcc2c843} - {e029a313-3061-4c8b-a968-d7450de9b303} + {ed820c34-017a-4c98-bfcd-96d895794c21} - {1f63a88d-1ad6-47f9-8372-521b486119de} + {0ea5adcc-c5de-438a-aaa6-ab264def4ae1} - {e9aef273-4db0-40f9-82a9-34d0ca109281} + {74467bc5-4e35-41ac-ae1c-523968cd98f8} - {77720d31-41e5-477e-87da-4448501e3cce} + {19c3a2aa-ca2f-41c4-b1b4-82c4c7bd8960} - {78916e7f-11e4-4b09-b278-ab0f4969379f} + {32ebef6d-e7b4-47cd-9505-0da41c705537} - {55dcdfe6-df47-42e7-8ad6-2cd9a778c1ff} + {e5979240-8a4b-434e-8acf-3a7136fd7aef} - {a9ff0fc9-d1b7-4afe-bc44-02036926e51f} + {a05b83d5-0a35-4958-bdce-759961d1a25b} - {af2067ea-83ae-45b7-a90a-5f412814fb01} + {944caf0e-d966-4961-a52d-4fa7ed17010b} - {01a9fb65-1bb2-4953-949f-54dad30375ee} + {cde4efd5-afb3-4d73-8d6d-2b9823e0efdc} - {4999a905-9021-49f6-95a0-bb96c9c3cfaa} + {7a696adb-faf4-417e-b588-5654c11662e7} - {5d137f52-24ce-4756-a151-5bde26714414} + {92edbed6-508a-4d2a-868b-8686a4a799a4} - {4fa8b1e3-3bb7-4218-8363-50708ce6103a} + {5262fe81-2204-48c6-918e-eadfa658a1bd} - {a49548a4-0df2-4652-ab88-2e3912ecc041} + {c773eac6-b4bc-4366-971b-7714fc959b9b} - {4b24df3e-5680-46e4-8aa8-d61d6a9251e8} + {b1c0e225-d691-4f2e-8f9b-f5c0722b584e} - {2b679529-71b6-4a1c-95e2-0419fe182071} + {0e100a1e-f7ad-4956-bfe7-b6edb3aebc87} - {efd502fa-cd1f-4144-9cf7-2573877b9415} + {9782889a-72a7-4254-a763-a7f402f33c80} - {0b6c1dd8-df51-4b22-8804-474ededab513} + {cbee34e9-2f84-40c6-9fe6-9e3c06386c44} - {23c8d4cd-f19c-4014-a2ed-6002c23816c4} + {856c89c6-ecd9-405f-a27f-d1849d53a2ca} - {bedb3bd4-fcb3-4906-a8e3-10884d30a8ad} + {4b20d714-50b9-4b8b-8dfc-bf3d77eedd09} - {34ee3e9b-0f33-4328-85b5-550f80a7eba7} + {f74b76d9-d678-4570-93ae-cf562b440727} - {891b28fc-3da9-470b-a857-323abfbbf8a2} + {67a4d599-614a-4d30-b5f2-0beb77e26d54} - {476d4b98-c393-4391-af80-8bef5832c42d} + {90914a9b-eba0-45f2-b353-0c589659765e} - {eb044bb7-8547-4265-a0b0-8245413e1dc3} + {78bbb83d-fa32-47b5-ae05-299214a6ed8f} - {2af2655b-594b-4329-b826-02ccc0c504eb} + {774cbde8-0c0f-4ed1-8254-c02c43237fac} - {abe9dbb0-aa3c-435c-85e8-8ff991b26680} + {5e17d7d2-67cf-43e6-9b2e-ecfca0047024} - {5faa6512-9855-4c2a-8b60-ffd7bb279714} + {468df2f6-57f1-4020-853d-72e6b801873a} - {e4140e91-ad5c-462a-a45e-8491486b323a} + {4590adaf-d64a-4672-9a6d-48ced8015a7e} - {7ef1a62f-3019-48b3-af7c-034302d69cbc} + {e5812581-2438-453b-b46d-05e9deb59cae} - {000b6db1-6b39-4924-91a7-6c9b44e2cee4} + {2a7c237d-3789-4bfd-b95a-3a0b19bb03e8} - {a7e7d316-ebda-4c4a-8c6e-5cfec8ca1099} + {be710429-b0ac-452d-8e2f-e58b7d5e13e7} - {4d3c294e-3b0c-4c17-bc10-48042c865946} + {f4da122d-5095-4df9-a49e-61dba85e5e45} - {cfec33e4-348a-415e-b6a1-c855c137a799} + {27420474-c48e-427a-a0f6-643c079d6e9e} diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj index 687ca2e34..8826b0f45 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj @@ -201,7 +201,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters index 8e4cc807e..ef31dbb21 100644 --- a/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,181 +2,181 @@ - {c87821ee-b63c-4371-8eba-a1ca62dafa1c} + {ffe15b9b-e304-4704-86a8-77f5405cadce} - {e7dde6cd-2c80-44fa-b1da-494e7638bfad} + {397ceeb3-6e65-4f1b-87a7-c15c7286a433} - {013e6f89-4e05-4174-8e43-87b8d8514df5} + {d63acb52-2bea-4b6e-94b6-db601ec5f9aa} - {192e3188-6b37-48a7-9eac-b695df6d9660} + {d2b51345-a20f-4930-a3f1-b1089b549ca5} - {a6410f5a-db36-447e-8c40-b7374ac1c213} + {1b0307b0-2f1d-45d1-b327-92c56d0ca237} - {ff30520a-2603-4fda-88f4-3547d5976724} + {aba548e4-cf29-4373-ae6a-ef91eca34fe4} - {051bff1e-d1ea-48a5-83ce-85953ae40c4d} + {f7cffcd3-86a1-4e69-9f65-085456d1d20b} - {423927e1-6ce3-43e2-9b0a-41a20daf7edc} + {ce194346-c9ad-4cad-81d2-908249994f99} - {f4f52084-fdf4-4a2e-b842-15d9d94243ac} + {420d1bf1-2218-46dc-a1a8-c576b87a9885} - {181f8ebe-0621-402b-aab3-caf95863c502} + {61a5af39-1b22-44f5-b9b9-8ae46f832f10} - {3cb8bd8a-88bb-4375-85bb-055ab79864a4} + {87f04f51-783e-4f38-afa1-91594a34e435} - {c925e04a-ef0b-41e8-a713-e092eec74649} + {267d7e38-8663-4e5d-a9b8-c7da4b752f5a} - {984d1f4a-1df6-4da4-a89c-c6b22df5d808} + {a076f51e-3486-4fe6-aa4a-863936a692fb} - {9a83f87c-b33e-48a1-86dd-bdbd28250b43} + {e760d867-d013-4dee-a494-27f790951c68} - {afc32abc-e532-4cac-82de-475008a327fd} + {efc3e6fb-8020-48fe-b3cc-4177f28175e0} - {2ac2c0a1-69d3-48d6-9d5a-963685c99e1f} + {8c1385aa-09aa-42b3-9dbf-ef383fe1efaf} - {972b16a9-0bb0-451c-a99c-04afd36ae192} + {6c3d85a5-439b-4a8e-94fd-77237ad88145} - {8601494d-611c-4429-a831-2cec778ba23b} + {4000dd9f-a7a7-48dc-abdc-29ef0346d042} - {86c0cebb-0973-41f9-9f90-1c7f18a8286d} + {d836d179-96c6-49a7-bd78-0b70a34b704e} - {4285c883-efa9-444a-95d0-62c4dcd26522} + {c4da89b1-7bf8-4f2e-9eb2-c8945ed99ca6} - {75538a34-5634-4488-84cd-947ddbee7bc6} + {88a9697a-a47b-4c67-ac16-97c221a0825b} - {b68b6300-5e60-4163-b4c7-fe933b1d5784} + {5bbca947-cdb2-4703-ab99-0a0d2142ee50} - {dbe09aca-9c89-49a8-a965-cc8d3ba12854} + {1febcb4f-42c8-4d76-97ae-e6024e191ebc} - {bf2a3cd1-bb75-407d-ac9e-c040ece83e05} + {6dbcc639-8418-4f36-a940-24065c04435d} - {3f6d0aa9-2d48-428e-9489-d15ff1ee896b} + {660545b4-2eab-44b4-a1b6-144d59a505d4} - {b67cfd48-7d82-481b-b4d9-269e7eaf5743} + {75439a48-b6a7-4de0-97e5-0792a5acc5fc} - {e75094ef-1762-4b3c-b5a7-13468fe1c884} + {552abd39-ff6b-4942-98b4-9a2ccfa85b24} - {a4d7b758-5079-4e49-817a-b834e9301068} + {4215990e-1ddb-48dd-8424-e1984ea1e350} - {5c295088-4ef3-408e-b432-8df740ec22bd} + {6b6a904c-307a-439d-a474-d03bd4781456} - {01817bb6-4187-4366-bf25-05c4193f05fd} + {bd8928e0-4d72-4118-8789-b817496df12b} - {be0e7135-2253-4020-b989-9c219598e7d9} + {9cb2b869-a28c-4cd7-9a12-018f2ceb4f35} - {9f919090-c953-454e-9187-14067d71d2eb} + {27235d0c-2f82-409b-a9f9-169e75dd8954} - {bbb6844c-04c6-4643-ba0f-efd8558aa863} + {7e57946f-0439-4044-9380-6e263f467678} - {b33a3570-49e0-4d61-9de9-8052d342e664} + {3cbbe9f3-8d95-4b74-859f-d360bd1e2884} - {f928a5d8-cec4-42bb-88df-fb6c6861d9ee} + {a37c36f1-8621-4437-bc47-069a37af8384} - {7fb89501-b404-46d2-be07-d94b94f42f95} + {9c910e1b-291e-4068-87b1-062c060c3846} - {f2685a2b-5e4c-457c-a5aa-cc5ee3ba50eb} + {2792be3f-0e13-4187-846a-87c418063800} - {f6f0187d-8407-4d95-81f7-b00e2028005e} + {0eb8bcd0-51e6-4875-b95f-e82e5c1f16a0} - {52141451-40b5-48ff-9a0d-1425c777ed05} + {01844385-7571-49f5-a169-6636da0f4a6f} - {df2a8e64-1030-4e8e-abfc-6173d8de081d} + {d5356218-8be8-4212-8205-0a32824727cf} - {4bb6114c-969b-4b3a-a3b7-0f824e92d60c} + {ae856ac4-d67e-4830-a0f7-b6a24a2557a0} - {08f0763e-3078-4d4d-a7ec-04e1fb9d09aa} + {2d6736ba-0992-432e-b28c-04e6b7131796} - {28f36fcc-c24e-43c8-8621-36103dda4f58} + {126dca65-d496-4cac-bcd4-85f17169cea7} - {bcf1d3b0-9781-436a-ad7d-d8eb42917ba9} + {99b03aec-b8e3-4770-8839-963a4b1353cc} - {e80e1bde-1ac7-4864-aa14-3f30408e72a7} + {6f2e6227-2d65-421e-ae5a-ccca16607a4b} - {c5dec211-ffb7-4f48-bb62-9d0f6fb3e751} + {1139a56e-1a3a-4dfe-ac94-12a864331a0a} - {d1a7d8c1-2ad4-4c57-84fe-97464e2aafa1} + {38eaaf84-c5bc-4e74-984d-16c3a520ff95} - {93ceca5f-ab01-4df6-b1ae-43ad198e541e} + {2bc6065f-4e1b-4c92-a454-c7236689cb3c} - {87c8bba2-e1a7-4461-84ac-b092e8a9768c} + {353d7b5c-f8d4-4fe9-92ed-df3dc1757b3c} - {0e5857e4-3905-452a-bc62-0c2034604442} + {fe28726b-eb8a-4c1c-8146-b9febe3ba642} - {f040f3bc-2c84-4693-b2f2-acc097df6a2a} + {62a6b960-23ff-4359-b779-1f01a3014545} - {a0c17a07-b058-41e6-b202-063df1d2b8ed} + {473dae01-d774-4d85-a2bf-0b9e50358a52} - {e17a01f0-04d6-42a9-a3e2-cd5a94fba6a3} + {c5e64013-4018-4bcb-8d1a-2bc1d5097c35} - {1e656d6f-e869-4c6e-a18f-6593af549404} + {5bb7eb07-b07c-42f7-a114-7b9173f8fdcd} - {f0d0abe3-6bde-4144-8bae-22476503ad96} + {f607a092-edd7-4a72-96fd-b293d342964e} - {2a713f89-6631-4ebb-8794-6a7908bc4ec5} + {ce54d0ef-aa30-4f9e-b6f9-aa4e22a3b49b} - {3022e674-357d-40a3-aa5a-cb22b5d0a6b5} + {7e6eb3ff-249f-4932-a93e-50246a9a806c} - {91702298-3cd9-45f0-a77c-05a2b56cef0b} + {23c35674-27b3-4ec9-8303-178fe73cff4d} - {7e36cdde-ec82-4dc0-ac4c-d8924188ab5d} + {8f30723f-a5af-4da7-ba38-a862345ffab7} diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj index 4de381790..2a079fc84 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj @@ -211,7 +211,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters index b887cf9fc..24ca3aaf5 100644 --- a/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,181 +2,181 @@ - {7983d238-ebfb-4404-b5fb-7c1af35405b8} + {9412fde5-d304-47f9-90da-0a8ca84430c2} - {263f6be5-e11d-473d-bdc8-dbe9dbc66d35} + {2360583d-434e-479c-93c2-d748bca012a8} - {afe16a72-3ab3-48fc-b103-b84e6c834bdb} + {01c4af09-0553-40b5-80c9-fc2adbf98737} - {7682199c-b1ca-43b4-879b-df8c12ae5f4c} + {bcf1f59f-2eac-4cb2-a9af-2356168dbf3a} - {c1fa2116-4415-410a-bb07-08b3396c206a} + {15363195-4c91-43cb-8fc6-bfc57b1712fb} - {e9fce279-8460-455d-9191-50d1d678597d} + {65299315-96ce-4810-9ee9-53ad93ef6ae4} - {26290351-e93a-4a5c-b83b-ca25061f7156} + {47165a0d-d0d1-476e-bc97-bc7c2e60661e} - {024ffcea-cf00-480e-9691-04ecc408c61a} + {fd36b5ce-f3fa-4462-8514-60e54fb69bb7} - {a3ed55ef-ee22-4635-96aa-592b934aac5f} + {1db4b5a6-0b3c-4b63-a2a4-6bfe1a7bded3} - {d075c1a3-e0eb-4f6a-93aa-7f25c1ebad1a} + {f292af0d-7e97-41ce-a683-89ccdf4bb97d} - {43ac3265-9d52-446e-8548-ee76c6fda812} + {51386180-b7ea-4895-8189-77213ea7614c} - {0330a5f9-726e-41cd-b6fc-0bdfb74fa09c} + {f11138fb-1d45-48be-b43c-984c0419517c} - {7704d95a-368f-46af-95d4-4cd5e61e5f96} + {f7bcc1c3-84d0-4cd5-93ef-18611b297def} - {49624e71-e393-4e53-b120-21682098affe} + {bdc2b88a-934a-4119-89d3-768a51d5eefa} - {a7f0d70a-f232-4c49-b82e-13cac2dabb58} + {6ae5044f-5795-477c-89f9-fb5956da2f4e} - {d389084a-2f86-4082-b5f0-c59679dfbbdf} + {3ecf979f-8ead-4d2d-8ee6-df29c0651e5c} - {2cfb96b8-47a4-49d2-b1f8-15d42cd422c0} + {2ae6b827-0d35-42ba-aebe-b469a68b2161} - {a3533e53-2286-4e2a-ae38-ee2330e64861} + {89de37f7-eab9-435e-8a5a-8eef0282d143} - {f70b6739-5d1a-4726-b836-a9a490150e27} + {331962f0-93ca-42da-9785-d206ae5952f8} - {483137d2-dd8d-497b-b830-fef4fab057df} + {feda6df2-c5c2-4609-8482-d14d6c9d5a5d} - {97f7695a-b310-49f4-bd1f-0ea0354df4fe} + {2805e9da-c2f2-47a1-a674-827b80630ee1} - {0c611d98-fb86-48ff-a74d-35cf3ce0b17a} + {d0affcf9-3d49-4417-9743-4e9714bcce61} - {46ea0d8c-54f1-4fa7-a212-cdf700c6f060} + {ea136f21-a33d-4e13-970d-b8262fbcce58} - {58a5aecc-4b4f-4e9c-bff5-e8e212794a6a} + {4e487fb8-85c9-4f26-8acf-b524e0a04017} - {949eec30-e704-4ba7-a3a1-318c9ad65fb3} + {14f92843-c06d-431c-bfe2-63461e4ef12e} - {1d92ada3-80f9-4af8-bebd-f8d038ce2ea2} + {12231d57-673c-41c3-85bc-b9d57311226c} - {789140da-7849-493f-a097-3f482b55b867} + {f58157e9-f762-475b-a97c-7dbf4637a5fd} - {046c9a4e-242c-46cc-9156-4e06c6d08671} + {6b3e742a-234d-4133-9b12-6423dc2614b9} - {0f8a0a0b-71dd-400a-8175-c64d7a2b0fa0} + {07d5c5ac-2e0b-44af-88f6-401b6c818bdb} - {c527c5ba-9c69-427c-a5c2-081588a1cdc3} + {05a88781-66b9-4da0-a49b-7bfbf1253805} - {4818c497-ef15-4acb-8fbd-e1ac53545996} + {e5207ba2-ddcc-4535-9869-f2bb27e2ec80} - {31106f4b-8d3b-4878-805f-56b09927fae0} + {010e0659-c06c-47ea-998b-91564966e8bb} - {e6e290d0-4404-4812-9485-267b08c947ea} + {34551c97-8a55-4ad5-9117-c29d084f910f} - {00ae75dd-60d4-46bc-9bec-966719a501ae} + {5b9c1292-bcfc-4eaf-8bfd-2b673f8b5267} - {8b054314-66a7-4a06-8625-13ce3921e1d4} + {9ae19269-9e43-41af-829b-5d111631a78a} - {f0f64d31-6ce5-4281-afee-95d81b77ebc2} + {3e9b43de-7b59-415d-a913-c7de80be34fa} - {5c364521-5bdf-4bf1-8bb6-e1a4da9dee28} + {ef50263d-a73d-43a9-87e6-f9d345cc5c07} - {988113b2-82d8-43c2-8f12-aca6e2b22861} + {386663b6-6ae1-4719-be01-4178ae4e4682} - {d680ff87-acde-4235-81cf-b1e737ca1cda} + {b2a79565-ea4b-40e9-8cdd-1352324b2390} - {523c003e-54f7-4678-a997-bbd11d6679d4} + {be6dbb5c-71fe-4f3a-8a24-179d2b207953} - {db6e6005-afc2-4105-a959-21d87862f09b} + {26633ae1-2c01-4a73-b713-1372ed6b047e} - {6d3dbeb3-4b5a-480a-8a63-5d419625b4f6} + {32445b8f-9154-4aa0-8a3e-c5b5de8192f5} - {fd7c0afd-df24-4682-b161-495b6f15ccaf} + {8cfd12cd-f07e-49de-812c-c9098feec9a8} - {ca94d79c-fdd2-41dc-81a6-e48577b4ff75} + {10f08974-a33f-41af-996a-74277dd06447} - {0419c851-6f81-4f61-bf0e-86efe264f562} + {7dd00883-24ac-43a3-873e-e24183fc103e} - {74a6a73c-aae7-4028-9b64-654c246be072} + {de3fc056-38e5-4f05-8504-f00a55ebf8be} - {c225c5c3-679a-46f0-9b24-86d203f4ce98} + {af265cd6-86f9-4154-a2b3-5fbc8522b03e} - {9ab92957-3c2f-4b75-9b08-c76f537c8c69} + {d09b1992-4be5-4b87-b351-3ea0a616bf88} - {7fa08e13-2e35-4691-9126-2dc6c6d19987} + {7e97ec5c-b50a-459b-822e-1291c55b0200} - {51d7a0c4-9c20-4d85-9fe4-9d522af9470b} + {6705b018-c1fa-458e-ba85-8e16386bc118} - {152f2848-ac5b-4812-9503-299305e54373} + {95be02b4-937a-4786-a4e1-e6fb89c8353d} - {d5894c9e-4e4b-4253-813d-4a2e1fa087dc} + {317871ba-8128-430d-afab-f18a109dd01a} - {aad9e45e-08fe-412e-a570-2cda5e951e12} + {6ef5d50d-d5bd-43aa-a720-f50fe8bc7495} - {4e87b113-5441-4b65-b3c4-48a0939d28dd} + {26e3e5c8-25cd-406b-8946-c500f46aaaa0} - {32099410-1de9-4e4a-8a68-8091b8c3f55c} + {f852a649-2349-443e-960a-3cebdc94b6c0} - {9af01925-7f50-4fc0-80fd-bffa2fb7081b} + {a54ac400-a418-4e94-9445-a4d525667eed} - {f14cb9f0-e3aa-4fa4-82d9-bd48c1b40536} + {d8510d46-961f-4f23-8bd5-ab18bf29ef02} - {45460de7-6ec3-4be6-85ee-4f79cb3dac48} + {7cf58af9-22b1-4c1e-ac4f-d9b438d2c58a} - {b8633361-cc77-409d-93cd-eeb7632858a9} + {05d1100c-0200-4e5a-8364-93ef20528a77} diff --git a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters index 0ef966cde..2496589ab 100644 --- a/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,181 +2,181 @@ - {b2d33ec1-0066-42aa-af27-267523ea786a} + {bc0a6ead-543f-4536-ab8a-8a002267728a} - {e32c7fde-5e9a-45d3-b18a-9f97f07c2b1a} + {fef54279-ce6e-4ffb-8f11-e412eefcd2c2} - {1d9dab13-37c6-4c41-b14c-060e62b61f8a} + {0ac23d0e-9207-423c-9874-f70e1397a47f} - {fe38934c-ec2b-4795-8d0d-80269a0de722} + {5c76f3b1-8707-4b0c-b475-9ba6f60ecf9c} - {cbcc425e-5923-427b-a1bf-e72fdb72de36} + {9280e472-fbd5-4642-99f8-c3a64a8139c4} - {75b8846e-d204-4030-b9d5-a8199990a9f8} + {6990cd59-384c-4eb7-81fb-4b9892c45230} - {f4622449-67be-417c-a0e5-fec1b8ddb69a} + {a163d184-970a-4303-99ce-dc097f5ef8d7} - {c85af245-b5f5-4d3c-be74-41256d4ea38d} + {8b3a07a6-4738-4d0c-9667-a8df1ae525c2} - {fc40045f-19cc-4f05-b671-0806366e8b87} + {5a847e8d-f1a4-4143-b9cf-3346120a4179} - {ce20f2b8-8245-4d3b-b04d-4de267c73bc5} + {2e1c9b0d-bfc3-4712-8a51-085053577255} - {6ab0fce2-cb0c-403d-b928-1b05008382b9} + {565e5c37-8156-4732-86c9-698c1fecf1d4} - {064db034-b29a-49bb-9715-8938caf78734} + {231a014b-cdd7-48a6-805e-d1eff4a628e5} - {ce12a3b5-2116-442d-b845-937e9777f774} + {42e0f83c-c041-4d37-b4a7-2659889e97b9} - {7ba3d7a6-9384-49a4-9b75-c31b966012cc} + {757296a5-99b4-4977-9464-1efcf306c350} - {ea3f3138-5c80-4355-8b06-42f37f8a0cee} + {351fa948-b4d6-416e-b6b7-837013def265} - {1e5c998f-37f5-4e1b-9f45-919dd870437e} + {235c32e3-84a6-4ae4-8d96-79576240e802} - {aeb085bc-f03d-4ecb-b804-e2277a331499} + {cc17c01a-57d3-430f-b242-ff7c0aaf8aef} - {6cad3799-935e-427f-991e-b400cf71455a} + {df41e05f-d84e-4182-8e5f-e2d737258816} - {26c5e29d-5867-493d-b3b8-0136d92bfa22} + {be16fba3-3fb0-4de3-8499-0276c275e7b9} - {37640602-3cfc-4b20-b831-8580dfa5dc4d} + {791b23af-6c9b-4509-ac98-dca8a9f92736} - {2df5e2f7-e67b-4124-a0f7-4c6e70d3bb2b} + {1a559604-0d99-4aea-a68d-f3ebde8efac5} - {6e710200-6a40-42eb-9354-605f62dc76bd} + {44228978-c9b7-4f9f-a5c8-261e62f2e910} - {37f40294-c74e-412b-9c43-5390a652f71a} + {76a90b08-333f-4cbe-accb-cba48b3e143b} - {a82aabe3-2a9e-4a27-bfc4-3d795e8925c3} + {02c93fe2-bba5-4657-b83b-f23e1e699940} - {2b982acc-8f0a-484b-8547-ac763d549a68} + {fabc0c96-8361-4211-bca9-e8574c393238} - {a3b44aec-9595-4313-b384-f45ba774dc3e} + {0b5cf6b2-d477-483e-abeb-d604fedf21ed} - {5aeed7bd-43ed-4429-b91c-0c6c50e7c500} + {ab2040c3-5688-4b6e-9e36-e5b915e8b755} - {8fddd644-356e-40e3-bb42-3f0beda35122} + {9784ef4d-0243-4187-a6f0-21d617c9a06f} - {de6d3f0c-092f-422d-9235-283c5d648b07} + {222f0072-d7a0-4c3e-8b00-75ddfe5f649e} - {66da26cb-aca0-43f0-a957-39dbfd5675a6} + {c85ab88d-f986-4ee4-9e18-cd389a8af7e4} - {242df79d-8b4e-42c1-8440-cf0fd0a03cb1} + {2d11635c-7f7c-4aee-8f03-48923303b0d9} - {dd603c08-891b-41e6-ae05-67e38c3b496f} + {deb0b0fa-cfe2-4f3a-809c-db69e23ed913} - {f13f65ee-7ad6-48a4-ba69-84c1c1965021} + {98d00483-9351-49ae-8f42-cbd50a3ffa0b} - {d1fb0162-6e73-4069-ab4f-a9ed1d8485cf} + {ed28cd32-2205-480d-8a45-77024b20f662} - {13dc51b9-0cb5-4c7e-b605-656db9400f99} + {a1e104e9-4c6e-4d6d-b3d6-7fd9843d8fe6} - {133d62d3-be19-4065-b4bf-8a0ccd29c058} + {4a96a5f2-bbbc-4e77-ab8a-6b20dac32958} - {0146850d-a01d-41c9-95e4-682822edf932} + {a5393a43-ce91-41e0-b21e-827b1c20326a} - {b644d948-f2a3-4baa-bf58-2eb67e2fac17} + {3b7eea0a-0687-445c-8382-c9c1e05e4114} - {6845c358-a605-4e1a-8dab-40d0567cbf82} + {bb5e2a7c-7129-49b8-908d-4ca3018d37e8} - {51b42186-aa5d-4dec-a718-5d7fa83eac9a} + {1021402a-c227-4942-b938-5fe97fe2f10a} - {61330c47-330c-4dca-90cb-b5778b8db461} + {cc924f1e-a198-436a-8ae1-5437828335b4} - {4433f61a-cb80-4a80-9281-542cfa7a6b3d} + {ca5922e9-2498-4325-95db-2c4ea497c2af} - {508a914b-b52c-4293-8170-2f61a483b162} + {7a932a96-020b-45c5-ad85-4b7f04dbdfd3} - {fa7a3c3d-15b7-47f1-8c8f-270fcd40b1f2} + {edd67992-0e59-43a8-8084-79ba88e2a6ce} - {7b793957-8471-4ae5-9b82-9314b197f245} + {08066906-1d43-4272-be76-6c0e3a7c2390} - {fa5cf6dc-dea3-428e-b831-0b91b50a3895} + {566ca74e-d465-4830-9994-9f9bf4ac19a1} - {b81931be-39ea-4fe2-b037-0353fdb6dfda} + {38fcfcd3-f84e-47c6-a276-b9d61701e1bd} - {525dcc61-a74e-40ed-8928-b1e8cbba7570} + {2803e5ce-abf3-426c-8909-d21067e2273a} - {da2ae006-c9bb-49d4-914f-f89ef15fb28d} + {a05f2aea-ba36-43ed-ad31-931963d57068} - {07fce5a6-21dd-4fa6-849f-a184bc4bed4d} + {634a0642-1cd8-4c89-a4db-700e034e6248} - {3ec6203f-8899-4dbe-be93-6277abcf3a08} + {9444e3d3-e856-4143-bbf2-be9808d919e1} - {8899881b-17b0-4c65-9da3-07fe83f66264} + {a6e6dee5-820a-40e7-b2b7-f5deb7f2016f} - {a21e5a8d-8de7-41f6-907e-4fdd427d5cb5} + {686f4e46-03d8-461b-aa07-f5324e5efaab} - {4ebf3f2b-992d-4db6-970c-f52e1c39b969} + {b86f7216-805c-4e2e-97bb-e4a34f225126} - {226dd1b0-36e6-44ea-b908-d3618df573e8} + {91b249f4-af87-49c1-a48c-c39fcb166582} - {0fc0382b-9a72-4b92-980c-d96f8fc345d9} + {d257b180-c8ca-4e35-afce-7a09837b3f94} - {7de3f4da-b59c-4e7a-b6cf-9d1615603019} + {17b13d09-f996-46b0-baab-1879435306e1} - {e1f229c3-27fa-48f0-96c5-4d0bd605f41d} + {5c7e7430-4448-4702-9918-8ec568b9622b} - {c321f482-e3d8-4a85-b3dc-1cc9eb844a0b} + {ea60e083-3261-4dd1-805f-f2dc1ed6d4ea} diff --git a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters index 47692f49a..948a12770 100644 --- a/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,181 +2,181 @@ - {c325d242-318a-44d8-ac40-97cc39e01d09} + {abc548eb-739d-4350-ae64-019a1a2c6110} - {4721e96b-ce18-471e-879d-bb66988f504b} + {12dbe0fd-6571-4a4c-8965-dedd8995f709} - {eaff0b09-5a16-4bac-bc79-18e980540f60} + {8bba4ec0-da46-44bb-b3e9-81e4989b8cc0} - {3e7099eb-736b-4ee6-917a-3858cf47c4cd} + {153f475c-ecc5-4732-a4e6-a7462b49b407} - {e214ceb3-176f-43d9-967d-d86bb0355d8f} + {491582aa-d66f-4657-abb0-550d13b3ba0a} - {be372098-4bd4-4a45-8324-23f1ac416e01} + {f6a055b3-eea7-4615-857c-4f7964173f6f} - {f90b562d-f8e5-4662-84f6-8013dab4ff00} + {26b90b83-f9e6-4fa7-8986-0d9888d8f908} - {c17bd3ce-516a-458e-8572-03d411592d55} + {0b5491c9-6f34-4c96-bf11-ce6f3b58f5aa} - {7ccab392-d4e8-4a79-8f9e-3a9f15c538dc} + {41d63e78-4cd9-4e3d-af55-01b6d115e758} - {65659813-cda0-44ae-8e4c-15c210f16bee} + {5f4efa2c-0629-4b8a-ae3f-60b4b1dfbfe4} - {d533835b-da34-4b59-9dbc-51443447122c} + {7d1a1726-fda3-4e10-84f1-201f3b9dfd42} - {d24e53f6-4fbe-42b3-88f0-c7550ea70380} + {b4dc2212-aa8d-46a5-ac3c-d0c03afe709b} - {1200e29f-582f-42f6-94af-f34ca79c4689} + {f9df55d4-2895-428b-bcfb-abc4c98cb4c2} - {798c8272-6bb2-43d8-862e-e2da94f00c72} + {721afd47-69ba-4d68-a802-20272482bbfb} - {6989cf3b-7d41-42a2-aab5-3aa1dac77108} + {05f98c02-24a5-4363-83a1-b8c71d778dfe} - {6f231349-65e1-4cce-83a6-5eb21f15ec9c} + {eeb7b07c-db3c-480c-b642-d8a5f0e37016} - {571131da-50a4-4dbd-bed3-bad7d2f884a2} + {064523b4-b4a5-42c6-ac41-c87c4a3b398a} - {01b21ce1-9de0-48d7-addf-fd5410f5d580} + {e4ae12b8-667e-4623-88fb-279c31465d87} - {38bbe993-9242-4194-a8d6-8cdec7484a39} + {615a1047-4961-4ea4-a577-955ce827b6fc} - {ffa1d2bf-937b-42b0-bdea-da344a437bb8} + {4bc4a83c-7ecb-42d0-a723-f8703ba477de} - {6a61b636-6e7d-481a-a76c-a7e3b5758397} + {59a70be5-8cb9-4dba-a6cb-7c9d9e594d00} - {2dc5e21b-dafe-4c87-b024-0bde33ccd35a} + {fe7125f5-4514-41dd-82c0-50225d74a211} - {c01b34b4-e3b3-45c5-ac90-d4e555b39a12} + {6b40e644-f3b1-45b4-975a-3a6600b4aef0} - {049a120f-6b4d-42f9-a659-f1a8086a5ea9} + {e48bf50f-503c-4d2c-996d-f2e8f81fbe48} - {9ac4bc76-482f-458b-8daf-13f8791d3407} + {161a3d61-f74c-49aa-ad3d-5aee6068463b} - {4902ac77-e101-4d7f-a6dc-02922f39fe4e} + {bedae4d3-9207-410f-bd7e-6eb3b0eeb062} - {05c26e73-52eb-463a-8c06-6254ea449140} + {ce6895bd-66ac-4266-952e-33c1d5f87ca6} - {ab959485-0bd4-45f4-9b13-b045e9957a8d} + {40653766-eeb0-4aa3-8a0b-c3237e3f8741} - {7e5d7606-6a41-4f84-ba07-070ec3e57b4c} + {bc287507-784c-4b12-94ef-be64f21fa7bf} - {0cd4fc85-4135-4fbc-a3fb-163fb6793cf1} + {96f21d5d-4e18-405b-ab29-c50619552149} - {f10eab33-b63e-4691-80e9-612b79a47eb9} + {a7b2c94a-7099-44fe-bec7-58fe4cf9d464} - {47ff00db-5bd6-4b76-8bc4-6d93b659cb6d} + {52de442b-ce26-4711-b0db-3ded48af5e46} - {3ac9cf4b-47cd-4ba6-bb9b-1dc1c60581e6} + {9bbf0ead-5ae6-4214-a884-4b45f3570f69} - {9d619edc-75c7-498a-9842-61869f329457} + {02100618-ce04-4af5-825a-947f169ce733} - {55cb4b8a-e1fb-468b-887e-02f19e3a8118} + {05a1855d-a591-41a1-b1bf-c237e970e901} - {ac4cf6f2-49f6-4cb0-b593-3631a3ae377b} + {93a12cfe-9517-49bb-bafd-e3a190a014e5} - {81b0679f-7187-4a3f-aeb3-38d87c6cd14b} + {72a608af-686c-4636-9bce-c99cfd695aa2} - {33e6a881-b872-442e-af4b-ed68afde8634} + {aebb675b-08c1-4bb1-9613-6ff45327a8dc} - {c560e8ee-fac5-4a7a-959a-b083eb767afe} + {5ee87699-a3e1-4fbd-a379-d7c541a9367a} - {b8d6ccfc-3082-4585-855f-0c6189ba4132} + {12d26429-df56-4b6f-bbe2-c8bea5831894} - {69161187-6c6a-41d0-afd2-1235cd0c9130} + {cc201f40-c427-4ca7-92fd-8921cb937251} - {753f308c-3e40-440f-85c1-2d756287645f} + {1cb571d8-4839-43e0-a5e1-cf7529d73137} - {52feaf87-e1c7-4ef2-b777-49e755c75239} + {849e0ebb-37f8-4241-bd89-bc52e198f833} - {fe8cbe82-ef84-4d45-b7b3-6911e82f476c} + {60f8c3a3-2bbe-4cc6-82ef-cdd2ae2c7af4} - {c60fab56-cb36-4a65-867e-6f7a7645d693} + {82a451da-9c2b-46a9-a5f1-5b067b5f7d85} - {43a89df7-edfd-4859-b09d-c8da22ee5661} + {0c5ccb29-2cbd-43d6-a55f-f077f1a5582f} - {a189b7c9-711d-438e-b291-3fceea496796} + {a103a47d-eb55-4904-ae2e-2e39b347705c} - {073570d0-45af-47e9-ae4f-c11778a156eb} + {fcd1545d-4c16-4547-a0e9-557a85e80546} - {399dbd97-37c3-4185-bbd0-3a4a00eb12cd} + {86eae716-ba77-4c25-a320-c275dc694e38} - {deb8cfac-eaaf-47b8-bd10-15d8057ecb9d} + {fb22bb79-ac70-45a8-ad37-c145d86bb2f8} - {43f766fa-d367-4989-b900-38f9ae93b111} + {7daee445-dedb-4e35-9f7d-00ac38ab77f4} - {9668a9c4-30a5-488f-83ea-1f6c1c829f0b} + {468c45db-69cb-4286-b078-57bbb5837b35} - {93d2775e-36da-417e-af2b-62270a2783f4} + {d4dbd4d8-0829-4207-bbad-16e92794b41f} - {7c101a4d-339b-4546-9bcf-5509aa4aa970} + {3dd59c5c-5be2-446b-b084-38ca712893bd} - {cf2d21b4-5378-47de-be89-9fa99b30f5cf} + {20eda713-f9c1-4199-ab00-465a8a30fda2} - {a13642fb-c897-4c75-b0ad-db778b243e96} + {9e1f155b-b268-4027-8e09-e11180de0a94} - {512dc510-8d7a-43b1-8dc3-abcfa290bc18} + {9aee5bb5-2cd9-4c8d-aaf7-b827309883be} - {67fd5316-4838-4e2e-ac4a-95b8146899cf} + {efc96de3-e124-4bdd-bb34-861fe8a5454c} - {532d7cb5-0c6e-4565-88b1-82063de53b63} + {eefbee32-fc6f-4e87-aa56-8665d65ef6c7} diff --git a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters index 64e06bfda..1b6311b83 100644 --- a/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Foundation/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,181 +2,181 @@ - {3bbf5c74-13a7-46c5-9a38-459f9e012543} + {5eda60ce-b0be-4289-8628-441c7895da79} - {ba595d5d-6fc1-445f-a8f7-3e2338c458d1} + {e981fc23-31be-47e4-8d16-b04bdc0a6f60} - {7aa4e16d-a738-46f9-8da9-a9a2b92481be} + {b97f26ea-98e3-48ab-bbb0-921524c454f9} - {ba6ca721-a462-4b6a-a201-3373754e222f} + {27e4b280-17f4-422e-a659-158a21b3637f} - {64366ba6-6d02-4e3d-865a-0e52ca08da07} + {4505c3f0-673e-4d66-ad5b-c109b05e3d89} - {ac097c87-061b-43da-84b3-784d51c777e1} + {f5d68e3b-1329-4dbc-bd6a-4850f5225194} - {efaab5a9-7cab-4262-90ae-83812c396c68} + {4a234941-b9df-443e-92fe-89dbc6fe3d7e} - {34f45b45-853d-4c04-a0a4-512d65a6b45e} + {ae21786e-48e3-49fa-8c73-cac9d5bf9993} - {a2a33225-26ac-44f9-a9ad-006f165b6917} + {58f416a1-de06-4bc9-b711-25d91fdfa63f} - {5c830c8c-8603-457b-b49d-176f89609468} + {51b75fdd-14b7-4bb7-89a4-c85ee6b98b19} - {51c7aaf4-2867-4e78-9b86-a986f084fd79} + {a5618e15-566a-47a0-a6d5-2d09dc1f0b32} - {234f79c4-9ee9-4755-86f5-6ba5b57e0ae5} + {61da9cb6-9e06-40c3-9e7e-c6e1f47abfd4} - {18298cf6-8f1d-4365-998e-255638cd1b03} + {1945f319-8ced-4983-8dc5-f90b5387de7b} - {a38044cc-e4d5-4edb-9f94-9cc4735b6ee9} + {643e9880-eac7-4da4-b130-d745aa711f32} - {e86e5e59-c191-490e-a522-82b77b54ee77} + {0f06acb6-ff49-4ef5-92d0-929356a4230d} - {82e71e4e-4941-4289-92da-1395ca9ca59c} + {ec20ce49-270a-4b24-8011-43ca082ce48f} - {95d57752-67d1-4e70-af64-fdc30a19ff3a} + {065474b8-27a6-420b-8402-5f8a7e8394ae} - {30f3035f-bad7-4da3-b247-92bdfdd9a2a5} + {d3573d49-e306-47b5-8c04-207561a675fc} - {8c09c736-1c3b-4a49-8c39-23bed7c10c29} + {d770762d-ed58-46ab-a96a-53393ce871bc} - {9c4a3ac2-e444-426d-b9f3-41bc6e0d8340} + {c686888b-fc41-463b-836c-8e365599e338} - {d650f9eb-83df-41f3-bf20-0be2aa2d9d9a} + {d77e3d14-a933-4340-a93e-0384db6a52ed} - {1d34784c-9a18-4b1f-bf7f-e10006534eb2} + {8e5a2f57-ccfe-428f-9b73-668f7c9f940c} - {0510e8c0-4699-49e1-8e5b-7c992461c5aa} + {95824871-552d-451c-869b-5d032bc84e85} - {f533fa34-a935-4107-9447-d553d84b1492} + {bae8f3bf-3039-4e63-940d-51cb1e445310} - {75c6b15e-aa27-4e1c-a53b-d0fa7ee10e4a} + {b748c2f0-0469-43ee-bfa3-08335359201f} - {a8e20cf9-f025-480c-9919-af1db528ac14} + {3e627506-f430-48c8-81ff-2739a358c1db} - {c7d19d42-aad7-4a36-ba14-9e1e03a8cc61} + {32a3b4bb-3bf9-4272-b82a-9bcc670c53c5} - {6992f69e-1732-4d06-bf9e-db2fbf868696} + {42bcbfa9-7f4b-44de-98c4-cc98ce4fc317} - {1cbb2b41-cf1f-4855-a4f6-f6667a40af3a} + {c79ffd36-a52c-404e-8d2f-6cd16ff3b7ac} - {86a52d13-54c9-4bbc-9fe1-0ec3c2a8942a} + {180e9807-1aad-4ee9-9e4d-74a3be2281d6} - {463b78bd-c0ab-4c64-a6a9-d996a70271bf} + {1cc55f7d-2058-4886-a85e-69a9b91a0a66} - {7c13d958-2303-4af4-8d56-a8ad8fa3ea7e} + {37a37db3-b242-4537-9502-5ba18d8ff275} - {5dfc6c24-aa00-4874-b6af-f742b3d2438e} + {c356cf18-0fe5-4a48-bfd0-fddb8ff770cf} - {af34c163-cc7b-44b3-9944-48f92a9d75a2} + {488455cf-cb76-4756-9974-0d9bf5b95084} - {92182003-3c34-4bfc-82ea-bbe13359d0c9} + {649c7265-baf1-4df5-b1aa-63f0e30e89d4} - {771f3eaa-fb48-41e8-a703-f668837eecc9} + {6ce190f9-476f-4cd3-8bc1-9b496e9a2a3d} - {1685a3ef-39d7-4536-ac72-35174771e519} + {f4013716-6437-4b0d-98d0-4cb8d96c9972} - {1eeee519-17fa-4009-911f-16a5f14e04fd} + {e6329f10-e88e-4952-85b4-b9855b0d8029} - {432c49d1-99c7-4711-97fe-9f261da9881a} + {2ed79521-1a98-4505-aab7-ec3827a5dec7} - {41c8ca77-4860-4dec-b4c2-7198e2b5113e} + {2a48c3d5-f3f0-4c60-956c-88e93431befe} - {0bd7da47-ecff-41af-a87e-abd3c461841d} + {f2d81b04-272d-4b14-9c2b-131ce05094f2} - {f68efd5e-3230-4b52-876c-4d508ed9ee2f} + {32344db8-a6e9-4c28-8f8f-9439a55e6d60} - {675e3c5e-2de5-44b1-843c-0f066a7670ad} + {0a5eaff7-b3fd-426b-bdc9-b336279ae75f} - {44b74e35-b3af-41ae-b659-6831fa50f74c} + {1f2779e6-f6ff-45eb-9645-499e0353a70f} - {183fc9e9-02b6-4df2-87dd-84f20ce4aa3c} + {ba764c3c-7bda-4a9b-901e-915af6e087c1} - {65a78347-d64a-4390-abed-8f59cdff0f66} + {2f420809-30dc-44cc-ac8c-7aa28218f931} - {2c29a48f-fad6-4c4d-8a57-de04371136cf} + {c7c2e943-0087-44d2-bf6a-60d0215c0a0f} - {bd26a0b1-f853-4b78-88c7-88b0dab88424} + {9918262b-e6fd-4f27-a6a6-a3f54f3b6b3b} - {1d664692-64b0-41ca-a376-9bea99b0bf0a} + {06a64b2f-ecde-4bd9-af9d-8810980c54c0} - {dd9effd6-6032-4c07-aedc-b968ad1b3f87} + {f53810c0-41be-4fac-a146-8a73f57cb298} - {31f575e7-3a6c-4454-acfd-61014fe70e7e} + {d5fdc230-25a0-472b-9ff6-970a628f01b8} - {c88822f9-952b-4ec6-84ba-2c4255e0da01} + {0e00027b-44b9-4739-b730-35f8eedeb629} - {572bd5cf-67a3-48ba-85f5-d095c37fd26d} + {278014e2-eb20-43e0-8a43-68f5f7e952a8} - {ada7e21e-f8be-4efa-baa0-ab289d92bb32} + {38f5dba2-9ece-4e15-b6dd-40637d055483} - {256049c4-8b48-454f-af9c-274771957c5d} + {4b2f4772-d8b5-4171-a25a-8e4a4c191e12} - {06506a70-85a7-4a6a-9464-f073abeb547b} + {774b0d1b-17ee-45da-9b35-82de496beed7} - {6e206e47-8698-4dda-9229-46eaf1367cd2} + {83f555c5-2b44-4419-accc-8ebe877f2079} - {c476f7ba-bc57-4a5e-b156-d034d0a3d7d5} + {238e1ccb-9bbc-4f5c-bfa2-4597baab0560} - {58e7c2c2-7180-4a20-b627-a1b72fdd6383} + {c62be5f7-7fcc-4ce2-b2f7-2f8ce17addd1} diff --git a/JSON/JSON_CE_vs90.vcproj b/JSON/JSON_CE_vs90.vcproj index 14513bf77..51a76dd76 100644 --- a/JSON/JSON_CE_vs90.vcproj +++ b/JSON/JSON_CE_vs90.vcproj @@ -56,7 +56,7 @@ + OutputFile="..\lib\$(PlatformName)\PocoJSONMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoJSONMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoJSONMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoJSONMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT diff --git a/JSON/JSON_WEC2013_vs110.vcxproj.filters b/JSON/JSON_WEC2013_vs110.vcxproj.filters index 3142686de..e9082ff1e 100644 --- a/JSON/JSON_WEC2013_vs110.vcxproj.filters +++ b/JSON/JSON_WEC2013_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {25e19857-6cba-4a83-93f6-b6210c55ca81} + {e7b109c7-8ce1-42a2-ae3a-2d34f463ea27} - {b2953bf1-c2d5-4d8a-a940-7ce031604db4} + {d8dad8ce-4991-4dec-9b79-ce609e8af101} diff --git a/JSON/JSON_WEC2013_vs120.vcxproj b/JSON/JSON_WEC2013_vs120.vcxproj index 26b2610a1..b79863dfe 100644 --- a/JSON/JSON_WEC2013_vs120.vcxproj +++ b/JSON/JSON_WEC2013_vs120.vcxproj @@ -31,11 +31,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT diff --git a/JSON/JSON_WEC2013_vs120.vcxproj.filters b/JSON/JSON_WEC2013_vs120.vcxproj.filters index 858400ff5..543ebdadb 100644 --- a/JSON/JSON_WEC2013_vs120.vcxproj.filters +++ b/JSON/JSON_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {687295e2-b930-4752-8fe0-0605c42d6e85} + {0888a62d-b2c1-464b-be9b-081f48be788c} - {e19cbff6-9a16-4d15-9040-2a65787b8614} + {4239b2bb-6b51-4a80-b777-31ddb47f6bf2} diff --git a/JSON/JSON_vs100.vcxproj b/JSON/JSON_vs100.vcxproj index 070b7b4ad..e00465524 100644 --- a/JSON/JSON_vs100.vcxproj +++ b/JSON/JSON_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\JSON\$(Configuration)\ PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoJSONmtd.lib + %(AdditionalDependencies) + ..\lib\PocoJSONMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoJSONmt.lib + %(AdditionalDependencies) + ..\lib\PocoJSONMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoJSONmdd.pdb + ..\lib\PocoJSONMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoJSONmdd.lib + %(AdditionalDependencies) + ..\lib\PocoJSONMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoJSONmd.lib + ..\lib\PocoJSONMD.lib diff --git a/JSON/JSON_vs100.vcxproj.filters b/JSON/JSON_vs100.vcxproj.filters index bd6dfd5c1..86437437e 100644 --- a/JSON/JSON_vs100.vcxproj.filters +++ b/JSON/JSON_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {51c6052c-632b-47f4-b5b9-f2f22139aca3} + {381428ba-e55d-46fb-a184-ece705222944} - {49794242-6539-40e4-bfa1-5951ebf8ba4f} + {49426a90-6a1a-49e0-bdc9-367ee7489de8} diff --git a/JSON/JSON_vs110.vcxproj b/JSON/JSON_vs110.vcxproj index 13ec8abb4..df113d762 100644 --- a/JSON/JSON_vs110.vcxproj +++ b/JSON/JSON_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoJSONmtd.lib + ..\lib\PocoJSONMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoJSONmt.lib + ..\lib\PocoJSONMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoJSONmdd.pdb + ..\lib\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoJSONmdd.lib + ..\lib\PocoJSONMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoJSONmd.lib + ..\lib\PocoJSONMD.lib diff --git a/JSON/JSON_vs110.vcxproj.filters b/JSON/JSON_vs110.vcxproj.filters index 88bd12d44..598975bea 100644 --- a/JSON/JSON_vs110.vcxproj.filters +++ b/JSON/JSON_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {310b9fa9-c363-4238-b9ec-2a5ab304dfac} + {9fb84316-2944-400f-8b15-cdc6a25655fa} - {a4c2100f-8815-45c0-9782-d26aa3c78db2} + {17c93b09-ae67-42a6-9465-4d007ccf3053} diff --git a/JSON/JSON_vs120.vcxproj b/JSON/JSON_vs120.vcxproj index fd7e89d37..7b059ab27 100644 --- a/JSON/JSON_vs120.vcxproj +++ b/JSON/JSON_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoJSONmtd.lib + ..\lib\PocoJSONMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoJSONmt.lib + ..\lib\PocoJSONMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoJSONmdd.pdb + ..\lib\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoJSONmdd.lib + ..\lib\PocoJSONMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoJSONmd.lib + ..\lib\PocoJSONMD.lib diff --git a/JSON/JSON_vs120.vcxproj.filters b/JSON/JSON_vs120.vcxproj.filters index 7aec32d99..a98da8a49 100644 --- a/JSON/JSON_vs120.vcxproj.filters +++ b/JSON/JSON_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {cd3f1abf-c08b-41d0-aec4-58d50298f4c0} + {ce115ff1-c22a-4d1d-b6d2-5fcb2fe3145c} - {56c465c5-e4e4-4672-a706-da77488c5f65} + {7475b89d-29cf-46f9-884d-cca7152cbd39} diff --git a/JSON/JSON_vs140.vcxproj b/JSON/JSON_vs140.vcxproj index fa91ee0a2..6716396f6 100644 --- a/JSON/JSON_vs140.vcxproj +++ b/JSON/JSON_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoJSONmtd.lib + ..\lib\PocoJSONMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoJSONmt.lib + ..\lib\PocoJSONMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoJSONmdd.pdb + ..\lib\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoJSONmdd.lib + ..\lib\PocoJSONMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoJSONmd.lib + ..\lib\PocoJSONMD.lib diff --git a/JSON/JSON_vs140.vcxproj.filters b/JSON/JSON_vs140.vcxproj.filters index 47ae495a4..abf992511 100644 --- a/JSON/JSON_vs140.vcxproj.filters +++ b/JSON/JSON_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {f084eff2-c271-47fe-a762-d702c30013c4} + {226971b2-091b-4b3a-bbeb-eedc40283936} - {402a43fa-bc70-4ac9-9b09-49567be0dad2} + {9983f938-89a3-40c6-a69d-8a49f38ccbe2} diff --git a/JSON/JSON_vs150.vcxproj b/JSON/JSON_vs150.vcxproj index 888a7241a..b99c2ff1e 100644 --- a/JSON/JSON_vs150.vcxproj +++ b/JSON/JSON_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoJSONd - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoJSONmtd.lib + ..\lib\PocoJSONMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoJSONmt.lib + ..\lib\PocoJSONMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoJSONmdd.pdb + ..\lib\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoJSONmdd.lib + ..\lib\PocoJSONMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoJSONmd.lib + ..\lib\PocoJSONMD.lib diff --git a/JSON/JSON_vs150.vcxproj.filters b/JSON/JSON_vs150.vcxproj.filters index 9a559662b..0c9b4c8fc 100644 --- a/JSON/JSON_vs150.vcxproj.filters +++ b/JSON/JSON_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {0919a579-478f-4580-956e-ea5fc6a149bc} + {4845c54b-7f74-4549-9317-38b13566ae53} - {ea7aed1c-1eff-4ab6-a9f6-24128810a779} + {9132fbc4-c4c9-4400-be9a-dddd77e2831e} diff --git a/JSON/JSON_vs90.vcproj b/JSON/JSON_vs90.vcproj index f4b6d7414..e23f18261 100644 --- a/JSON/JSON_vs90.vcproj +++ b/JSON/JSON_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoJSONMTd.lib"/> + OutputFile="..\lib\PocoJSONMT.lib"/> + OutputFile="..\lib\PocoJSONMDd.lib"/> + OutputFile="..\lib\PocoJSONMD.lib"/> ..\lib64\ obj64\JSON\$(Configuration)\ PocoJSON64d - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON64 - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoJSONmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoJSONMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoJSONmt.lib + %(AdditionalDependencies) + ..\lib64\PocoJSONMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoJSONmdd.pdb + ..\lib64\PocoJSONMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoJSONmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoJSONMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoJSONmd.lib + %(AdditionalDependencies) + ..\lib64\PocoJSONMD.lib + MachineX64 diff --git a/JSON/JSON_x64_vs100.vcxproj.filters b/JSON/JSON_x64_vs100.vcxproj.filters index 7d0cd3d59..928e2928b 100644 --- a/JSON/JSON_x64_vs100.vcxproj.filters +++ b/JSON/JSON_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {4cd62b42-ddd3-40ae-af8b-45ae80825d61} + {02f337e4-dc26-442f-89eb-0c13ff6ae674} - {6cfd68c5-60cb-46e9-a14f-d29d637b5406} + {57108f95-e8fa-4406-a3ed-6ae3de744e04} diff --git a/JSON/JSON_x64_vs110.vcxproj b/JSON/JSON_x64_vs110.vcxproj index 41299fde0..ba49b8879 100644 --- a/JSON/JSON_x64_vs110.vcxproj +++ b/JSON/JSON_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoJSON64d - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON64 - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoJSONmtd.lib + ..\lib64\PocoJSONMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoJSONmt.lib + ..\lib64\PocoJSONMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoJSONmdd.pdb + ..\lib64\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoJSONmdd.lib + ..\lib64\PocoJSONMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoJSONmd.lib + ..\lib64\PocoJSONMD.lib + MachineX64 diff --git a/JSON/JSON_x64_vs110.vcxproj.filters b/JSON/JSON_x64_vs110.vcxproj.filters index 5a0969f9b..974fc1bf8 100644 --- a/JSON/JSON_x64_vs110.vcxproj.filters +++ b/JSON/JSON_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {7a533b59-4603-49d1-9de8-bc95d3d68518} + {1dfaad56-7a92-42ca-8416-7d9b46c2cc5f} - {6046ced4-194e-4619-a0b3-b64d7fe6c47f} + {333600fb-a0fb-4706-9db7-6c0b95479985} diff --git a/JSON/JSON_x64_vs120.vcxproj b/JSON/JSON_x64_vs120.vcxproj index 5aa07ccfb..35c69fe11 100644 --- a/JSON/JSON_x64_vs120.vcxproj +++ b/JSON/JSON_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoJSON64d - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON64 - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoJSONmtd.lib + ..\lib64\PocoJSONMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoJSONmt.lib + ..\lib64\PocoJSONMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoJSONmdd.pdb + ..\lib64\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoJSONmdd.lib + ..\lib64\PocoJSONMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoJSONmd.lib + ..\lib64\PocoJSONMD.lib + MachineX64 diff --git a/JSON/JSON_x64_vs120.vcxproj.filters b/JSON/JSON_x64_vs120.vcxproj.filters index a87259c97..6668204c8 100644 --- a/JSON/JSON_x64_vs120.vcxproj.filters +++ b/JSON/JSON_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {1d2b7bff-33f9-4d8a-ad40-74359d301aac} + {222d471c-7ed4-4821-b344-a37ce8934b42} - {9f9defae-7b28-4766-8d7a-65d4a11a2fed} + {b8b482c0-1e6d-40a0-9755-0bac0f2dcd3d} diff --git a/JSON/JSON_x64_vs140.vcxproj b/JSON/JSON_x64_vs140.vcxproj index b60a555fb..3235113bc 100644 --- a/JSON/JSON_x64_vs140.vcxproj +++ b/JSON/JSON_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoJSON64d - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON64 - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoJSONmtd.lib + ..\lib64\PocoJSONMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoJSONmt.lib + ..\lib64\PocoJSONMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoJSONmdd.pdb + ..\lib64\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoJSONmdd.lib + ..\lib64\PocoJSONMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoJSONmd.lib + ..\lib64\PocoJSONMD.lib + MachineX64 diff --git a/JSON/JSON_x64_vs140.vcxproj.filters b/JSON/JSON_x64_vs140.vcxproj.filters index 86b57e791..5c4b22dea 100644 --- a/JSON/JSON_x64_vs140.vcxproj.filters +++ b/JSON/JSON_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {4aa4aad0-9c42-4ee8-bd22-061e3f91a270} + {b3afbf7c-2904-445d-9ea2-ca127b24e6e1} - {a965ff07-2d7f-49f1-9ced-20ea18b194d9} + {ba278be7-8dea-4d7b-9b23-279c84cacc74} diff --git a/JSON/JSON_x64_vs150.vcxproj b/JSON/JSON_x64_vs150.vcxproj index 3293bf811..451f5c79d 100644 --- a/JSON/JSON_x64_vs150.vcxproj +++ b/JSON/JSON_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoJSON64d - PocoJSONmdd - PocoJSONmtd + PocoJSONMDd + PocoJSONMTd PocoJSON64 - PocoJSONmd - PocoJSONmt + PocoJSONMD + PocoJSONMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoJSONmtd.lib + ..\lib64\PocoJSONMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoJSONmt.lib + ..\lib64\PocoJSONMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoJSONmdd.pdb + ..\lib64\PocoJSONMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoJSONmdd.lib + ..\lib64\PocoJSONMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoJSONmd.lib + ..\lib64\PocoJSONMD.lib + MachineX64 diff --git a/JSON/JSON_x64_vs150.vcxproj.filters b/JSON/JSON_x64_vs150.vcxproj.filters index 14b8658b9..5d383f894 100644 --- a/JSON/JSON_x64_vs150.vcxproj.filters +++ b/JSON/JSON_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {47269c7f-3b64-4ef5-a1cf-e704bd4acbfd} + {4dd4b869-2c52-4517-a1e0-498ff5b6a2d1} - {459db34f-319b-45bb-95df-6aff6b37ae85} + {1e18cd0b-5c1b-4091-9dbe-3de9b61f6b67} diff --git a/JSON/JSON_x64_vs90.vcproj b/JSON/JSON_x64_vs90.vcproj index 41a5fab88..e714cdd3e 100644 --- a/JSON/JSON_x64_vs90.vcproj +++ b/JSON/JSON_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoJSONmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoJSONMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/JSON/testsuite/TestSuite.progen b/JSON/testsuite/TestSuite.progen index 90a034507..c09c8c1d5 100644 --- a/JSON/testsuite/TestSuite.progen +++ b/JSON/testsuite/TestSuite.progen @@ -7,3 +7,7 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.linker.dependencies.Win32 = iphlpapi.lib +vc.project.linker.dependencies.x64 = iphlpapi.lib +vc.project.linker.dependencies.WinCE = iphlpapi.lib + diff --git a/JSON/testsuite/TestSuite_CE_vs90.vcproj b/JSON/testsuite/TestSuite_CE_vs90.vcproj index a476ac685..cf118b54b 100644 --- a/JSON/testsuite/TestSuite_CE_vs90.vcproj +++ b/JSON/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {e99eddc9-4b34-4815-b3ee-935a3a26d011} + {d346acee-4aa1-4b5f-a19c-7dbc4bcb8548} - {1e353c54-63c8-46b6-9b14-eb16ce9e0609} + {ebc77a0e-2af0-4fbe-bc89-5554845a8333} diff --git a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 740c08860..83920dbc8 100644 --- a/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {249e0d0c-de6a-4259-a146-a698eab8686b} + {bad895c0-71fc-4140-abad-56ef6863e367} - {9771c4a7-82dc-4312-a794-9b910100546a} + {a14be348-eccb-4fbe-b5da-89b2e90ece1a} diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj b/JSON/testsuite/TestSuite_vs100.vcxproj index 2bcc3677d..ea8d2f019 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj +++ b/JSON/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_vs100.vcxproj.filters index 2959627f1..988955b70 100644 --- a/JSON/testsuite/TestSuite_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {ca509948-5f36-4729-9de6-10ca2847628f} + {47dba495-d509-4122-bb23-d732f47b2bc2} - {c52d2c49-857c-4bf7-9151-a4d4eae93e78} + {d0b2950b-a892-47a9-8ad4-a2e1b4c106c8} diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj b/JSON/testsuite/TestSuite_vs110.vcxproj index a7c7efcc9..8bdabb9a1 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_vs110.vcxproj.filters index e81999088..34bb38db1 100644 --- a/JSON/testsuite/TestSuite_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {2f751e2e-7841-4b54-8f38-fda033c7049b} + {bc18074b-097e-4be5-ab6f-08c9ea516828} - {6b6333d8-a14b-4265-bc96-5e93764642ed} + {57d14cd8-0ffe-41d6-8841-f18fd02cbc46} diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj b/JSON/testsuite/TestSuite_vs120.vcxproj index 4f993ab27..4edf02f23 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_vs120.vcxproj.filters index 6b83d4fe7..af5c3cc7c 100644 --- a/JSON/testsuite/TestSuite_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {53545c6d-081b-4ed9-b43c-31e6e10c018f} + {368378d0-827d-46f4-bfa8-9179db7c0291} - {aaeb008b-f86e-44b9-a6ff-41fbd7fe4c36} + {90644bcb-30e8-4e87-9016-dc794e402986} diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj b/JSON/testsuite/TestSuite_vs140.vcxproj index 13f5c4135..dfc14e9c0 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_vs140.vcxproj.filters index 498697690..c71274917 100644 --- a/JSON/testsuite/TestSuite_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {fdf48f0f-09c2-4e5e-b08a-475bf6284f59} + {0b560cc2-f078-4310-83d4-f703b4dd239e} - {24162559-858a-464f-8f08-e028f08fa241} + {ce6d4c6e-8e52-41b9-b393-a33e2bef1006} diff --git a/JSON/testsuite/TestSuite_vs150.vcxproj b/JSON/testsuite/TestSuite_vs150.vcxproj index 59caf7064..9368545f5 100644 --- a/JSON/testsuite/TestSuite_vs150.vcxproj +++ b/JSON/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_vs150.vcxproj.filters b/JSON/testsuite/TestSuite_vs150.vcxproj.filters index b387c9dcb..f200ac2df 100644 --- a/JSON/testsuite/TestSuite_vs150.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {af64426f-1d72-4f5c-b40b-1b1c7792da89} + {06613325-a553-4282-8520-35fd34a40a09} - {98db6ba1-2760-4167-8caf-b6989b1c1663} + {a2dfd8f3-b984-434c-bcd5-b6b34f0750f1} diff --git a/JSON/testsuite/TestSuite_vs90.vcproj b/JSON/testsuite/TestSuite_vs90.vcproj index e1b7b1389..ebf1d6575 100644 --- a/JSON/testsuite/TestSuite_vs90.vcproj +++ b/JSON/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters index 0f9e62275..55701fff8 100644 --- a/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {a0a8575b-4ca8-4629-a597-87000e87c62b} + {ebfa1569-efc1-4dac-b3d1-2140e29524a4} - {a3131aca-701c-486e-82c8-5279ce8f93a1} + {8245b724-a74a-47e3-afbd-12ee9d9af5b4} diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj b/JSON/testsuite/TestSuite_x64_vs110.vcxproj index 97dcb54ea..a253ae114 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters index 1a6676e7d..77df0055b 100644 --- a/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {b7632afc-78b0-42bb-8b8f-6f412ec92417} + {eb62ca0d-5397-4ffa-b353-d9c191e13489} - {a9984321-0b78-408e-96b5-c558c4f4f8c6} + {4be073f0-4df7-40a9-b1ef-cfd55ca8cc6f} diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj b/JSON/testsuite/TestSuite_x64_vs120.vcxproj index 9f6d1e6cc..1de25485c 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters index a31915e5a..283083990 100644 --- a/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {9c8c8e2b-d7e4-4c16-8f24-1a6f2ce66142} + {6f6496a4-0d3d-4377-857a-bbf0b3d176fd} - {9e2bc1a2-e36d-4dc1-9158-f4b84a4bcc76} + {0d6b4a15-2d8f-4316-a1a5-03d0fa85da8f} diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj b/JSON/testsuite/TestSuite_x64_vs140.vcxproj index 943005729..da27b1032 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters index f7f25724a..1560e621e 100644 --- a/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {82232708-c15f-475e-bce9-2a9ccceba7d4} + {f6f66d3e-708f-40a8-a443-bfb08d7fa1ef} - {e82e9856-a9d7-4f94-9338-98d4e94fd8ab} + {9492215a-a29a-43a7-97e9-72e4419b79d5} diff --git a/JSON/testsuite/TestSuite_x64_vs150.vcxproj b/JSON/testsuite/TestSuite_x64_vs150.vcxproj index ad4a42961..6e67c3abb 100644 --- a/JSON/testsuite/TestSuite_x64_vs150.vcxproj +++ b/JSON/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters b/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters index 63dafc858..ae2bc2ea8 100644 --- a/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/JSON/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {4bbc9a42-5ec4-43b4-a7b0-9d15737e36a4} + {95f1a041-8260-4aee-a9aa-62ecef578071} - {1c3b7d45-d95a-4285-a7b9-e7afca18789e} + {9c215f6b-cd2c-4a75-a1c5-23be867b5414} diff --git a/JSON/testsuite/TestSuite_x64_vs90.vcproj b/JSON/testsuite/TestSuite_x64_vs90.vcproj index f19f4ddbc..b1fae746b 100644 --- a/JSON/testsuite/TestSuite_x64_vs90.vcproj +++ b/JSON/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoMongoDBMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoMongoDBMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoMongoDBMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoMongoDBMD.lib"/> ..\lib\ obj\MongoDB\$(Configuration)\ PocoMongoDBd - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoMongoDBmtd.lib + %(AdditionalDependencies) + ..\lib\PocoMongoDBMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoMongoDBmt.lib + %(AdditionalDependencies) + ..\lib\PocoMongoDBMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoMongoDBmdd.pdb + ..\lib\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoMongoDBmdd.lib + %(AdditionalDependencies) + ..\lib\PocoMongoDBMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoMongoDBmd.lib + ..\lib\PocoMongoDBMD.lib diff --git a/MongoDB/MongoDB_vs100.vcxproj.filters b/MongoDB/MongoDB_vs100.vcxproj.filters index f9905b1de..e2f4a326c 100644 --- a/MongoDB/MongoDB_vs100.vcxproj.filters +++ b/MongoDB/MongoDB_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {b0a1070b-b656-499b-8100-f5133652d842} + {25c92954-abee-4be9-baaf-f9e4bc869738} - {fc5d8d5b-4f4e-4ac3-a5d7-6c72a7e6e4bb} + {4f3df78e-e4df-4145-a231-fe894c7bd920} diff --git a/MongoDB/MongoDB_vs110.vcxproj b/MongoDB/MongoDB_vs110.vcxproj index d72840b9a..1d2f6e72c 100644 --- a/MongoDB/MongoDB_vs110.vcxproj +++ b/MongoDB/MongoDB_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoMongoDBd - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoMongoDBmtd.lib + ..\lib\PocoMongoDBMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoMongoDBmt.lib + ..\lib\PocoMongoDBMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoMongoDBmdd.pdb + ..\lib\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoMongoDBmdd.lib + ..\lib\PocoMongoDBMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoMongoDBmd.lib + ..\lib\PocoMongoDBMD.lib diff --git a/MongoDB/MongoDB_vs110.vcxproj.filters b/MongoDB/MongoDB_vs110.vcxproj.filters index 1943aaeb7..8b2a9bc21 100644 --- a/MongoDB/MongoDB_vs110.vcxproj.filters +++ b/MongoDB/MongoDB_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {1757d7e4-b0f3-4cad-bc16-ae03be55066d} + {61b4e4d4-7232-43cc-ae81-2a192c274274} - {da0c6423-2e75-4c7d-8bb2-dd43ce5a0d50} + {f688491a-5d47-4c4d-9f83-0373320cea87} diff --git a/MongoDB/MongoDB_vs120.vcxproj b/MongoDB/MongoDB_vs120.vcxproj index 361c3422c..ca8df4e35 100644 --- a/MongoDB/MongoDB_vs120.vcxproj +++ b/MongoDB/MongoDB_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoMongoDBd - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoMongoDBmtd.lib + ..\lib\PocoMongoDBMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoMongoDBmt.lib + ..\lib\PocoMongoDBMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoMongoDBmdd.pdb + ..\lib\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoMongoDBmdd.lib + ..\lib\PocoMongoDBMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoMongoDBmd.lib + ..\lib\PocoMongoDBMD.lib diff --git a/MongoDB/MongoDB_vs120.vcxproj.filters b/MongoDB/MongoDB_vs120.vcxproj.filters index 08c203d2d..dc2d18a03 100644 --- a/MongoDB/MongoDB_vs120.vcxproj.filters +++ b/MongoDB/MongoDB_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {5c0ba33a-01fa-460f-be7f-62ef903507ba} + {a81fa823-f29a-42e8-9db6-51bd125689af} - {67b7f612-417b-494e-aaa8-744e7ce53e18} + {3eb962f5-1530-4ed9-a620-c67aebdfedbf} diff --git a/MongoDB/MongoDB_vs140.vcxproj b/MongoDB/MongoDB_vs140.vcxproj index cd3355ed2..5196f59eb 100644 --- a/MongoDB/MongoDB_vs140.vcxproj +++ b/MongoDB/MongoDB_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoMongoDBd - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoMongoDBmtd.lib + ..\lib\PocoMongoDBMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoMongoDBmt.lib + ..\lib\PocoMongoDBMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoMongoDBmdd.pdb + ..\lib\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoMongoDBmdd.lib + ..\lib\PocoMongoDBMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoMongoDBmd.lib + ..\lib\PocoMongoDBMD.lib diff --git a/MongoDB/MongoDB_vs140.vcxproj.filters b/MongoDB/MongoDB_vs140.vcxproj.filters index 69e11588e..a93f6e512 100644 --- a/MongoDB/MongoDB_vs140.vcxproj.filters +++ b/MongoDB/MongoDB_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {de2302fc-989a-4b49-981d-79c183a9b129} + {e632cf62-7e90-47ca-a221-53acadff086a} - {29d38110-948a-4056-9912-963c93eb78e5} + {e1f6c9ca-b8f6-48ae-b6ab-252d20d1b417} diff --git a/MongoDB/MongoDB_vs150.vcxproj b/MongoDB/MongoDB_vs150.vcxproj index 121e83e2b..1a580c064 100644 --- a/MongoDB/MongoDB_vs150.vcxproj +++ b/MongoDB/MongoDB_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoMongoDBd - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoMongoDBmtd.lib + ..\lib\PocoMongoDBMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoMongoDBmt.lib + ..\lib\PocoMongoDBMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoMongoDBmdd.pdb + ..\lib\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoMongoDBmdd.lib + ..\lib\PocoMongoDBMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoMongoDBmd.lib + ..\lib\PocoMongoDBMD.lib diff --git a/MongoDB/MongoDB_vs150.vcxproj.filters b/MongoDB/MongoDB_vs150.vcxproj.filters index 80408d977..76e40c635 100644 --- a/MongoDB/MongoDB_vs150.vcxproj.filters +++ b/MongoDB/MongoDB_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {d5a73d23-a142-4e68-a5b8-6ad7d0021316} + {3a373e23-bd18-444a-8a38-9b1174ba4b36} - {ded747b3-ffbd-4dfe-b083-a85af1115909} + {036b6927-e1e1-42c2-8176-1ea9bdccc601} diff --git a/MongoDB/MongoDB_vs90.vcproj b/MongoDB/MongoDB_vs90.vcproj index 72743dae5..6f1411521 100644 --- a/MongoDB/MongoDB_vs90.vcproj +++ b/MongoDB/MongoDB_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoMongoDBMTd.lib"/> + OutputFile="..\lib\PocoMongoDBMT.lib"/> + OutputFile="..\lib\PocoMongoDBMDd.lib"/> + OutputFile="..\lib\PocoMongoDBMD.lib"/> ..\lib64\ obj64\MongoDB\$(Configuration)\ PocoMongoDB64d - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB64 - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoMongoDBmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoMongoDBMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoMongoDBmt.lib + %(AdditionalDependencies) + ..\lib64\PocoMongoDBMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + ..\lib64\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoMongoDBmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoMongoDBMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoMongoDBmd.lib + %(AdditionalDependencies) + ..\lib64\PocoMongoDBMD.lib + MachineX64 diff --git a/MongoDB/MongoDB_x64_vs100.vcxproj.filters b/MongoDB/MongoDB_x64_vs100.vcxproj.filters index 0ff796214..7515a962d 100644 --- a/MongoDB/MongoDB_x64_vs100.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {41ce63bc-d737-405d-a06e-e6b1d5f30166} + {a14c4fe3-c59c-4797-a683-3d270b461dcb} - {7159c388-41e4-4bfd-a05d-3df8fa92a8b8} + {03040832-ea84-4e8f-ba32-78c8c7849c58} diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj b/MongoDB/MongoDB_x64_vs110.vcxproj index 1ab9aa341..1da48c59d 100644 --- a/MongoDB/MongoDB_x64_vs110.vcxproj +++ b/MongoDB/MongoDB_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoMongoDB64d - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB64 - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoMongoDBmtd.lib + ..\lib64\PocoMongoDBMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoMongoDBmt.lib + ..\lib64\PocoMongoDBMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + ..\lib64\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoMongoDBmdd.lib + ..\lib64\PocoMongoDBMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoMongoDBmd.lib + ..\lib64\PocoMongoDBMD.lib + MachineX64 diff --git a/MongoDB/MongoDB_x64_vs110.vcxproj.filters b/MongoDB/MongoDB_x64_vs110.vcxproj.filters index 92e0084cb..45a70b3b3 100644 --- a/MongoDB/MongoDB_x64_vs110.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {bf9d7372-f740-482d-9cf8-c0b65a644664} + {2ebe2621-d7f4-4425-ba92-6798fad760c6} - {378dd2d7-0c8b-4021-a960-d465a6bc1530} + {902e057c-b0b6-48f3-b3c5-5b42efb1d702} diff --git a/MongoDB/MongoDB_x64_vs120.vcxproj b/MongoDB/MongoDB_x64_vs120.vcxproj index b72cf7f10..ceb7593f6 100644 --- a/MongoDB/MongoDB_x64_vs120.vcxproj +++ b/MongoDB/MongoDB_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoMongoDB64d - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB64 - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoMongoDBmtd.lib + ..\lib64\PocoMongoDBMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoMongoDBmt.lib + ..\lib64\PocoMongoDBMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + ..\lib64\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoMongoDBmdd.lib + ..\lib64\PocoMongoDBMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoMongoDBmd.lib + ..\lib64\PocoMongoDBMD.lib + MachineX64 diff --git a/MongoDB/MongoDB_x64_vs120.vcxproj.filters b/MongoDB/MongoDB_x64_vs120.vcxproj.filters index f630f5016..89a76ec14 100644 --- a/MongoDB/MongoDB_x64_vs120.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {e47a4fb2-c47e-469d-8b84-2c8ae11010a7} + {e21e972e-4440-42a9-b431-6ce241d18a00} - {89bf8d17-7432-4bc6-9e8d-02ee8a136457} + {c9cbd08a-4cf8-4b8f-b65a-8b67a4e2b34b} diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj b/MongoDB/MongoDB_x64_vs140.vcxproj index ee8f081a8..d82093ca2 100644 --- a/MongoDB/MongoDB_x64_vs140.vcxproj +++ b/MongoDB/MongoDB_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoMongoDB64d - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB64 - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoMongoDBmtd.lib + ..\lib64\PocoMongoDBMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoMongoDBmt.lib + ..\lib64\PocoMongoDBMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + ..\lib64\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoMongoDBmdd.lib + ..\lib64\PocoMongoDBMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoMongoDBmd.lib + ..\lib64\PocoMongoDBMD.lib + MachineX64 diff --git a/MongoDB/MongoDB_x64_vs140.vcxproj.filters b/MongoDB/MongoDB_x64_vs140.vcxproj.filters index 4993b8a30..628635227 100644 --- a/MongoDB/MongoDB_x64_vs140.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {ba19ff64-6c4c-4b52-adf1-5d76b9cd7daa} + {4f47f13f-c695-4d64-9a22-4a0078641dcb} - {1fecc809-b1d5-46a4-8e0b-67ec70c6c768} + {c9de6419-12de-4886-99f5-966be675435d} diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj b/MongoDB/MongoDB_x64_vs150.vcxproj index 9a65ab504..148f9fd83 100644 --- a/MongoDB/MongoDB_x64_vs150.vcxproj +++ b/MongoDB/MongoDB_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoMongoDB64d - PocoMongoDBmdd - PocoMongoDBmtd + PocoMongoDBMDd + PocoMongoDBMTd PocoMongoDB64 - PocoMongoDBmd - PocoMongoDBmt + PocoMongoDBMD + PocoMongoDBMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoMongoDBmtd.lib + ..\lib64\PocoMongoDBMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoMongoDBmt.lib + ..\lib64\PocoMongoDBMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoMongoDBmdd.pdb + ..\lib64\PocoMongoDBMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoMongoDBmdd.lib + ..\lib64\PocoMongoDBMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoMongoDBmd.lib + ..\lib64\PocoMongoDBMD.lib + MachineX64 diff --git a/MongoDB/MongoDB_x64_vs150.vcxproj.filters b/MongoDB/MongoDB_x64_vs150.vcxproj.filters index ae873639e..edfaf10c8 100644 --- a/MongoDB/MongoDB_x64_vs150.vcxproj.filters +++ b/MongoDB/MongoDB_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {f7ee38d8-c069-4374-aa8a-2636ca2cdffa} + {a7e5ad51-5d01-4717-990a-4f4cf19f8764} - {1bdab896-6462-450c-9f37-877859c31fb5} + {b6bd408b-6149-42e3-b399-ef69fbe03360} diff --git a/MongoDB/MongoDB_x64_vs90.vcproj b/MongoDB/MongoDB_x64_vs90.vcproj index 8a5fea1d0..5fdb7de94 100644 --- a/MongoDB/MongoDB_x64_vs90.vcproj +++ b/MongoDB/MongoDB_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoMongoDBmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoMongoDBMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/MongoDB/testsuite/TestSuite_vs100.vcxproj b/MongoDB/testsuite/TestSuite_vs100.vcxproj index b79e045f6..a0b9a9199 100644 --- a/MongoDB/testsuite/TestSuite_vs100.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs100.vcxproj @@ -201,7 +201,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters index 8cbcb3c49..8c00aa75f 100644 --- a/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {14302597-4ba1-4ce7-9661-3fd4ee9b313b} + {a5b9d8c1-121a-4a5b-89f4-b4b218e5aac7} - {718b9fcf-8ac1-4f6c-9cbc-185e19fa9b41} + {fe8c78e0-8afc-4bc2-80a3-2331fbb5259c} diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj b/MongoDB/testsuite/TestSuite_vs110.vcxproj index 58773f5ec..81099bb1f 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj @@ -211,7 +211,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters index a97cc0dba..4d90a8834 100644 --- a/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {b1c08101-45bf-4667-b24f-3b444d8f41b9} + {4cf6bd84-9308-4ec2-920d-fd4b26f56ffa} - {020da933-0979-4cf2-adc7-dd5fcf6e1968} + {fd90749f-c0fe-4f90-82fc-d4e9fb7314a7} diff --git a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters index 021069d00..9f5adbaa4 100644 --- a/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {711697e4-3da2-475d-b7ac-25a3dfc59419} + {284f7081-8b52-4808-beb3-af696fea3068} - {fedfd236-d679-4008-aa6d-eafac6455823} + {d620d898-970f-45da-ae76-da7365c7c3ba} diff --git a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters index 67ade7e69..2e391b726 100644 --- a/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {d22635ed-a90e-413b-a34d-63061691e86e} + {b1d6b99e-92b9-46ae-bae5-61275df5a739} - {7f57a2dd-7bc1-45b9-a708-d5516c9056df} + {235c5e33-32dd-44fd-8e09-d2a90484faa5} diff --git a/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters index d5e26437a..f0d802638 100644 --- a/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {7e026445-511d-476f-ba37-a3a1322c342c} + {2a184353-58ae-427e-9d66-d9a1369267fe} - {3c0c3316-3246-4fb1-a81f-75f8ae68ddb3} + {eaebd766-904f-4eea-a20c-0bed8e0d602d} diff --git a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj index 78ba121ae..b5b589b9c 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj @@ -201,7 +201,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters index 54bf5e72b..3f149957d 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {5582f372-b69a-4456-b9bf-0b3f3af4caf0} + {c6277111-9d8e-4e9a-9261-40cef8c1b7f6} - {9873c273-e383-435b-9b26-16dcd556158b} + {edee4faf-22cb-478d-a9bb-94b6b5978522} diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj index bf0336ce2..872ed7ab6 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj @@ -211,7 +211,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters index 889b9f11a..e1a385436 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {4f03c950-0f86-46f7-849b-38080bc83a7b} + {c4350ff3-a9a8-4238-bc2e-1e9569d3f3f6} - {170591af-ec2f-480e-b363-1806980e4077} + {da73b27c-75a9-433c-81b3-1946e4df3651} diff --git a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters index 612143731..961b0451e 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {2b9a6af0-2baa-46c3-86df-c269c0da8d6a} + {17f5cfc6-5984-4a79-9c7b-7d2cbcbe35d7} - {ba01ef5a-dd2d-4980-bee4-9368d316d33f} + {5e7db015-8150-46f2-b10d-e77667c6d8cf} diff --git a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters index 00cb6e3cc..f050f19f4 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {a61a7cda-cd24-4796-9db0-7fb83222d938} + {e5280f90-2897-48b1-b485-6e773a2bbc67} - {43ed5ded-bfa2-40cd-8bef-d1f3c43b90d7} + {e2f8ddcd-d30e-4b74-a9c9-e13868bbb6cc} diff --git a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters index 9f3c282ff..1aeebe5e5 100644 --- a/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {eafb3075-4857-457b-9100-8938fb83ff81} + {0f9c427a-5e96-4053-9327-373473845b60} - {08fe69c1-b148-4401-abaa-b2ceb3cd56b5} + {bd19e5f3-06e3-4827-888e-c36d0ba71464} diff --git a/Net/Net_CE_vs90.vcproj b/Net/Net_CE_vs90.vcproj index 5ed73fc8d..0a69f8c10 100644 --- a/Net/Net_CE_vs90.vcproj +++ b/Net/Net_CE_vs90.vcproj @@ -198,7 +198,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetmtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -214,7 +214,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoNetMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT diff --git a/Net/Net_WEC2013_vs110.vcxproj.filters b/Net/Net_WEC2013_vs110.vcxproj.filters index c59cecb73..3e4601bdf 100644 --- a/Net/Net_WEC2013_vs110.vcxproj.filters +++ b/Net/Net_WEC2013_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {bc71e177-7822-4279-8f15-71590a87be73} + {f9be5687-58d9-4bc1-9c58-5df4e39e43be} - {4acd2490-6d9a-4e81-b72f-9d107613fa9e} + {d31caa5d-8b5f-49d1-9ef0-0dcf3abb697c} - {53b6a984-9b32-46ab-a047-e1c029681c00} + {099edb1e-ec34-46a6-8366-0054a2111095} - {1d490fb5-5dd7-4cec-a6eb-d555c565d23d} + {141df11a-76c5-4a2f-bdfb-148bef04af4d} - {cefadba0-346a-412d-8d98-e882c0af00fd} + {4eb6a730-64db-495b-a0c6-9230ead1c66a} - {2d49e570-90f3-4128-9930-2779dea1d268} + {3a5275ff-c0bd-4884-a7d4-d6dc468e9dfb} - {80398c21-c07f-4946-8f8d-c7e9ee337097} + {f0dfb05c-2212-4de1-84e9-5f7a9a1beedb} - {11149c6d-d2a1-49c1-9369-29da497ab5f6} + {14bfd489-e508-45e9-8fa9-e64ba733ed5c} - {4ecb6304-dfbd-4f81-a042-0d86d94cad81} + {7a78bf1f-64e7-4744-9d68-b6d20bae2be9} - {9b78cebf-199f-4bef-ad63-38a63cb196fe} + {aa83b334-eb79-415f-8ce3-7d3cba7192d3} - {e8ed9441-bb0a-4a6e-8159-321ea7e0a464} + {de98e7ab-6b19-48b4-8148-0c5db58db51d} - {78f30761-3737-4422-8f6f-dfea9bb5e9a9} + {69be502d-eb25-4687-8da8-e713a50a432f} - {560ab759-9571-439a-97c3-464caa37116d} + {fb366e41-f060-4f22-bb55-122749703ffd} - {8b24fa34-86c4-4e8b-a21b-43a0940d0490} + {67b2e328-6402-421c-b85c-b2c6aa60ceed} - {55ff8c91-d214-4dc9-be43-95815a883e5d} + {71061705-e313-42d4-8973-738e5137f398} - {34f4ce98-8f7c-44b3-b78c-de2d95e3e07e} + {0db3d8ce-8868-4c32-8186-f1731604f416} - {d4166d0d-644d-4989-9a00-6a32110fa402} + {274323e2-d48c-4cd5-8663-965bdd4224b0} - {d4aacdc1-add3-480c-8988-d97f2c181d4e} + {4543c2c5-6857-477f-a757-2fc099e4f40f} - {1b0309ce-f4cf-4974-aadf-fd7d57b7ec79} + {bfd39d4c-0caa-4b1c-95af-065b23acdf95} - {df5e2710-b430-431e-8c8d-efb97dfd2c8d} + {900d5497-0eb7-4d19-8f8e-1094d19a033f} - {a505c550-3691-4c01-86b4-e93202247764} + {f8681033-99a4-4414-923f-9fad50379a01} - {dd42d40e-49ca-4cde-8180-20a3f207b4d4} + {e26dbe75-e5da-4089-802f-0106ff4490a7} - {c053a2fe-1c89-4a84-82cc-6d8674ca6357} + {759ff606-424c-443a-8ebf-1db4bffa74d7} - {288478c6-a3c5-4eeb-972b-6311c5be28e8} + {04abb1c8-e790-4f6c-819b-0471bc3506a8} - {6e24eefa-d64b-41e4-aba1-1b672968974a} + {60fa7c7c-d1cd-4b21-b1e9-8f59931678a3} - {ee863cde-cac1-4c6c-a713-664a3e5744b7} + {7e8036aa-9266-4f62-88dc-1a0f4bcb6eeb} - {1968f43d-466a-42f8-acd0-62299a3fcda4} + {94e64360-89c6-4944-ab69-617f976aeef3} - {904e1418-0dfa-42e0-a1bc-80d687e86e37} + {42629d79-9f66-4277-8e48-e0294589fbd6} - {57e1f554-e038-4120-ade5-6162edcc698f} + {a33549b2-87d8-4794-9719-46e1486125c1} - {9b6514e9-d3bb-41e1-98d3-214d2f3f2195} + {f340c5b0-8c41-40d6-b07d-f0a5deae7537} - {12b0b59b-f7b5-4d3e-9993-3f16dda03104} + {aa62bf7b-7791-4133-a097-d2b74191745e} - {0ea32e94-5e98-4f67-90b0-549c533ec351} + {1053cf08-a772-4fb4-8c05-6ace2ac6e697} - {d6326ebd-dc8b-4d81-94c3-a34dfaa1df52} + {ec312552-1cff-415d-9693-6ebbf323fbb4} - {398b73d6-8856-4a3d-9660-578efdeb0f35} + {fb694230-84f0-4c13-bbe7-47e9e94180bf} - {2f602c7b-3615-4a23-a999-ef0fa98ba657} + {c75db769-a0c6-4d60-b6bf-3b343d6e502d} - {91083473-8fd5-444c-ba11-8d3711b068a7} + {2f5b45ee-f207-44ca-a238-a32f468a34eb} - {3650e86e-d25d-4dff-838d-84e1f9b77a96} + {4dadbdd5-6d13-4fe9-8812-e432aab0a95f} - {51c6d4c9-2739-4d77-9536-c323f1789c5b} + {dd2fc49c-1d56-439c-991f-f43c954f04aa} - {1b8cdee6-b49e-46dc-8d2c-308655669311} + {bc28ba52-bae5-4572-811c-eeaa8714da81} - {bdd4aea8-4484-4926-b280-4f5534666c15} + {8563f3d3-e013-484b-954a-8f673be61be3} - {2fd022ac-1eff-49eb-9a98-c5c8ad467ef7} + {743e478b-c48a-4bb7-9b69-1ac308e0be1c} - {a24fa80b-da35-447f-91f7-adb3f924c5d8} + {e5d2f007-af88-4be5-8b38-6fc34b691dbd} - {4cdf6d29-8d61-477f-9725-dbfc07c3c698} + {86b09f3a-b27a-4f81-8e49-4c85023a42db} - {626eb80a-82d9-4fcb-8bbf-1cf65f77303e} + {d5680642-b45f-4ddb-9535-1dca3edf86a3} - {28344f70-fe0b-40ab-8463-736a94c62787} + {7fc26f29-dedc-4aef-9a23-e3c4385ac80a} - {feb037d0-4890-4269-b44a-b0488b7a2aaf} + {ed0b4bf3-7fe6-45be-bfc5-24564bae6d08} - {bf2805cb-c80f-4364-b6b7-6de732622485} + {4a65ae36-6317-4f2f-8c64-cae2acebe68b} - {acca8587-3a3e-418a-b658-92b35554d400} + {c7956709-d529-4849-88bd-bbb76191c9a1} - {597a9d97-133a-438a-a1d9-9ebf746e07af} + {5a4fffb4-6f35-4280-bb68-6534e3f38200} - {3802cb30-68dc-45dd-a842-393dc17ec9c9} + {301825e2-bf14-43c0-9fe0-e37548ea8b78} - {d588ee82-751d-41f9-b18c-a51cfa6d567b} + {3280dfd2-a898-487f-9fc8-9e872c258b68} diff --git a/Net/Net_WEC2013_vs120.vcxproj b/Net/Net_WEC2013_vs120.vcxproj index 6bd5511be..c9eb556d0 100644 --- a/Net/Net_WEC2013_vs120.vcxproj +++ b/Net/Net_WEC2013_vs120.vcxproj @@ -131,11 +131,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT diff --git a/Net/Net_WEC2013_vs120.vcxproj.filters b/Net/Net_WEC2013_vs120.vcxproj.filters index ce772f283..20e2b5ca4 100644 --- a/Net/Net_WEC2013_vs120.vcxproj.filters +++ b/Net/Net_WEC2013_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {3676a342-4dd8-4bc2-a1e0-3238d89bee4f} + {77153a5c-d424-43bb-942b-40a8c4e4cd2a} - {dbcddc6b-df8d-4ca3-9256-730fb252c3a8} + {2a87ea99-d685-43eb-b1de-8169edd6c940} - {7f680f25-914f-4c05-b66d-69cc3f43ccb1} + {12e4a3e4-8493-4205-9d79-03ca527f2980} - {9bd8d4ed-d602-4b10-a647-5bb45ef45db1} + {9fc44c50-9458-411d-a9a3-34f9cf64e213} - {01960f71-de2c-4b9d-8f4a-b62d1532097a} + {146be349-82fd-4cad-a2ba-7ec984da92b7} - {9dde2206-2b9b-40aa-bb2e-6204f2353854} + {5b91612b-8692-4b2e-9d54-8905bf492fe2} - {e8932198-598c-4696-a240-0c96579248e7} + {22060a40-32b7-451e-a965-b34298edb9aa} - {00c63640-548b-430d-bb1b-5d3989fb7ba4} + {bef68cdf-5fd2-4c4c-88ef-da6cd281a118} - {f9af5f6c-8351-4659-8272-2fa98e502dc9} + {fa32a4f6-d2b0-41fe-b55e-049324830227} - {20328a4f-b110-4926-b8b3-add960174082} + {65033e37-f67a-46cf-8348-5c1878240758} - {af2a8a2f-a86a-4f20-b42c-675bd660c0b0} + {26e5a1c5-d3b4-4dec-a968-460d9b5b7d05} - {2b3992f1-51cb-4abd-b2aa-d25ef83fb7b8} + {26785cdc-0c6d-4440-847e-64e86b239b2f} - {825a3124-c229-4d78-9ddd-36e88c51061c} + {166ba997-aea2-4d49-b2ff-3febe7cf06e0} - {4a5ff4a2-c226-4c64-8dc6-9a573f4a8101} + {9c6f027a-a405-4a04-bb5e-fe36a2d21e24} - {8bcf301c-f2ba-48ff-8b16-de10c3478d05} + {94182c44-f74b-45bb-ade8-d7e6f097329a} - {ef875ca6-7cde-4e5b-bddd-52661d3a7238} + {cbf2bf9a-b8d6-4a9e-86f6-76188e8c4324} - {712c8163-55b6-43a5-9b42-95dd99108d3e} + {6d1c8979-43a5-47dd-b276-8db25ffb25ed} - {824b24cf-4dbb-4ff5-9f30-7f1a015bee3b} + {b6fd125a-e6ce-405f-b9d4-afdbc1790446} - {af8228ec-88eb-4f1b-8f68-6c1c7179671e} + {c3c1d07e-2243-4615-9734-5fe9161ab26d} - {33a705d4-0585-4bfe-bd1f-94d89e4fe3ac} + {fcbf651c-d161-4dea-8df1-b197f9045674} - {5d03da1e-5735-410e-8f4f-a4cb2d450d62} + {3c610d7a-851d-4222-aaef-98d5816459e2} - {c8292b0c-6fb9-422c-906a-82ba3dacab1c} + {9e15ab0c-cff4-4d17-8283-b26d365e720b} - {f77c6343-c702-4f17-88ff-4221e8d9d130} + {9b54783a-ba50-4365-918e-0656d1034f24} - {db841b36-fd49-49a3-a77b-89e1ac69492e} + {9e302c48-c1de-41d5-838e-9f9d0733c7b4} - {d61fae43-579e-4bc9-8104-53e7ec59cabc} + {b4db7853-b237-4efd-b940-00df54f54989} - {0d0e0fe3-37bb-4dd6-85d4-242fc900b6bf} + {27152cae-c7dc-49c5-b7e2-c7c11cc1d34c} - {33cd7199-02e9-4f09-96cc-3dfa5f06d3ed} + {5cc39665-044d-4db4-b9c4-1196a9d6b84e} - {53b858be-d9f1-4128-bfae-bdbf5634ddfa} + {e77dec1e-f117-4a8f-a5e0-6c3aaefb3a88} - {367af116-b22b-4057-b5f9-eb588d1dfbad} + {7df014f2-f107-4aab-af32-dd950ed6392b} - {d5466b2c-ae71-404e-b033-cc0413838034} + {257f1575-8cc2-4a0e-8526-f81a4a56e1fe} - {bd0ae4c4-6c6e-416f-8d67-0349b4fcb861} + {ef6cee98-d798-4a78-b5d6-05f287319a39} - {e9a572c8-85fd-4e9f-b9f2-fa82dab73565} + {3c3a532b-27e8-4877-ab34-d47b39d86c3c} - {d82a4dad-0041-4a8e-a8be-3a6b9a0f774a} + {3d5aa206-d8da-4fdb-b2bc-eb1933232d59} - {14836deb-4fd8-4cb9-b3c9-acd35a9e1b76} + {aa6dfefb-1f33-47bc-89c7-d05a2a207892} - {e68d6eac-8bb3-4e4f-ad07-6d055d8176a3} + {6693a8f7-4f8f-4264-aee9-b3a4bce7df1c} - {f49faf7c-cf32-4059-933e-0acc81447e96} + {b0deffd8-3148-480e-ac56-45b151504e86} - {1380633d-b55f-4ccf-9bd6-5b5ce7c0e823} + {1d957851-7495-4a25-a669-de30860b7553} - {fcdaaaea-96ce-4c3f-82dc-33fb825c5e4d} + {7b245079-2257-495b-a494-46a3df3052b8} - {34b644b1-08ef-48c8-8d91-cac78daaf4d7} + {8a48c53f-b685-4e04-b5e1-cafe2dbfc526} - {aba630a5-b0ba-4bb2-ba88-8b690d8a7a7d} + {874e5c53-372e-49e5-91ca-2b0a0f7373d7} - {d7e238ba-2181-478f-a186-e82af46530c0} + {11c26b9d-ff5e-4042-a29f-acfc9e676b82} - {50ba35cf-0988-4940-bf62-80f8a6b889a4} + {2432c72c-70e0-4fb2-95ac-fbc8d3ee9770} - {dc83baa1-6a5f-4a0d-917d-77ec8de93af1} + {0c7db64b-3541-4626-9375-501b61d3feb8} - {28854397-b25a-42b6-b523-e9ae2b2c2700} + {82264dfb-9150-4d6b-8909-187ea54502dd} - {eed10270-52d0-45b6-9990-8c45dbaa1e89} + {33cd8682-e0f1-41ef-b980-110fa1be817a} - {2693de6f-ea20-48f4-9fe3-65e98325356a} + {c0fac6ce-27c6-4cac-90e0-dcbbd6ce32f6} - {da4c13e1-08b3-420c-a7c9-98a3ed8c5d43} + {d0c8cbe9-c3e9-47e9-9abe-c3193fe716fc} - {7d971a52-1bc8-4b09-baf6-1fffae303042} + {e4c98d4c-f8da-4d31-9422-80120df5ed20} - {a0a35f74-4701-4840-b5ee-ed3a32d4d6cd} + {d945dcd1-69a2-45c8-aad8-de4087c0494a} - {a68ae566-fd54-4411-bfb4-08593672125c} + {1e2ec62e-7e8c-49b5-9191-0d320e02c9ed} - {d7ae2162-63cc-4c88-86e8-4306dba9d33c} + {807bdfca-f85e-4c80-bf6b-406f993df574} diff --git a/Net/Net_vs100.vcxproj b/Net/Net_vs100.vcxproj index d6945c87e..b41893121 100644 --- a/Net/Net_vs100.vcxproj +++ b/Net/Net_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Net\$(Configuration)\ PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoNetmtd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoNetmt.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoNetmdd.pdb + ..\lib\PocoNetMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoNetmdd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetMDd.lib @@ -271,7 +274,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib + ..\lib\PocoNetMD.lib diff --git a/Net/Net_vs100.vcxproj.filters b/Net/Net_vs100.vcxproj.filters index bffbcf0e1..b8a891bd5 100644 --- a/Net/Net_vs100.vcxproj.filters +++ b/Net/Net_vs100.vcxproj.filters @@ -2,157 +2,157 @@ - {5ff8fe1f-3f09-498d-94da-0d7213828d83} + {8b75afb7-4d63-4afa-9818-7d0d8b744910} - {ec4de8b7-e968-453e-852b-aa728b31db85} + {90f5bac0-d34a-4c14-93f3-38111f3e902d} - {5ce6070d-019b-405a-840d-ba95e0bd51bd} + {c772edff-76e9-44d2-89aa-45a77e2fb1cb} - {013a4193-8b39-41dc-ae73-569e4167f37c} + {0ce18d23-01e0-4492-b05c-85e9d1cb1cce} - {9292700f-4f7d-4140-9396-4b4f1e4d106c} + {de70da02-25f5-466e-b94f-cfb28874e208} - {a69ab93b-2b89-4cd7-8a14-44a9feb1d67e} + {da75c534-ba04-461c-931a-247852d066fe} - {c577c8f2-844e-46bf-b36e-815a36e0d1d4} + {d85b3922-0ea2-4933-a3f8-5de5cfbcf941} - {7e5830bd-65a0-4849-83b1-060a90b51e6e} + {82d0231d-5063-4c2b-a108-db4659ce2120} - {7e46754e-c766-4a89-82ee-4da6d1b4d7dc} + {fa67db8d-c915-4dd9-b376-c5e1fe7222d6} - {82d0a8cf-5f52-4fdc-92ff-e2930da269e2} + {67da1686-83be-4fb4-8ade-45d91f3dd269} - {f9fa3d9e-226f-4f50-830f-fe7fc44af1bf} + {b8ed1ee7-6fa5-4d02-b382-64a9ac1be1f0} - {f960a76d-6793-4a2f-9c96-4576c1cd1d97} + {e27cc788-2966-49b5-b53e-437f2347762c} - {317770ba-6496-4190-b5c2-9ac2a3db57d6} + {5a30d6d1-4a5e-46be-9815-f5207c3963dd} - {a59d48d1-aa9f-4626-8fdb-a0b392e58ccb} + {4d30a7e3-0357-4737-9a20-f00b11c5e2c6} - {48b3d011-0fb3-4a1c-bd61-088cb50350d8} + {1992d5f5-1940-4ff2-a711-bed8da7ebf04} - {ec71b626-cec8-46a2-af29-5eb455955190} + {6d7e8bee-c62e-41a3-8db6-ec4aeba048a1} - {9d228688-4862-437a-bbb3-b7af5298855d} + {e08df307-3797-46b4-a637-689abe45e4ac} - {116373bc-3370-40c9-8964-26802057856e} + {35306c41-a418-48d9-ba2f-078c6069da56} - {bb19b823-2c94-41db-9c7c-77006b299bcb} + {b308911e-b49a-40f8-9625-56dd14c92fb4} - {3a790362-0c54-475d-a50f-13f4cbea89a1} + {39cccbdb-4c83-40bf-af6e-ac7fcd2387c9} - {f91e4ba4-b4d3-4212-95fc-9b6353e88a8e} + {a41c4011-def2-421c-8ee1-97a245901183} - {b769b517-f7e1-4ad7-a1a7-0bd85b41de38} + {02970347-1d69-4bf8-8516-8d05a1a44075} - {87780dcd-a850-44df-953b-16a882a826b4} + {098255ed-6583-4460-8dc5-89eb23d8a3bd} - {546189d2-ffb7-4af5-ad2d-661e130f4195} + {aff2235d-1e84-4a3d-a621-d53cdbacdd31} - {200b545a-3a72-43c6-9201-d597d82aeb6f} + {69975fd7-5cca-4fb1-84b5-79f551015ea4} - {90466f37-39aa-4e16-add1-f20d9445ab2d} + {187a52bb-3a83-48ba-b1af-e038b520b893} - {63dea846-8c09-407f-87da-05d42ace9b86} + {60c50834-bc97-4fdf-bbd7-5db9e9abd5b3} - {5f59fceb-4c6d-4343-b55b-119b7fc48ed8} + {83be59e7-f298-43a7-82a9-029d316d181d} - {df826d6a-821d-4646-8c46-a42e4bb3c741} + {d9d8062b-ed41-40db-b4ec-909b95b34f95} - {ac20b883-9948-4c85-a947-b74d10119137} + {60c9e0fc-4661-4c42-ad94-a29ece01f295} - {ad68fec5-4e1a-4cce-bdbe-967ce0ce12ca} + {b65624ea-6ce9-41b8-aacf-b74e1503bd8d} - {9b2fc36e-4b87-46f3-8014-8a9e46925e92} + {0fe5cd40-c7d2-4859-a7f4-7ec81b6f2f0a} - {ca5f206e-cbae-4124-83bf-8fca55851f3e} + {0458cdf4-82a0-4c66-9d85-69be3245eef3} - {de011416-c701-492f-8e15-e4bf86ef39a5} + {9a9d5b26-1cad-4137-a0f9-8128366774fd} - {731a3e55-7233-44a0-8c22-61e518c9ebf0} + {99fc3967-ab82-4a9a-8ab7-5215effba592} - {564c4655-7ee8-4031-9e99-67bb167e3675} + {4d18b68b-6fc0-43fc-b644-af9cc4987eb0} - {9869a02b-d22b-4e7d-be4f-4a981016c476} + {a28d1bf7-bacc-4cd1-bd39-e7d72fe56b0c} - {c52518ed-9645-4a33-aa44-6a24915432ce} + {938b2677-9c35-4673-9a2e-94dd4ce387b8} - {48534181-183f-4695-a33f-3736178e9c16} + {cbd87b68-4d10-4ae7-976e-4f37cf685b0a} - {c7c2a948-98d6-423b-9848-27247e31bb2f} + {82b11b46-7497-47c5-9f0a-e0e97b15090f} - {d44e554e-e364-4f8d-a698-3321948163ae} + {8d45e4f4-9bde-4c73-8025-c16a818a5e27} - {e5023ca5-01fe-4417-833d-4d74515a8c32} + {d9c3f1b5-c468-44e0-a96a-886470acf1de} - {a654eb85-e616-4dba-8788-5103675f6647} + {e5f1a1de-0bdc-4eed-be4f-0406b2649e9e} - {d3bd7103-46b0-4857-ac2e-afd5e7d96868} + {a252baed-9a88-40ac-ad17-37a10a2ec45f} - {6f0b495a-2df0-41d9-b6d4-160836a8c4f8} + {c87534f2-373b-4259-8e06-e43d479ba182} - {1d4f5f97-be7a-4b99-b5fd-7ecfbf3efebe} + {115867b7-5df5-4823-bfde-66931ffd792f} - {d95385aa-0501-4990-9139-30b77d1b0010} + {9053eae4-936a-4e32-8e55-cb69f52484b1} - {9adb438a-55fd-4483-afbe-c80a39b784f1} + {2c917711-a53c-4d26-b74b-dfde3a7484ae} - {e4838636-9763-4512-b330-6851dac3a306} + {fb9d2cdb-88bd-400c-be18-472c4488329d} - {65898326-f73d-4838-b7c7-cdda2c001e21} + {a9d374db-325c-4604-9f1c-a23b0f174f61} - {2842e08d-faf4-4106-a46d-05bc01ad0ca5} + {e3582bca-bcc5-4804-8a12-3120a1145619} diff --git a/Net/Net_vs110.vcxproj b/Net/Net_vs110.vcxproj index 100105211..444aeec5e 100644 --- a/Net/Net_vs110.vcxproj +++ b/Net/Net_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetmtd.lib + ..\lib\PocoNetMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetmt.lib + ..\lib\PocoNetMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetmdd.pdb + ..\lib\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetmdd.lib + ..\lib\PocoNetMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib + ..\lib\PocoNetMD.lib diff --git a/Net/Net_vs110.vcxproj.filters b/Net/Net_vs110.vcxproj.filters index 434070cba..ab2931906 100644 --- a/Net/Net_vs110.vcxproj.filters +++ b/Net/Net_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {1741a8b6-5585-4cc0-a32d-be7a78cfa15a} + {88129c6a-ab1c-42af-bdd0-ee75e8d8205e} - {874f7b10-5d5a-44d6-acac-c1ebee338b50} + {bc5c4ec7-4856-4db5-ae6a-e5ab7ce74bef} - {750ec2c4-b600-4d00-b5e4-2b0887c5857c} + {742a03fd-e728-4f1f-858a-d415ff5f8e2a} - {7285706c-c684-46a2-b506-468be8de9d1e} + {fe8170e7-61d3-4de2-a2ac-6a495de194e3} - {b5eda20d-5a0d-4ad6-8549-c054b49aeed0} + {9e04ab7d-2688-4aae-a9f4-0edae61601ac} - {364e3f1b-382b-4364-b9aa-a9030bf7966b} + {101986ec-926b-4c13-8f94-adc0a87e4952} - {bbe0fcae-e54f-41c4-9762-7dd6c71a8123} + {11b4c412-6303-4fee-b99d-3de136fdf75b} - {37a8aac0-ebbc-482b-81c8-3fd656a8175a} + {b5ce4d8e-4ed8-428c-b167-bbccc605c6ca} - {a5333a6b-caa8-4fb2-be3a-ec0410bacf58} + {0c922f3c-1085-4162-9ec2-126cbec2669e} - {a315be1f-7534-464b-949f-037664a99ed4} + {bc4b6207-824e-48ea-95c7-d4e744014fb5} - {2283189b-6189-44f2-9b00-2eff9e24a45d} + {d437c488-f63b-4691-a9af-ca7d7c4c38e6} - {940b85aa-8f80-41cb-a633-9c8f82f48b74} + {d6b0a0af-1d02-4673-9d01-13dc9964c517} - {f89d8229-5886-4d93-ac1f-dbb13ca97562} + {4f566b3a-eb53-4d48-860c-7b1419cb26c5} - {59af1e84-81fd-4faf-989f-5527773f7bd3} + {36875626-1121-4504-b4cd-1c3d9a3c7752} - {04b21335-e033-4abb-825b-e4b499aca726} + {07508d64-f477-4e59-a932-65a2ec238051} - {7bfc2818-28c7-4b03-aeed-d137bc7160e9} + {4a1fc226-eb5d-463b-8b25-df031fdb83cb} - {73d2c1de-3a90-4344-852c-9e7630a63d84} + {cd3fe2a9-e9fb-4ac9-bd3a-d3d5bcd0cd9f} - {ff53aad6-a46d-4ec0-8ce8-f8261945bdd2} + {809d10fc-326f-4aea-ad79-538d35265861} - {ed0fdc91-7329-468f-9f86-474c9e1718ce} + {092e9d9d-f66d-4469-93ba-dffd762629b0} - {0b122975-c39b-42bf-a27a-648d94a853f4} + {16304b8c-a6e4-482f-9ee7-eb43b0792d0d} - {7237a480-7250-4c06-896b-7ce80ff60bdb} + {816a320b-f9ef-41a8-af9d-3707aaffa9b1} - {3faa20ab-f86e-45e7-ab00-97ea032b9519} + {275f66de-b8e7-41ba-a223-814709fcb36e} - {fcf4f437-a059-4a1d-b15b-bf838a013c39} + {fe46dba1-aabc-4918-9986-a6a1ddad41a8} - {c3c030d0-0872-405e-8e84-c8015721de12} + {c8c06832-39c4-4b65-b5b8-eea3cd9f32d8} - {129ff19c-336a-4346-9d19-a53160a15df2} + {6febc50d-73f1-494c-9279-9659b304b0fd} - {5c569d9e-dbde-44f5-bdc0-a4b64302367c} + {1b5a2320-08ae-4633-a5af-d31a5ffdc968} - {03997f36-9d28-4d73-abfa-8b7e136e0c13} + {d60b06fe-d1fe-4aee-9c1d-ebebac4d17cb} - {aaccdb21-b949-4835-9446-af733a094dd8} + {3889205e-714b-46d4-9f85-0c28bfe1b683} - {df3b0240-ac49-4a60-b562-c05c99f224bc} + {91801272-7f92-4665-b7dc-d9ca0bd09378} - {88ba3f71-1b04-460e-be7f-03d93f313c59} + {e7323059-49a9-4a8f-8d08-0ac2cb27e790} - {789457be-64f5-4f3c-aa28-9b2d6f98f164} + {4afdb3a0-fae1-446b-add4-c5d14aeff23e} - {b4d6f911-7862-4f6d-b374-8be479e8e9e3} + {1421c052-fdb4-48ee-ab03-973b70d5287d} - {a19c812a-b24a-47fe-bf06-5b7accced2bb} + {eba10555-c058-412d-a73d-76b6a3e74dea} - {08d53403-bb74-4645-b538-27190d05e4be} + {308c5c4b-8de1-436b-82ac-9b133b51f7a3} - {afb4fd36-4042-4f7d-9bf5-b73d38dd4917} + {28a5ff2e-0d67-4ec1-8d94-0ecba32e76e5} - {9176e292-bded-49ab-9888-1d3d237d952f} + {4e641e23-417e-495a-b79b-3d08ebffb2fd} - {805dbefc-75b1-45e9-af20-69f3c8acab87} + {3bbf7ae4-0f95-409e-a853-672b5cca9908} - {04750761-d89a-4a17-87cb-dc6bc0792de9} + {ae445847-c10f-430c-a16f-5ca543b46e91} - {ea69567e-1b8d-4168-8cdc-70c48947c8b5} + {41250eb1-b787-428c-9836-bc37ff2474df} - {b55e27c1-b4e2-4177-a64f-9e23c8f7587d} + {e738d59a-c64e-4b26-8408-4446bff4f973} - {d730ed84-3aeb-4086-83e4-75300427b893} + {de2a8fc6-dc9d-408f-8c4f-83d0a03dacc6} - {e9bb4d8a-f663-44df-b229-78430e21d14d} + {0f3e2867-01e4-473a-9b5d-494d50b63692} - {edbee8e6-0252-4785-8598-c5ed49f14adc} + {cecafb22-837f-4e75-a55e-0403e3b62535} - {4bf38079-e7f1-493c-8ad7-a392336b223d} + {40b73d44-2059-41f0-875f-7ea107508d30} - {7a2cb894-4b84-45d6-9bc1-a344f8310f10} + {60199096-7ee4-4ca5-a213-1fcdd6fd8e57} - {c6d6b9b0-1781-42df-a404-fc34726eee56} + {3efc288b-7cbd-4490-8762-86fc5e7ed8ad} - {4151427a-177f-4b1f-8b47-aef9a58dadd5} + {71995680-589e-4993-8141-697cd0475b4f} - {70fa3d7c-2d17-4d43-8474-e9d219fb3f16} + {c63d3f49-590f-49e9-bef7-a5c667b7f16d} - {a2586a9e-8018-4177-afd3-fecaa0600969} + {a47d58a2-0fe8-4481-9a7f-1a2a98084425} - {2ebaeebe-cbae-4247-b644-f02b3062fd92} + {33960774-732f-43e0-b5c2-d20f081f63ef} - {0b0684f6-9da6-49b0-a70e-7cd5cae34a0e} + {e4be08bd-f00a-41db-8578-e4639480a1cf} diff --git a/Net/Net_vs120.vcxproj b/Net/Net_vs120.vcxproj index 8ca181ca1..c463e4e61 100644 --- a/Net/Net_vs120.vcxproj +++ b/Net/Net_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetmtd.lib + ..\lib\PocoNetMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetmt.lib + ..\lib\PocoNetMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetmdd.pdb + ..\lib\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetmdd.lib + ..\lib\PocoNetMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib + ..\lib\PocoNetMD.lib diff --git a/Net/Net_vs120.vcxproj.filters b/Net/Net_vs120.vcxproj.filters index a3f0eac6a..39f9cac66 100644 --- a/Net/Net_vs120.vcxproj.filters +++ b/Net/Net_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {c1fb6f03-0cc5-4487-81d4-d3ffa5263aa2} + {43806819-3df1-4336-99d4-643b2b05d5b6} - {6eccec80-e79c-40d2-b5bd-6c1b2b150835} + {b12de80f-5ce4-4c2f-beab-131f5b2f7b3e} - {c95524d4-6bb9-4ab9-b105-8f6652a91758} + {09dcb513-f760-44c7-9ffb-74aad2bb0fa6} - {ea086ec5-a8a6-4564-9098-4fc88aae9e85} + {5cee6567-b974-4654-916e-6a1a5a0d70f6} - {84bf1dea-3acc-4d31-bee8-e15b4f6ca334} + {c0694ca5-db9d-4527-9950-c81a3b6bab8e} - {1f1ca25f-ed59-4fda-8722-d27a7d5ae6cb} + {6dbad270-9558-4306-8792-183211139f04} - {ef9ff71d-7498-4cfe-8dfa-0e2cd7eae454} + {c32aac6c-a039-4782-b2fd-0055c3a57d38} - {31b7f5cf-35c4-47b8-a28e-a4f613fc23cb} + {f7b2f4b4-000b-4804-bbb0-be6723153518} - {8fda26ef-0457-4406-9928-4d0ca5bd36f2} + {2d0ec723-ca52-49a1-9217-b80187e16760} - {29b719f9-7e8f-464b-b0e6-a12832edde51} + {6c99fda8-3fc1-43a9-8b0a-b993cfeb28bd} - {d59b36d0-3bf9-4c70-a2a2-83ebca6190fe} + {9abc784f-1da0-44ef-a94b-517f40d4cfa0} - {82ac1485-5625-4596-bf01-32d4dd4551ed} + {0ea38122-282e-46b4-bd38-8e644cf5fe82} - {7bd59e57-6ba9-4241-948a-2d5225ada9f0} + {2a4a899d-4e0f-4b55-b0fa-a8392bb53364} - {6db2f8a4-58ab-4d4b-b4ee-6b8c44bcc77a} + {919518e6-d4c1-4dc4-8b57-7a51ed5d5b8d} - {36b7d68d-f4c0-40f4-b2cd-c05415494fdb} + {86acfcc7-8c0c-469e-a0d6-c2976d2f14e8} - {f5fd80dc-785a-4116-95de-9ad5e5e30e48} + {c1f0a580-eed6-4b2d-8adf-f9b628ccbfee} - {7b40f305-799b-4817-a0a4-f8dc26ef8280} + {d51343f6-70bf-4e52-8711-6989a93b62b4} - {26cf0d51-d3a4-40c6-89cb-823ea29a3b32} + {56940917-de65-4a3e-8808-22b2486342a6} - {a9ab6bbe-035f-4b15-8308-23c2d5c5c5b0} + {3d257abf-dcca-491b-8700-f0b470227c6e} - {97449afa-7e3f-4a94-bf6a-bcf8b3c559de} + {b1f8fc21-2ede-4c2a-9b50-cf46d284a139} - {cbee46b4-10cd-4e85-b213-775b18a48b27} + {a5dabcba-3aa7-48e5-bc9c-c681c56508d9} - {978ec966-0baa-4eaf-9bec-46137094e40e} + {b5189803-3739-421e-a238-8f69967db5aa} - {fb5e87e7-9fa3-4a1d-8b12-81b8975a1bb7} + {89481981-fb67-475c-a938-9fbcea4592b8} - {ab7f35f6-6531-46ba-9112-dbe1adc17a86} + {935026c6-5ef7-4607-b92f-b8837e99d9d9} - {39480011-37d1-4e02-a1a8-46ecaecc1b70} + {e0ee9f1b-381c-4d93-a5e8-a7aa82951e79} - {4da52bd4-4425-464d-a2a4-bcf0c7d583ec} + {dc671fbb-a0be-4e82-8909-1880fb5871ab} - {4e056c46-8c43-410e-8992-a2557bb5085d} + {9675384f-0860-4d62-938d-2c553eecf0ea} - {384c70fb-efe6-47f9-a767-b77a8c90913a} + {1dc7325e-9fb0-44ce-a05a-6635f33c3a0a} - {1c676956-7790-4573-8f64-261637e0e995} + {5e99ddb6-0ca1-4c55-b68f-bfe1ef0833b4} - {98a353ee-344f-4d52-b659-0c34206236fe} + {adc67842-efb2-4159-a12f-5e4334c78870} - {094f6cd4-ae17-4bb8-96a2-ba28b28bafd2} + {fbca1611-ecb9-441f-b6f1-df4e068454f8} - {cb531016-361f-4552-9f11-89acd0e84789} + {ed11814f-0e3f-4ad2-aede-847ec6adfcc7} - {42e3ea54-43b4-4947-b769-5b10904e266d} + {b53dd0af-d4ab-4087-ab74-57826576c524} - {d216f153-f522-4996-9487-9900ff406971} + {4d5af71d-0afe-464d-9c60-ba30e9c0917b} - {e3c44bbc-9fa5-46f0-8e2d-46f96215dd5c} + {178489a7-1bc2-49fe-87f9-3fbc3d822c88} - {8c331d5e-4bf4-4a5c-b3bb-63cd7e697245} + {5dfd44c5-676e-4388-b53a-08781868648f} - {3f978a84-d201-4935-98d0-81a6270eaaf3} + {bbe76ac6-53ca-48b6-882f-59f5a48628fa} - {0ce8bf97-eaa7-403c-ae0e-acd1e280ffe3} + {110f9fde-69d0-450b-b93e-7c3d42ccdf26} - {6a9d9d39-df6e-45c5-9699-a80a75455ddb} + {b48a2261-6868-4d54-bcc2-e5c1f80279ef} - {d40068bc-3c03-4c4d-a98a-7a74986e78e8} + {a2c6cc1b-5d81-406d-8ac2-52cd1482d708} - {4ed68535-ba22-4131-859d-93c0df8b0bcf} + {995967b9-397a-46c9-9470-63d7eefacfe9} - {c3abe62b-e76e-4b0c-9507-fdd522832504} + {e06a0a52-7981-483a-8a30-7e8306b1cf92} - {bb5d3aa9-b003-4597-880e-52dc6df89a52} + {12ea90b6-b331-4305-9d1e-49ee5b391f93} - {b76a70ef-3488-40a6-aea9-cc7830c9e216} + {0f549f51-f114-4c99-b599-d732c6504474} - {8842de24-0127-4ab0-8293-d3afd6cbb608} + {75fa02e4-fe9b-4ea7-88af-324bc378debb} - {5d6c5273-3993-4c57-9706-4e6055cefb70} + {4bf45887-d3c7-4063-8436-9d429db68494} - {775a1383-309f-40ef-8b7c-f45928f25c48} + {f68e5249-8c2f-489c-a01c-e23d707c6818} - {76640450-b88c-4a37-9119-c0e3b8cfa197} + {6c8a331c-4ffd-4169-ae4d-03dfd6c13a41} - {a95b5044-8a05-4a32-bdfc-8a6304f92567} + {e810427f-51cc-4271-9fff-b47571a54512} - {676e841f-3317-4021-86ee-084556dd8e55} + {097572cd-499a-4d33-a8f9-3c613d64495b} - {2a6c7bef-5aaf-41de-842d-716baf31ab9d} + {51ba3a8c-6e61-40a6-a085-99b7e3892ccc} diff --git a/Net/Net_vs140.vcxproj b/Net/Net_vs140.vcxproj index 95fc3ebf9..9281ea38d 100644 --- a/Net/Net_vs140.vcxproj +++ b/Net/Net_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetmtd.lib + ..\lib\PocoNetMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetmt.lib + ..\lib\PocoNetMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetmdd.pdb + ..\lib\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetmdd.lib + ..\lib\PocoNetMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib + ..\lib\PocoNetMD.lib diff --git a/Net/Net_vs140.vcxproj.filters b/Net/Net_vs140.vcxproj.filters index 65d9c1903..fbbed18ed 100644 --- a/Net/Net_vs140.vcxproj.filters +++ b/Net/Net_vs140.vcxproj.filters @@ -2,157 +2,157 @@ - {e5001463-3b0d-4f10-9c9c-df1d78ffaa24} + {58f07b8d-591d-4987-8012-26e567410c52} - {46c24d22-2a21-42d4-b160-e85833f3ef2d} + {1277d1b1-ae4c-4f6a-a9c8-a5eb75584fb4} - {64f1fc25-299c-45c7-ac0f-14b0ed956ac8} + {e23d6f83-2354-4f25-8138-8a231bf5792f} - {011aca4c-88b0-4900-84e1-734b9e6e9bd6} + {dcc5f254-be48-4e3f-af02-08ec9719443c} - {34ab49b7-2b6d-483e-a991-e6004c0ffb30} + {ab849314-e430-412e-bc34-28a7c29b922e} - {efc330c9-7edd-407f-8460-389a7ece3969} + {3b911743-88fd-4538-8279-6afdefbd0ce3} - {a6aade95-9855-4ada-8502-cebb70eb3a96} + {c784e2ef-eebc-4446-90ab-7a47fb3174ba} - {c9187958-ec60-4553-9dcb-c9b2cbf72ae7} + {da67aa69-9175-4934-9ea3-60d9f30f39ea} - {acb13a91-a772-457a-9204-449696aaf257} + {8de565ea-04e9-4780-bab3-53723399b34f} - {75fdb65d-0c51-4a0b-9ff7-2964a72f5f7b} + {5c9a6f38-9c64-4fad-bd39-82c991bdfb8a} - {ed212b76-48de-4603-ab7d-b0d1de81906c} + {a7aee4d2-605f-4e17-bd7c-a5f318afb5ff} - {60ca30aa-4a3a-4648-9904-c59f3b687d9a} + {2c04ab80-0e71-4b47-b756-9b3fc0da6db9} - {bc3dc356-640b-41b2-a5c0-6e5c65b9c6b5} + {c261dd88-7fa5-45e4-9125-509d6ce32288} - {9f0737dd-fca3-4a4a-9799-e08ee671fa67} + {8689db68-58ff-44ba-a4e5-fc3df0042ccf} - {ade2a8c5-0b64-4c14-91f9-9c0aea6a2a40} + {d47b796b-e1ab-4c82-8c66-f2d8a79f5057} - {337393aa-c92d-4ae3-8d98-0886a57340fb} + {6772c542-5133-49a6-9041-c2e71c65d5aa} - {e5289d86-9c75-48c6-b029-6ca4818c0e2b} + {b4846922-935a-423a-b193-2223576337be} - {d2c55a51-1b09-4e07-829d-abbbb257e34e} + {c09c0ebd-3d5c-4b0b-80f1-c1a364edc21e} - {ed6eeea2-dd3d-40ab-8c2b-7ff2aa12d743} + {55509b7e-f716-4e15-89cd-b0c190d4c193} - {0a44e2b9-3d40-42f4-97ef-4563af26f50d} + {3b49cf2b-0508-40d0-afcb-c0b506e427b6} - {d77929c3-26d0-42c1-b4e2-187c13889496} + {59080d57-f84f-4f48-826c-b0de8c6e70fc} - {6192da87-b3ea-4e85-92c3-a72941be14e8} + {c001f71f-a241-40f6-a9de-2b1931671127} - {5b33ba00-6863-44d2-a0f1-25cf737faf19} + {68f0eb6d-8211-41a3-b3dc-a1b52fdaf04d} - {758ba13a-c164-47d6-b1e8-9de9feef5a1f} + {24a9e6c5-e2fa-4307-bc7d-1ab526919204} - {b99012d2-0268-400a-9d5f-ec43d90ad527} + {08207235-3ac5-4dc4-89ab-a987878dfa97} - {4a5328e5-6e4b-4555-acda-7f268f7140c6} + {24ec1f61-c4da-4d97-8a18-3bd377d4eae0} - {4adc2cc4-312b-446f-a034-8f957c10a4be} + {82b26671-7f6b-458a-888e-f46f367eef71} - {dcbd665b-1d74-4863-a213-cabb25c66b09} + {e47152b2-73b7-4a3a-a615-ebf0fde24de0} - {c2a06f9b-57ec-4fda-8d8c-4fe1e8fe030f} + {11efa1c3-b35b-4a8e-9bbe-afe2d9500af3} - {4f459e19-fdd9-4871-8d38-f5a88227307c} + {863c280a-dc48-4fe5-9ae1-3fc13436b9b9} - {66d95374-d1c7-45e9-b2ed-afb551ebdb8a} + {e71a1a33-6d04-4f05-9455-3389cfbc2be1} - {f509fd81-87f2-44b8-b170-93b731213959} + {73d0cd35-d04c-439a-a3e0-1d3697244fd5} - {28cf0e94-c417-407c-99c0-00ab61666194} + {6cc47e4a-0731-45b0-91d5-126f03a1f5cd} - {72f38377-cfda-4fc4-9ef6-7f39cf65d860} + {c1eb50b8-d1dd-4f35-87e4-db8b0c8ff2d1} - {66d4a379-0469-4928-b5ad-31e9ed05c1eb} + {bf2acf62-b1c0-4a39-bc18-56051779f0e3} - {e94a73b2-cdf0-4034-8308-dc1bd77fb1a3} + {8f4cc8e7-761c-43b9-95d3-60042aed673a} - {1da846c2-6051-42d6-816e-f0666bcc34a8} + {2ddee7c1-54f6-4981-99f4-8192953f3bde} - {4c11dda0-bbc6-4fa3-949a-e45a9d1df7cb} + {3770849d-d812-4fd8-958f-b5f4bd69c7a4} - {cc48681a-9335-4d30-a99e-941879e46c59} + {688b7f1e-3901-4fc7-a118-c4375641001c} - {b63f31fe-d595-465e-8ae4-1a1d3df8478b} + {274d415b-12d7-475c-8c05-0a8e2be21154} - {6e03383a-98ae-47d9-818a-1c37ed1ef06c} + {dced0b78-c6db-4042-8d90-a60f053676fc} - {ead6f4cf-3410-4e74-801d-c1e4f13e7a6b} + {e0050ec3-90a7-45be-94b2-00dc64556610} - {b942da80-895d-464f-a4d0-818055a161b1} + {65c63d8c-d268-41d4-9337-8e190267cd05} - {1e403f09-6b6c-4643-92e9-8cfed63d7992} + {8c802c78-9810-407a-8854-b2200871ada5} - {844d74ee-f49a-4550-a411-da725ff9b6f7} + {d133790b-389f-4a65-8c30-4320e7fc8703} - {b949132e-1be8-433c-9bfa-3cafad8b7717} + {f829b587-f581-417c-acc8-476e0192a4a5} - {9f84fb7c-a817-46f2-bcee-3c2c82857af6} + {7b890679-6201-45ca-a7d1-58a9a38cbf17} - {82a18aa3-0beb-41ea-92a8-0571b3fbe068} + {6592e259-40cd-4cee-8342-45d8ba059ecb} - {f58e20fa-c844-451e-9843-8800c86ef44c} + {08bac22a-027c-49f7-863b-377cfd49d842} - {741448b2-2acb-4c6d-8792-ba354be151e5} + {fa3476bc-edfd-48fe-abe9-d484a21af826} - {c2ab1ef1-37b3-4965-9ccf-811ce694a3b9} + {dfb464be-7391-46d2-8a99-198c2d1fbecd} diff --git a/Net/Net_vs150.vcxproj b/Net/Net_vs150.vcxproj index 758c70111..0934860e7 100644 --- a/Net/Net_vs150.vcxproj +++ b/Net/Net_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNetd - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetmtd.lib + ..\lib\PocoNetMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetmt.lib + ..\lib\PocoNetMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetmdd.pdb + ..\lib\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetmdd.lib + ..\lib\PocoNetMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetmd.lib + ..\lib\PocoNetMD.lib diff --git a/Net/Net_vs150.vcxproj.filters b/Net/Net_vs150.vcxproj.filters index a90f19da7..c1e894631 100644 --- a/Net/Net_vs150.vcxproj.filters +++ b/Net/Net_vs150.vcxproj.filters @@ -2,157 +2,157 @@ - {d447c6ed-bb53-450a-82a4-103cb961d73a} + {35875395-ef4a-475f-a631-be191df56d8b} - {5ef00c2e-d6bd-48b0-a718-e8de6653696a} + {2469dc34-5a5f-46b3-b0f0-7a66f5f0072c} - {7f944b02-bd07-42f1-b045-47163459c11d} + {1ff51428-0dc8-4328-b241-3a582f515445} - {b2bb74f6-310b-4411-a597-44265d485af1} + {bccd5e1b-9fc0-4547-9050-45ae96123e01} - {93bb7d67-4760-48f1-9a7e-72609c258921} + {b6a53eae-aa36-46ca-a56e-19d49e12c568} - {d81bc09f-5010-4888-a7a2-0c842b0acbe2} + {8d2498c3-b245-4a02-8298-dbf409441177} - {4b0fbc00-31c2-4ced-93e9-83c45f6042a8} + {3746e890-6944-4bd5-a110-4e0957ea35d9} - {0e47417f-a387-4723-9738-3af33447ff3f} + {6bfe57f9-b711-48f7-9c3a-488d1016bf7a} - {50c493a8-ff0e-4bd6-92e1-90d5408dcabe} + {098d8120-7cd9-438f-9a7e-9b3a03a836ee} - {b28d98ad-8966-4edf-b12d-57bb8bde9e15} + {085ccd39-615e-467c-ae97-ee792ed424f1} - {a6c334ca-8972-4c95-8bbd-5906e380e7ad} + {fa816eac-e9bf-4f50-b3e3-ca7eb99a3ca8} - {6462bb39-3270-40e4-86ea-9210e4df84d2} + {b4485441-b72e-4200-a104-32e03e5764c0} - {fab9883d-f4a3-429c-8914-d9ab6495a808} + {1b32e351-4704-4ea7-bd2b-568e7b92be96} - {64f7eb15-8dbb-4462-947b-d7d3461c1e30} + {93131307-2eee-4a4a-a01d-eb85728772b4} - {4c78c89f-27b9-4323-81ab-195165502945} + {9e0ce2c4-96f7-4669-b113-08dc0d14c691} - {5d9c858d-264e-4aa1-aeea-fce81c619da5} + {d120dd3e-aa42-4bf6-ba20-a524e59419ef} - {5f478ac7-9855-44c2-ab00-84aca5d565ab} + {f2f5a6c0-fc0f-4785-8822-d7912629ffa3} - {12e9ed9d-667a-4dea-9ce7-0dbf27b88c47} + {5f91ab58-67f7-4064-b25d-ff60e9797eff} - {e7ebda27-6a12-4cf8-aada-288d2f4559cd} + {4b78b015-f612-4024-ac87-d49e598777cc} - {c9c050f9-e525-469e-af99-f616f61b1786} + {79dea57a-3cea-4147-9ae0-a7701f3226cb} - {224652cc-f840-45f5-ab56-bed3c5396da5} + {90f20759-0fb2-41de-8c79-11cec441091d} - {03726a9a-00e6-4ef0-b8b2-dcd710fd7b18} + {a3e12770-a7d7-4d46-bca7-e2ba19f9bfd6} - {e95ead79-7e65-4745-9723-de1d6300c56c} + {fc49993c-4da5-4c4e-a05a-488e2a23454e} - {0cc50cbc-d580-4567-805b-bd8dacaf89fd} + {974ebdd6-e470-4900-8afb-c7f26daee137} - {a9433115-0e15-4474-9a2c-2531d8e77b33} + {57eab05d-339b-43ca-bb3c-fc1ac03f1c55} - {63fef70a-ecc1-4851-b219-d0eee042e58c} + {c9ced760-7987-4734-8aab-2f975c7c21fe} - {1acb0cd6-a2d5-4f52-bc44-49e34a5427b0} + {cf3ce47a-892a-493c-bd59-7a3358f0782a} - {93259054-8797-4240-bab3-4724049c4a71} + {b43cd14f-ac1d-44d8-bacf-a407a95cc683} - {a7d3bb88-447e-4a98-93b0-835e16bb72b6} + {610cc5f6-9044-4957-8b68-ae1eb718d0c8} - {b6f7d714-ed49-42aa-8ecc-8068e8586da8} + {291c6555-7a1b-41be-a81a-3b7cc62cac78} - {6c9fb479-dcf1-496f-ab35-4423ce39cfb7} + {46a28a29-41e4-4dd3-87ca-779afb2ec88d} - {a983e94d-5127-4cac-bfef-b564c79cd97a} + {75de0154-e788-4454-81a0-a9f7e5f84cc3} - {e2291ef8-fe25-42e6-b86f-e43c2719a061} + {22032009-5dd5-42de-8ec7-58082bd32ed5} - {3cf2a719-0024-45f4-b690-434a054b101b} + {9e529789-1f10-443f-a3eb-d9c662ed216c} - {b7c7f027-4b3d-4257-94bf-db341896a7fc} + {827079e3-f5fd-4338-bcd9-06cf66b87eb6} - {86088d97-d11b-4415-a163-dcc7751d8481} + {d76c6ab6-000d-4602-b7cf-a490b17ddd6e} - {33f69209-4f45-4540-85ce-03f83da9fffe} + {334e251f-fa1c-402a-8e64-758e4b090e2e} - {e0d52373-e0a8-4b64-afcf-d6960fd7b3f2} + {85e45c13-7cda-44f3-8bc7-1494ed5556b6} - {86f01191-a784-45ae-91b5-0e3d98429744} + {5c97b8b2-40de-4bac-aefb-593ced6fe61b} - {4a50d2f2-fbe0-4cdf-9a50-c2975a72e54f} + {d336843f-6103-4bb3-b379-4458e3076262} - {b6673854-da26-49a6-b905-36c613e30b40} + {058bd93a-53bd-4047-b17b-43cb7ffbe8f2} - {ad91ef40-01e7-4e29-817d-13346f2da302} + {6926a988-e8d3-48a3-adfe-cfd3828118e7} - {eafc1521-f209-4ef8-a7ec-22327e4e8e04} + {33e1de97-cfff-499b-ad27-b9f238d4fb23} - {7108ff5a-1224-46f1-afec-ff0701c29a7e} + {4a78aedb-c4eb-4e79-8410-b4fb2b585b32} - {a297dba4-c73e-4e2d-8d67-939f9c9c0df4} + {ab673fe7-cdb5-4f32-810a-0923fce73604} - {22482dd0-c049-4aef-94f1-65817cc303bd} + {6f71164a-bb34-4fcf-8fc8-48ffbd634698} - {ff0995d3-8ba1-49f5-86e7-55d54f04f9ee} + {0cc7af84-4386-4325-a2b2-ee8d62710fc5} - {f676bc78-e4e0-4e2d-9e71-ba0ec778c53f} + {2491dd67-01d7-46e3-9789-529cc576d6cb} - {a3ba74c0-d70a-441a-b939-37943440fa98} + {1d1eae41-c9a1-4b7f-a341-b96589ab3336} - {617359c4-f89c-478e-b13b-ab7f8e60d872} + {afe0f70f-a0a3-49e0-b3d4-8e821e9bf355} - {49e13bfb-3da3-4587-beb5-c12f436bdaff} + {e0ded4f5-7967-42ad-8276-98ed06af1254} diff --git a/Net/Net_vs90.vcproj b/Net/Net_vs90.vcproj index ae200a88e..c5680ebf4 100644 --- a/Net/Net_vs90.vcproj +++ b/Net/Net_vs90.vcproj @@ -185,7 +185,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\PocoNetmtd.pdb" + ProgramDataBaseFileName="..\lib\PocoNetMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -200,7 +200,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoNetMTd.lib"/> + OutputFile="..\lib\PocoNetMT.lib"/> + OutputFile="..\lib\PocoNetMDd.lib"/> + OutputFile="..\lib\PocoNetMD.lib"/> ..\lib64\ obj64\Net\$(Configuration)\ PocoNet64d - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet64 - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetmtd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetmt.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoNetmdd.pdb + ..\lib64\PocoNetMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetmdd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetmd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetMD.lib + MachineX64 diff --git a/Net/Net_x64_vs100.vcxproj.filters b/Net/Net_x64_vs100.vcxproj.filters index f020b0f8e..9fdc22bd4 100644 --- a/Net/Net_x64_vs100.vcxproj.filters +++ b/Net/Net_x64_vs100.vcxproj.filters @@ -2,157 +2,157 @@ - {d4f4c773-37c0-4caa-9160-b57cb562a965} + {1a9857a1-b753-44e9-8d47-43bccf1ba30e} - {d338f8b1-c47c-4a3a-bda1-e7414c793de4} + {29ba31cb-56e8-4101-9e96-032e084f4906} - {5f22f34b-ec64-4608-9c24-be4e00257591} + {c9c9c3eb-f82b-4f37-999d-ba5530ee860b} - {635d1b1c-69b7-4206-bc25-d58e1da606b1} + {e536e57d-81a6-4b24-8df2-5d8865467ecf} - {8cfa81c3-2e38-4a12-bbf0-74e32b26aceb} + {485e3430-8cf2-4ced-a02b-f009b04317c5} - {32c3c966-5014-4714-a018-cedd2bf30401} + {afc4aac5-a757-414f-b52e-04de77955ae0} - {fd9ff4d3-b0e0-4a8f-9a1a-8f6eb8dbb656} + {33998d01-2775-45bd-bbcf-4094acd9c881} - {9971bd5c-6e9d-4265-b3df-691f5520b49d} + {7a65425f-b029-4fea-8024-22df7112c827} - {7d7d9503-32fe-4718-aa34-bcbf933eb3e0} + {51548801-c9dc-486c-90ce-3723f8d550be} - {766b7215-6d18-4b28-a368-9b6dd3531437} + {a2379464-4223-41f2-95b0-09f96c77fbd3} - {72909623-6ff5-4d93-bd16-96ebb3e2cda2} + {b104ae11-c3fb-4763-a316-c0dcd78cfed1} - {ff317c7b-7df3-4ef7-9253-f4cf49928d75} + {6de15eba-aa67-4062-bb7f-16c43c4403f9} - {ff64fcdb-e54c-4d1d-bb5f-eeed8e35e8d0} + {63188524-0e7b-4055-8a6d-2666fb61f435} - {3ab5d195-d565-4f88-98ec-fabd7ccc88fa} + {b64ef11f-0b9c-4509-8569-9a129d3c429e} - {8580672d-eaf0-47a8-8ede-581ecb322bf1} + {be1931aa-ebe4-44ef-8477-f63caacd5120} - {235a7654-7182-462c-99a3-a2d3f65c7359} + {2aca18d5-d88a-4337-ba6b-d2ca76e88d29} - {57ccf6a9-47ec-4f3d-9394-75472ccebf39} + {01ab6e8b-8049-463d-a85b-67b6d97f51c1} - {5e10f9ba-702c-42d2-b752-e648c6954912} + {2a82247d-5839-46a4-84b9-06d5e255786b} - {1aca5d84-2365-4129-aba4-17d8668dde1d} + {440afdca-ac81-4791-b821-383fb40a0e3f} - {51ab2078-556c-4151-99f6-7efc38330d5d} + {aec3061b-ae6d-4036-9e3c-ae1c7f5c1693} - {47bb360b-a6b9-45e0-b109-f8e261204600} + {5d99a10e-a4e4-4e78-a266-dc9a462ed421} - {2375b4a0-5316-4578-a5c9-e8aeb7d708f1} + {edcb3344-f445-4627-a432-276d7d72ba60} - {677d5571-0b42-4ae2-8bac-760d2be9316a} + {87ad3b12-ebe0-4fed-8b83-25ddc4a38522} - {0b369bb1-94ad-4de6-8027-29019bf79e07} + {4cb4dd0d-7316-4600-8b58-ada2e0ce2105} - {59aee667-385a-4cba-b0d5-5ebe755499e9} + {82ebe71d-47fe-4c83-88c2-6deffe1cd08f} - {79152399-ea9f-414b-b376-aa857409e276} + {3748e17c-8e3f-4125-8975-db16f7e742d5} - {89d9465c-9ae0-4497-9526-5043ab2a1782} + {c8af7315-b76e-4a0e-96c8-c3a20d08b9f2} - {d0d05b95-501d-423e-a70e-21832fd80b85} + {4dc4b1cb-4c8d-47e6-95b3-52bbee394b9c} - {1ac8300a-3a80-4ed9-a058-420f33654470} + {0fc3fd8c-54a7-4c9b-a4aa-91c94edb21cd} - {3532197a-e0bb-44e4-8f6e-d78ed34063b6} + {aad18156-3c02-4a03-87ed-d97c274cfa71} - {b7a499ac-3e02-4b66-b25b-d536bf82649e} + {a1a71226-b345-496a-9156-8438a5b06e23} - {493a7228-9e15-415f-b423-625865afa46f} + {cf73a0af-d85e-463f-ab39-ff4b2d959697} - {ba515ebd-3a34-460e-b54d-f175d5133db3} + {e73a4c42-19ab-40f9-b515-7b29c6b883a6} - {a2574dd7-665b-48e6-96d5-92076d1dd7d7} + {e5363727-684d-40ce-ac22-8de35576534e} - {44bb9673-8ad5-4f8f-86cd-fec16b177a34} + {c56f0a1f-d960-4263-ae1e-0014141e2296} - {1344e4d6-9f62-4b04-b4bc-7fa32fad6c79} + {c134cd9b-72fb-4fc5-8738-d7fb7456624e} - {8abc40d9-a500-4c70-8daa-fe73b6a6e01d} + {4b14c8f7-18b3-4570-a5d3-e251fa458f64} - {d6323b3f-552f-4e44-b146-20c800502824} + {f133e8bd-412a-4139-9a8f-821c4e382aaa} - {89348760-ca73-4271-adf6-a95d707338b5} + {486d7c0b-8b7e-48cf-9a68-23ee87d20e3f} - {13e53618-eff4-4154-a3cd-345d525915b9} + {357398ef-2b24-49f6-83b0-7bf6bd23c036} - {bc820ff9-186c-476a-8aeb-e3ba791968e7} + {5287d94c-326f-42e2-9181-53fddc5329a6} - {940d5340-44ee-427f-a0ab-377580558444} + {18a6f6a9-33e8-47d8-9b83-bd8185c7a4bf} - {9fb9c37a-a561-4264-a044-bf7d591809ac} + {5d49d5e4-5cfb-4bd6-b1e9-03340cf614bd} - {36748040-fbe1-4db4-8c65-5f3f60582702} + {c313f2fd-fbfb-48a1-ab22-fd759fe9d76f} - {29111831-d668-4bf4-be0a-3b6744498c58} + {c71c8e0b-d320-4069-94f6-355775dd6d6f} - {327ff602-b6dd-4b7b-833d-7427edd10698} + {48226660-20b2-49c8-9953-e96569db8236} - {d5c1e9c3-de74-4787-8d07-17bd18d6d2f2} + {dbff1593-874b-413e-b2ed-84573a3d4681} - {a9be2987-76c3-4097-a576-130fa84ae185} + {b42a4c60-7f8b-4e83-8585-942b3df59b5c} - {9ad179c7-616d-4ef3-9272-1810e7911498} + {9d9d00bf-1ad2-4ca6-956c-920ed54a7b01} - {291e6148-0b8a-4382-a205-e42daf0e25f6} + {5933d96b-f252-4539-a7a9-cd4a9a750484} - {d8a9a0b7-9bef-4719-97e3-903c83342971} + {a78cb0b7-121c-448f-9efe-ce6446373486} diff --git a/Net/Net_x64_vs110.vcxproj b/Net/Net_x64_vs110.vcxproj index 37e043b09..bef934c29 100644 --- a/Net/Net_x64_vs110.vcxproj +++ b/Net/Net_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNet64d - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet64 - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetmtd.lib + ..\lib64\PocoNetMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetmt.lib + ..\lib64\PocoNetMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetmdd.pdb + ..\lib64\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetmdd.lib + ..\lib64\PocoNetMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetmd.lib + ..\lib64\PocoNetMD.lib + MachineX64 diff --git a/Net/Net_x64_vs110.vcxproj.filters b/Net/Net_x64_vs110.vcxproj.filters index 162fc6eb8..8b5810599 100644 --- a/Net/Net_x64_vs110.vcxproj.filters +++ b/Net/Net_x64_vs110.vcxproj.filters @@ -2,157 +2,157 @@ - {68dccb40-9b87-4336-9b5b-2ba80544c4b8} + {ed094f81-c4e5-4b12-8bc0-597353957b0b} - {cdbb502b-1c8a-440b-ba86-bb97e3810485} + {e1b59644-3642-436f-bff2-aafa7766aeaa} - {0fcf04a5-2f3c-4b7e-abf3-aa31b7e47e68} + {bdcffae8-ac12-45e9-bd97-32f4a7d78c52} - {eef50bda-2f35-4c1f-8657-9f9e3bf36aa8} + {09acf1fa-cb55-4353-b514-1a6e3d780a1f} - {956b26e1-2b67-466b-a43c-9684b87ca6c4} + {697ef94c-0a21-4c11-a970-7a182ffdc69f} - {1f1792a5-c86c-44c8-be26-4997eac41a91} + {f6d9309b-9e10-4156-9f08-88d207640302} - {4011d25b-a3f4-4146-908a-e20ebd4426f2} + {e5757857-546d-4fa2-aba6-6034e4daddcd} - {02b53606-5846-4f45-9f83-11a7ef1a28ff} + {0d7e4be0-a846-4b0e-9e7a-9fd3d5bdc656} - {fde7dc8e-3cfd-4cb1-b842-e48303134ac0} + {b4ce66f1-c494-4372-8117-8b5e9b071487} - {3c868c72-90a3-46ee-aeef-35569248e0c5} + {ce5d7b06-f8fa-402b-a8db-b6e4bbc7c014} - {278015c3-e341-466c-b435-3019eef0e1bb} + {fbfafbdc-692c-4da1-82a6-95c153553940} - {8601ad68-2959-4f11-b7dc-c76fbb307a0c} + {d2c4d718-3f65-4d93-bf78-48b62b1c8385} - {9d010029-403a-410a-9269-51894b57d952} + {d3590685-42a6-463e-beec-c4d63bd999e9} - {6b7cbb0f-f0c9-484d-9fbb-c4fe8e221015} + {d6ffb9a4-5e67-48f4-a9cf-bb1f3422ad97} - {7c78ddc8-d363-48ce-b0bf-2963fb678944} + {b4052f9d-80af-41cf-b23c-2045681e2061} - {86d7e708-a1e5-4989-b118-2c128542fd89} + {0028b3fb-3879-4c52-b2c0-8b6e368474f1} - {c9261842-3292-4fc5-a9fa-2a7743554b11} + {a44585ca-a273-42b0-a97b-52d584ca32c7} - {52c01c89-ae71-4b06-8ff1-549e1427f2ac} + {f5da841c-4029-4c81-b26e-5eaeee2029ba} - {24cded60-61f8-4870-96be-8ab933e40146} + {565b4cdd-284f-498b-a0da-c738fbfcb7a1} - {3ede0ae7-fe96-462c-9e8b-e0b3138c48bf} + {e37f2cdf-be67-40e6-8cca-6b87ba4d355c} - {7172d393-f94b-42b7-be6a-610d4455acbc} + {aee4aff3-9aa7-4482-ad6b-6f0a85166e34} - {41c5eb60-d788-413c-bde1-5db935de095b} + {d8261215-6e9e-4c25-b7a8-e3a1aa3654e9} - {7900ec71-21b1-4be3-8729-70777447d447} + {3435a4a7-bfb1-4985-8bbb-028dc7708b24} - {3b077133-276a-4f61-b701-bd7547083584} + {c71717dd-c760-4bd7-b790-4413390f67e9} - {76711834-4ec9-4ebf-9e59-f7b92ee6b4bc} + {26b892b8-6ac3-4e90-b552-31912e824398} - {9e9af05e-04b0-44bb-b395-b4ac23450375} + {bd9ab0f1-d94a-4fa9-a6d1-35ebbdecbf12} - {4fff7a76-d641-4137-b37e-24d35cd79047} + {8a8da6b9-ca56-4fce-a141-08388a003d44} - {5e7953b7-1db0-4304-9188-a6b82a01915f} + {19feeb81-35eb-4561-b7c5-68db96f1b0be} - {dcd6ba5c-eaca-4197-946c-70a585d65032} + {9e872b0e-971e-48ae-944c-cb09919e2741} - {196a9c44-3a8a-4f79-a938-9f871ea063ce} + {ae260360-7b5c-4c62-9393-a72854e457ce} - {82192105-35df-457d-854d-2a4747babc07} + {7f71a7d9-97b8-47fb-8133-cce9105f9ce5} - {8cb72ccc-ab8d-4222-80b5-72a035cb1d4c} + {51dfb059-a764-455b-af3b-b1170c7bf52c} - {48d0ed93-e44a-43e8-b094-a2b3390d4912} + {48d1a93a-d5bb-42b0-82aa-26047e1f063e} - {e31b6163-f111-4bc7-a500-9966ea76f49f} + {2f74f932-961d-4120-8c1e-a352ea14b798} - {055fc518-2983-454f-9e60-c8070867420c} + {8edd1752-1616-47ff-b069-76039bbe0384} - {2d7fde1e-667c-4042-a3ee-07c2a5b4f54d} + {e0b6454e-2fee-48ee-9f94-d97338c4c41a} - {45858e83-88d6-4693-9758-a52379a4f552} + {9074a27c-537c-493e-a515-751ea7acf850} - {b0f07b33-c602-4f33-9d36-6824c94b5fe8} + {334c2212-3f78-46f3-9dac-c8f906548cc1} - {29bec552-eb1f-47a2-a2a9-d308df723bfc} + {1ca3ac2b-379d-4e00-83e1-069608d3d26b} - {f084d053-688b-4193-b74e-70f603509717} + {a601cb62-1bf3-45e5-a3e3-3a474e154ac4} - {fca036ae-9f66-440f-8d3c-c1ccf3d585e4} + {caffa8f4-1f2c-47c3-907a-4d005abb1272} - {a752d8c1-1eb2-4b8a-9bec-20d93ed23d10} + {00d7bd41-8ca6-496b-921f-02c629d8eb66} - {04e65d4e-1516-4c3a-ad35-d00d4628a1f8} + {5581d3c1-9ed1-448f-a7a4-0c01d6c5fc97} - {d15fedc9-7c36-4473-8c40-cf959806f188} + {a6264075-4841-41a8-8b35-d517cd50909a} - {de6b8578-4c03-4523-a3a6-a3cf9543a252} + {72ad6048-6429-48bd-a1f6-cb22b5083cc0} - {36628b33-dc88-48fe-bab6-39d6abf4f6bb} + {1e9022c1-0745-45e8-8d14-84496b81cc59} - {a79c4a35-a52a-46b6-8e8c-47cbca23c694} + {8bbfc64b-e143-4f1d-bd65-19713f0a04b3} - {7d3d3562-cc5f-4a29-b932-09f185b0412b} + {4acfce97-984e-4017-b609-b6da81269751} - {0713872e-8b69-4667-99cf-475d1f4cccf7} + {f9342cfd-1f26-48dd-a4d1-88ff86010899} - {adfb1e7c-7f1c-444c-997f-419136dbba28} + {b9a58e8c-a410-4ebe-8a8b-f3dec223b805} - {156e0189-d735-406a-9efd-5180c3198b71} + {d0aac33b-116e-4ac7-a9e2-93d360854845} diff --git a/Net/Net_x64_vs120.vcxproj b/Net/Net_x64_vs120.vcxproj index c00ee04d3..39c7e358b 100644 --- a/Net/Net_x64_vs120.vcxproj +++ b/Net/Net_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNet64d - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet64 - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetmtd.lib + ..\lib64\PocoNetMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetmt.lib + ..\lib64\PocoNetMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetmdd.pdb + ..\lib64\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetmdd.lib + ..\lib64\PocoNetMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetmd.lib + ..\lib64\PocoNetMD.lib + MachineX64 diff --git a/Net/Net_x64_vs120.vcxproj.filters b/Net/Net_x64_vs120.vcxproj.filters index 14baee2ad..f437106a5 100644 --- a/Net/Net_x64_vs120.vcxproj.filters +++ b/Net/Net_x64_vs120.vcxproj.filters @@ -2,157 +2,157 @@ - {29d2cb45-e793-4e35-9eb4-d6f82f1e3dd1} + {cc8d16ca-7412-4097-8c91-7131cfe0e91e} - {f31aaf61-5f7f-4366-a522-109a899a1b1c} + {31ef4227-60d6-4c10-80d1-0e1a4d3770ad} - {2db11946-aa03-48d9-95b6-7ffced49c0f8} + {e77863a5-55ba-4dc4-b1b9-3acfe2b92cb2} - {9f6aa71c-a224-4bc1-b542-990add96cf84} + {19ad3548-1385-42dc-81fb-aa7cd2e7dcd6} - {07d2cf17-44a4-4e2f-807a-b9b01013ad5e} + {bc774056-4573-4f9c-a2d2-15a4a6d907d1} - {03f20f05-e255-49cd-b7f5-645f2614afc5} + {82fa8ef2-d2c3-4feb-9cb3-2e5f3eca9a18} - {7a3fa183-263e-4ac5-8ea3-8f796b81ca69} + {1eb39725-8601-492b-805e-12cac27983cb} - {bbf8cbc7-17ab-4691-a324-84fb4f308047} + {76d4d588-0725-47ba-bb5d-4f215c685669} - {22770840-cc6e-4670-a352-c620b5a4a826} + {a48bd57e-27cc-4bb1-a95f-87f64a38fcd9} - {b2a69fc2-57cf-4871-8be5-22881b8210d8} + {c40a1b5a-177e-4a07-a2d3-4b8486192ff3} - {9af5b220-9de4-4265-a15b-350de92cfb17} + {00113e86-8dd9-44ea-b02f-94b1ae8834e5} - {3a8ad7d0-3240-4680-8dfc-9f5377a27ecc} + {f82a4119-e39e-4179-b2e2-ce78ed57dedb} - {f320b590-0c2c-404e-b1f3-3e3952d2ecd6} + {8971681e-2131-431c-8a45-ddb12a2d1173} - {1ec33a3f-81bb-48ac-83a9-c2db54a03bd6} + {6627ce06-7d0d-47d3-9aa8-b8331e585213} - {a367a742-6baa-4048-a985-dda1a1acf3fb} + {e4a517ed-5721-4c09-a603-2d309de3ca20} - {28430460-9ab5-48ca-ba9f-cc0f384a636e} + {869b1356-b6f5-4973-a3bc-cf4fc173abb6} - {0f1246cf-c2dd-4ea7-a0b4-022646825239} + {156d2881-1c9d-4932-9dbf-cef11ae52de8} - {e99c2218-286d-410c-a86c-a66f2021efc1} + {df05fc83-e7d4-4627-9628-7e3d4a88a060} - {1865b804-0725-4182-99bd-787be4aab965} + {5baf3d49-f2e9-4d20-9710-c1ef285fe1cb} - {0917bd01-faaa-4797-8750-1cd05fdfac96} + {82ff1701-07ea-45ac-a05e-909e817987ff} - {b70a1f83-0f65-44a2-821d-cb188d272f9d} + {76446690-2793-41c3-8652-f90c51204624} - {77134d42-e369-4665-a8b3-721e8e26055d} + {6b96166c-a5f1-4317-905d-29c24b89bd6a} - {a6df6ff7-4385-4079-a956-8fa5b74f826c} + {d629c8fe-dadd-4e80-901a-afda1c4f2c11} - {66a3e2e7-98da-4e3f-bee8-ddfeeb022be1} + {d67c73f3-5a03-4a09-a7c7-1c67d8c87ba5} - {897e94ac-abda-4cd4-a769-59bbb5736223} + {1e33c934-0b56-4135-8b03-88a647ea37e7} - {449f4d4e-571c-4397-a06e-0a31d63f55d1} + {0d173bd7-8eb1-4b50-9eb3-0cd852435f9c} - {2ed8ea49-4b59-42c8-900e-80e01368764b} + {7a96570e-c47f-4f38-acc5-d392e4854ccc} - {9ebf9b15-0e4f-4c22-b0b3-6efdbd0ecf07} + {eef7bd8a-7883-476b-93b8-7f5b55867620} - {131630a8-dc0a-4110-b100-21bece42035a} + {08649dda-addd-47f5-b2f6-8e7befd930bb} - {848f51b1-0e02-469e-95a1-c112bfa0f2ad} + {cf3dffcc-826a-431a-be5b-26bfeec1345d} - {4113c974-0169-420e-8d91-6de0930e6e30} + {79cef262-2c6c-4c18-ba96-b36575fd76c8} - {07b9f698-313b-4af5-bff7-a6a2ecd5fbd9} + {fc7aeb0b-b010-492e-9cfc-9dc9072f17c8} - {021f1e7c-3f41-4c27-acf0-402cb61a2930} + {58cc211a-0def-4ada-93b9-0776e8b4bd8b} - {0b977660-7549-402b-b25c-ae78a0a46ac6} + {a01359c3-71a2-401a-b6d0-48ffe9850986} - {8a881559-7838-4649-8242-8678d1b4ce06} + {8ccb6e9d-10a1-44e3-a8f5-868a06e5f9d7} - {671a5e2b-07ae-4356-a6af-bc143dc084e3} + {09a1ee4a-e6d9-4c42-8724-8a55f7480b3d} - {cb4f283c-9306-4102-ba3c-896ea6324572} + {38308ce7-1989-438c-b4ff-7dc0f1adbadb} - {2b86224d-4b4a-445d-a482-1420fe9a0319} + {e305be17-6584-41be-b6cf-1994bfb79446} - {6f540b22-52af-4038-b2e5-619bcd3651ad} + {b9e09121-911c-472a-b255-c4ee53d1406d} - {66230b7d-9d22-4085-960e-30d6379766bb} + {198f48f6-e0c7-4da4-9d26-7ab048515fd6} - {3f8b266b-e888-4060-8179-70c511133ae9} + {8c8685d8-27c4-41a6-99e6-37f87faed03c} - {08f07fb3-9d97-4ec1-8a85-e3a966ad70d6} + {13bdab74-59da-40de-a300-8216b6cdf431} - {26a978ae-5d13-466d-993c-f9b692e8dcdd} + {f41a9026-ebb7-4e1e-bc28-7d8c7ba567ac} - {4a696b49-3ee7-40d1-8283-763412c080be} + {c0037abf-c014-43ab-bc12-50c3fd9ead19} - {fbe200fb-bb0a-4a6a-919b-fd6cc71840dc} + {4a2eb821-5187-483d-a9ff-b4122d143865} - {e04968a6-58af-4029-ada5-8b7a835d5a36} + {c44005d6-fa7d-4483-9c9e-b2e9b3f3a234} - {0fc99559-9044-4d95-8f48-4de375e25919} + {ea46db96-0530-4953-b4f6-19d9d239a98f} - {916ee04e-ecaa-4b5f-b365-7d4d0af3245e} + {dd9828aa-f14b-4e2f-b6a7-6477ea6f9c02} - {2ab8d86f-218b-43e5-8a2f-7142db914514} + {6a483ea8-83fe-4fbd-839b-308e47bba5c1} - {b50f1b1f-df00-48e6-903a-44f293d550c6} + {1c74c3e7-ca0d-40e4-a466-701629451db1} - {f3e79e1a-fd37-4df6-8245-96c2d62c3e7d} + {38749652-d5a7-422e-9f41-7bc804af611d} diff --git a/Net/Net_x64_vs140.vcxproj b/Net/Net_x64_vs140.vcxproj index 4ffd83731..cd302385e 100644 --- a/Net/Net_x64_vs140.vcxproj +++ b/Net/Net_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNet64d - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet64 - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetmtd.lib + ..\lib64\PocoNetMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetmt.lib + ..\lib64\PocoNetMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetmdd.pdb + ..\lib64\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetmdd.lib + ..\lib64\PocoNetMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetmd.lib + ..\lib64\PocoNetMD.lib + MachineX64 diff --git a/Net/Net_x64_vs140.vcxproj.filters b/Net/Net_x64_vs140.vcxproj.filters index 2528ac00f..86b8d5bc1 100644 --- a/Net/Net_x64_vs140.vcxproj.filters +++ b/Net/Net_x64_vs140.vcxproj.filters @@ -2,157 +2,157 @@ - {34a0fdfe-01a6-4219-a498-6fc99d80947b} + {e6dba8bd-ac9d-4d8c-bab9-96cdc1b50018} - {27971bb0-af0c-4c99-bb16-99fbc8fe409c} + {7f56a599-0d0d-4c8e-9dd0-758b2065791b} - {9180168c-5425-4d87-85a1-2ee31809d670} + {9cc6a6c9-b2fe-42a7-b7b6-286519e367c7} - {70ffc2d7-bb1f-42c8-8326-3d96eda12c6d} + {a991d8ac-ae85-4063-b427-cb81d949725d} - {25530c59-8499-4f24-8e78-097671e7b2a7} + {ed167f54-8516-4a4e-9764-39708ecacedf} - {e43fe2ac-b126-4321-9ef3-e6c2a8491c99} + {fb9c7267-236e-4737-a918-234a55e4d288} - {bc626b4a-b59b-41a5-bf79-7e0a227a2c0e} + {61519d1a-82cc-4f25-8df8-e505dfd5590c} - {f436662d-e67a-4d62-a79e-d72ec9355b74} + {5a497d09-eab2-4411-b39b-5390103fe6a2} - {ba264e7c-11f8-4ef2-8846-ccfca959a571} + {bd39dca2-171f-4b21-b837-b998f4900ad8} - {376d93d4-6702-4d5e-8014-52305bf48f24} + {d7a459d3-ea83-4f84-8543-d4f492b3c546} - {703a1201-e77d-4b97-91e4-646c4d120317} + {c629b9bf-c003-4e8a-82c6-f0a75c13abef} - {d74a6050-729d-4c5a-ae05-d48a8b5ddad8} + {2face30e-61be-4fcc-a4b1-8ce1561c0c73} - {23119fbb-0cb9-4122-a21e-7ae8e30760a2} + {b61a8e1c-5120-4c65-9555-0f2de3176236} - {2a7b43b2-b9a4-4b16-b1f9-ec9f7ec67f5b} + {4c183bdc-f049-40a1-a2fc-e90c1b32ef86} - {ebd28d4e-b4cc-43b4-b36c-45f356ebe8d5} + {61b64b18-12c3-42ad-9217-34bfea31eab1} - {ed8cdbb5-b75d-4cb3-87e7-9d84eb28e3f9} + {c86f7c8a-182d-4b35-a94e-4ed25cb296aa} - {d3c34d33-c730-4123-828e-55d17c4c52ab} + {5f1661b6-62cf-45a7-b498-6f90751e173d} - {0bf679fc-be74-44e2-98ee-211eec3ce537} + {a981b987-828b-4081-8202-9576dbf8e798} - {0b981548-e0aa-454d-976e-7b5f7f554235} + {10fa998f-f3a9-4762-8122-7bd0c8b47b13} - {2c2eea50-b303-47b6-81dc-e666e6414d4f} + {8720e85a-96e1-4743-9575-f4d99a4a635f} - {8542a085-c504-4e6d-8387-c8283f09c658} + {89479c25-3f7b-4e90-aeb8-06c4b128bb8a} - {4a73aac5-d16d-41f6-939e-c83d3d38c4af} + {c16a72bd-72c2-4a2a-b9b8-e1595eb53b95} - {17f802b0-4f70-43b9-bd19-13a985f29cc9} + {a587f8e4-e1af-456d-8f9b-8163627f71d3} - {2a46637d-690e-4079-97f1-4c636a67fc9a} + {3471cfa2-0bc0-4bb8-b225-3c7e23f3d95c} - {8633686c-5211-4272-b3f9-c7bac4cca1d5} + {9f46c73e-7ca6-45fe-8f77-b579d0f5e4a9} - {eab455ba-1f2f-4291-9a19-9e4b72791fb8} + {e024198d-c38e-497c-8e08-3f48df857d04} - {667e57be-2191-410b-be71-ade9e6c9fec2} + {71ef4d3d-f7cb-4f7e-b554-f42b2007afb6} - {b5433962-f0eb-4bd3-be4c-3a67a4543b80} + {c9d09421-dcfc-4c27-8cac-33d5d03ce67a} - {508f4856-f1ce-462d-9633-8eda11a9f686} + {87d634f2-f54b-4c5b-bc62-a869a0a72e37} - {4b203b88-17e4-45db-8079-16fbf9a93a74} + {bc1b6dc0-4b92-4e53-81b4-026665be3ae0} - {38dc3af8-2f3a-46dd-81cc-3c48c217ee5a} + {b348d627-2afd-42bb-a275-9a405b8a66c7} - {08b44791-3164-4667-9c71-cc003e3aa793} + {05c8f8b0-e093-49da-b684-ca2ee230a899} - {25443274-a4b6-4113-a588-61ff1b0aa386} + {c2b741f3-9018-495a-b9db-eca7c31af625} - {f1647fd4-636a-4365-954d-512e76312dec} + {a6b3f5f7-2833-472c-820f-8b01ef9a4346} - {ec03f7f9-552b-4797-bfd6-bc403e612dbd} + {38b0a785-8095-44c6-8828-941c421a3c66} - {a3c6b67a-25e7-4b97-ad1c-12b8a3a909b2} + {d33a3625-dfef-4f03-94d2-fb16be6f856a} - {ea1b1071-d7ab-4e73-a0e7-1b526c746019} + {62244bdf-befb-4862-b495-c809f5951091} - {3c06e004-0ec5-4adf-9d50-0f441bb7a21a} + {288020da-1e87-4835-b135-6b4ff854ed4d} - {0e993255-fd14-4e3c-91a2-5bd34de27e2e} + {0d842d8c-aad9-40af-8a59-f26ce0edb424} - {0a4cb08c-936e-49df-a30e-f1eaa61bc45a} + {ab40e303-c1bc-4582-99ae-9595c278d6f4} - {75ef7a0b-ad57-4695-b7f7-5a231ad04b5b} + {e14e8954-53d3-49d8-b35e-bbaa7482718d} - {5f9fded9-f6d5-461e-9d96-4fe06b3faa0b} + {1b5d7bb5-1010-4f50-86c8-170b16462d91} - {867cba98-44c9-4908-83b4-e0232328477b} + {8174ecc0-b571-4019-a2a7-c085dc2fc617} - {295025e0-8db0-4c82-8aba-15b591148a4a} + {d285bef4-8c01-46ef-9cc8-8d29ee86474e} - {87a7ebd4-7f8f-4604-82be-fc5ff545f51d} + {ff012a4c-8e46-46fb-a3d7-5d4a0976b5c7} - {03fa0196-1621-4996-913c-baee50434ace} + {c1521a5a-2b03-4d16-8193-e2b2b8e990c0} - {d332546d-b31b-45ac-8091-3dc338fb27e1} + {1e85c233-f7db-4b72-8579-7835022361af} - {27399c8c-e8f5-491b-be02-8c8366658093} + {25bb0369-ac70-4e81-85dc-88675c5a7f8c} - {5525fd09-1f36-4d87-a5d4-230f1359c7cf} + {c43cdb5e-a72d-4c68-aca4-0f1f6c357a62} - {bc0fcee5-c5fe-4ce1-b314-5ecab370ac27} + {29868856-48e3-4b99-8c39-cc82fd1bb176} - {50aa7c4c-e146-4e17-98d7-6df59e77a017} + {8eca5170-1554-42a6-bd1e-a9c14df820c8} diff --git a/Net/Net_x64_vs150.vcxproj b/Net/Net_x64_vs150.vcxproj index fd608a645..0f6119beb 100644 --- a/Net/Net_x64_vs150.vcxproj +++ b/Net/Net_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNet64d - PocoNetmdd - PocoNetmtd + PocoNetMDd + PocoNetMTd PocoNet64 - PocoNetmd - PocoNetmt + PocoNetMD + PocoNetMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetmtd.lib + ..\lib64\PocoNetMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetmt.lib + ..\lib64\PocoNetMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetmdd.pdb + ..\lib64\PocoNetMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetmdd.lib + ..\lib64\PocoNetMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetmd.lib + ..\lib64\PocoNetMD.lib + MachineX64 diff --git a/Net/Net_x64_vs150.vcxproj.filters b/Net/Net_x64_vs150.vcxproj.filters index 9b8925c42..8bb353745 100644 --- a/Net/Net_x64_vs150.vcxproj.filters +++ b/Net/Net_x64_vs150.vcxproj.filters @@ -2,157 +2,157 @@ - {53b74e91-808b-4d0a-b912-9bd591861801} + {21357608-79b3-4773-bb08-8f1f49163c3a} - {cd0c9030-32d9-4ff0-ba12-88d8fda6d3d8} + {d426a3b5-e596-4024-87ee-137639a23360} - {2d2f661d-2400-4ddc-82fc-394b39629707} + {c6e74cae-0fd5-489f-989e-b9388118cdae} - {e9529987-90a2-4286-bb61-270b75a2f94d} + {ea092b05-7f9a-4049-856e-93d0fae5b01b} - {11b23a69-1609-4502-abe5-7365bdd9a6b8} + {71a65724-90da-4ae1-8f2c-077b25901657} - {269559ac-adec-483e-9835-fc9722a736ea} + {6a6a5222-4817-45ef-9437-23bffd079229} - {706b703c-e3eb-4a5d-a8a6-05073b8a8aed} + {7cc508e5-1af3-4999-9ef9-1c6a08755382} - {aedb2fb2-4a8e-4afe-9fd2-f123ef5a54c0} + {9739feeb-4727-4f11-8031-7b303f393ca4} - {53931253-8b80-4179-87ba-a96f1133d4d6} + {c3278926-404c-402d-bfb8-bb75415db800} - {667fdec6-d57e-4353-a978-f71c4c0189fe} + {1813a1ba-8eb0-4c51-a044-8d54d7b16814} - {9d8cbb4a-6acc-47b2-9d7f-8a770434fa9b} + {51d25ae1-8c97-43af-965d-c1a2f1ae6c78} - {a4322f3c-7fc7-4af9-a01d-04c7b6739291} + {94471261-c14a-41b2-8830-e593eb12c1b5} - {1ef67eaa-6cdc-4c8d-9b42-36c77ee0aee7} + {7429432a-adf9-4f8d-8931-74cd65351e2b} - {2b3b7744-eda3-493f-962d-d9759cc81e03} + {563c49df-1101-48da-accb-ef68aa94d597} - {801ed62c-b085-4a93-9231-566ed8749529} + {4d5b1e38-508c-466a-b192-a1e930ecac02} - {3a01805a-dafc-465d-9b9b-90e442ec9f9d} + {4f4c09eb-98cc-4d5c-81a4-443524ab9a00} - {13233dbe-0ddd-4fd8-8c8c-609205ba4778} + {7e2ff41b-ff20-4868-9c4f-18474fd82bed} - {c7643068-7aeb-4891-ac3c-fabf55e28dbf} + {bc66b71d-ec19-4ec7-855e-dc09e8743229} - {1499baca-eef8-443d-868f-2f63af8f7bdc} + {d77a4eaa-d54a-460b-8385-ef834386b5f7} - {8aceaea8-8ee0-4fbd-b4b8-a2bb581a3f5f} + {19fc3279-7833-4d0d-a07a-b4058cadcccf} - {0c52cf71-35fc-436b-bb0b-eb170c8612c1} + {e004a748-100f-43ff-bdcd-7f497f8cb6eb} - {4162a440-a9d9-4cdc-9aca-88954589dee5} + {7a87a2b2-47ee-46e9-89ef-65c13a413c08} - {5249ba25-978c-42f8-b667-9ae47ce1fdbe} + {6acf587d-e174-4fe2-941d-83010730ee22} - {53d91c94-eeaf-442f-bfb6-37f56b9bdddc} + {a08486ba-f98e-4fd6-a923-65e13c7b9bab} - {b096351a-337a-497b-be72-3369663b3890} + {1141b912-848b-411c-a69d-1ae6cde35592} - {5311a5af-2ada-47a0-aebe-5e59bc008b5f} + {681bec10-ca11-40a4-966d-6b123e7ea8b4} - {2be9e1cb-1da3-4344-b5c0-decb739bc893} + {8bf58156-05a3-4f01-83d8-45730871c66c} - {98807984-0450-439c-b194-6f919913db49} + {2f0a2922-6a64-40bd-87fb-ad3996faa5c4} - {dceff69f-8c4d-4571-9ce1-c93a8532901d} + {b6245adb-01fb-49a4-9bd1-837cc01a75b3} - {45c20683-c19d-4a84-809e-07ba2f21cb8d} + {8cdb1ca4-72ef-49c9-a2cd-363ed4314f84} - {972d0e01-03a2-4258-9d7f-7fa9b936d443} + {5c422265-7081-4b57-92f3-c0b7bfff01af} - {2ea596fd-9ea7-4e3f-bf23-c693cf406b20} + {d5f9b937-dd70-433d-9ce8-977ea1d7c261} - {bfc685b2-ed24-49d3-bf1b-3b473765122e} + {3b136880-cbc5-4c18-9c50-4053cb95d319} - {59afcd5f-991d-4221-906d-8c79dc06a235} + {6c2bf1af-53f4-4e06-9106-1ddaa00fd1f2} - {4b446f06-7e7a-4eec-b53f-cf236679b1bb} + {56f25f06-bb1c-4411-972f-76b931adb64f} - {45590c55-03dc-4828-aab6-1721798c9c04} + {342d1ad5-585d-40f2-ad19-94502311c432} - {7e7076a9-a29f-4922-9d17-41814fa1e856} + {549ba932-9ae3-4690-a5a8-4d4e54ea5e43} - {4820f993-f1d8-499c-8e31-37cb31a71249} + {f9ba8195-0749-4b56-86d8-90515391b4aa} - {037c40ef-0dbb-4db6-aa69-65485cbf15c9} + {ab9a05b4-940c-4acd-ab29-445ad1778499} - {85b8d187-3bc7-4155-a6d4-6aa16d32aa02} + {c22c95d2-b933-46ae-bc36-c614f0164200} - {2e7e3874-12fc-4cfe-9dfe-955d429dca5a} + {37e94c4a-cc96-4400-a141-3d1260c5da2a} - {ceaf27f3-9595-49b2-9c19-0a81f01a1eea} + {ed87c354-49e5-45fb-a5b5-902235b9e98d} - {2a8a4928-9a7a-40a4-816a-6dbc5af2f7e5} + {8cdb088d-9cf2-4715-8a20-b285fea94068} - {810dfb55-bd8e-45ae-9e79-bb70dc40b32a} + {6f7560af-fe40-4670-bc75-dae0eb5eed2a} - {81d52279-995f-49bb-a6f9-6fb76481a829} + {985ff7cd-adf9-4605-81ca-effc134a5bb2} - {72f136e4-194a-452f-95ef-97e407669954} + {95322e0b-c568-452d-b320-67bb6a4155f4} - {a6ba70de-9a6f-4092-8f2d-fdce126d60fb} + {477498d9-2f8f-4f80-95ec-d1e32defa8cc} - {bffaf1eb-8fb0-48fb-9f6d-8a6ddc6111f5} + {1ef5c6b4-168a-42cd-abb3-213002a94035} - {446be548-8347-4975-87f8-a343b97d3ece} + {735a645d-69fe-4f5a-abea-1e310dd2e1e8} - {6659ef3d-d392-4c2d-afe3-f3a25a3a5941} + {9f9b2027-a196-4f5a-8ca7-e53d39826a38} - {2f902b6a-ede1-4df7-bad0-fd0f655c8630} + {88fcca3a-e6cb-4314-a942-96ef62a87282} diff --git a/Net/Net_x64_vs90.vcproj b/Net/Net_x64_vs90.vcproj index 0766e573c..0ec568272 100644 --- a/Net/Net_x64_vs90.vcproj +++ b/Net/Net_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetmtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,7 +201,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Net/testsuite/TestSuite.progen b/Net/testsuite/TestSuite.progen index 0290fa3b1..aa5e3f047 100644 --- a/Net/testsuite/TestSuite.progen +++ b/Net/testsuite/TestSuite.progen @@ -7,6 +7,7 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include -vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib -vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib +vc.project.linker.dependencies = iphlpapi.lib +vc.project.linker.dependencies.Win32 = ws2_32.lib +vc.project.linker.dependencies.x64 = ws2_32.lib +vc.project.linker.dependencies.WinCE = ws2.lib diff --git a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index c8ecad6cd..f539d1ce3 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {328717f3-7421-4161-91c0-787550a5a446} + {559a27ad-6fb0-4508-9ecd-1abe3cce06f2} - {8f4c4123-00b7-4193-bad1-8a1d02f66546} + {3eb10de9-43de-4f00-a608-7256ab326e22} - {8f82d2cf-04a6-42ff-93b3-c240c7d3aeeb} + {943db5ac-a218-48cb-8595-695e38f44793} - {86b6ce51-31ce-4d4a-bc6d-c8dc11da1680} + {2cc70e7f-045b-4c3e-8b15-48522761fbf4} - {d4b25c27-bb7a-414a-aea4-157675ba5bd9} + {8027791a-5bf6-4196-841a-e02ffc06d8ed} - {194a8631-cd49-44c5-afb2-6cf497987a7d} + {71247e9d-9dd8-467a-852d-a601e11c3e85} - {cc49e951-b58f-4a01-adf5-3a9dda18c9e2} + {aa5b8fb8-fa3f-4aa0-8089-20caaf6f88f7} - {ff53c944-2206-4b0d-bf1d-df583b181d75} + {0fbc304c-1cee-43ff-af11-8e3becabb25b} - {5fce9612-48ed-4474-a54d-7570f7445940} + {a9d81120-2a29-4f35-a156-60422b674da9} - {58f48d86-13b1-4016-8a3f-86c83742b7f7} + {4c172d5c-f99d-4a0b-b197-f233856ea97e} - {c28c026d-562d-4132-8a83-316b957b698b} + {fcef2fc9-a061-47a9-bd81-c3fb34babac4} - {b3cf8838-26bd-4b84-884a-5426c40d6a55} + {91fddc40-ba60-432f-8edf-047278efb1d1} - {3ded9546-5465-467b-bce6-0c0f3ffdb11e} + {1cff954b-460a-4411-affc-caed433036d8} - {ce9e3522-8b8f-47ba-b2bb-3fb5127e4255} + {cbcf0cc2-225c-4e8f-bce5-da051a4a9893} - {da0f0e97-2544-4654-ad98-ea4e7ee491f1} + {c00d5b92-f0ae-4c6b-9826-7dc363a98f5b} - {f4bd83bd-cdf6-421b-9f73-44b64b1745f5} + {ef807e1c-8a99-4074-9f9f-ec261cb52845} - {27cd8f70-a685-4a49-aac9-3e7d3f170efa} + {513759b9-e3ab-4602-9153-9570f5df559d} - {ff963500-c7b5-47e4-9b26-9447845aa8d1} + {40176296-8b31-490e-a470-858e77a9b352} - {7e8b2572-c533-4bf9-aada-23f252450166} + {0126e53a-3e3c-4acb-aef4-40402d96a3be} - {b292b546-33bb-4751-8803-72296a19193c} + {05bb168d-8806-4d48-8d76-23b56fd6bb20} - {4eeb650a-45db-48bb-9ae2-a93394f043aa} + {3512ff2b-5fe0-49eb-8e17-08b601cdb82c} - {4ea54047-96e9-4fcc-80bb-a28776e5761e} + {3e44d43a-003a-4f11-92ba-32d9b18659e6} - {5e3d76aa-1151-4220-ab7a-e70314619cee} + {6c531c20-b686-4c63-aafa-607074e3f1a1} - {202983fe-8f08-45a3-aa7c-2311e1809c0b} + {36bd4e76-8795-4773-a309-ad4ad0f57976} - {cb5879e3-af5b-4552-82d3-958409f00904} + {bc2e470c-bf65-4287-b407-2a4ebc0d0830} - {7d3c3f56-dd5d-46ef-b71f-130c7c477357} + {3194e258-c9f1-4d40-94d5-3c3b2459d535} - {d064969f-3d4d-4603-ba20-ab2e0fa0bac8} + {15d23ccc-15c7-4f3c-a26b-d9f38a55efac} - {51bbf22d-0d16-473d-9209-d7589fd834b6} + {92be74bb-56db-486f-8143-e6af4c78c718} - {1d74a8eb-3b91-4cfb-8a6e-7b48c6c7def8} + {3507b0fa-8a53-4b8c-a2dc-49f22c81ca68} - {142783f1-d6c3-45eb-926b-c7b1383ef084} + {deada4de-d3d3-4ae8-95a7-7dc3a26c554d} - {f7954deb-43a3-4860-a999-aae309c8ec27} + {397c4c30-43fc-4c93-8a34-bb9009392b93} - {9b49f235-1d21-4764-957f-6d73bb0b306e} + {6bae9b0c-2875-45eb-bc9c-4d255e37fa46} - {6c0372a6-975e-4ffc-9684-def603bfaebe} + {58fe5f38-f474-4958-bbd9-1f479f314287} - {e21157dd-8fd1-4aa5-add0-403bc5e26ca0} + {479d07e7-8d8f-462c-9151-a2ea8ca280a5} - {d3fb4338-8f6a-43b1-b79a-8cf14d8a5d65} + {79937ed1-d2a9-48c1-8bcd-555d8acec08b} - {7d25befd-6a69-4aa2-88de-f7fdf6a02bb4} + {10042a2d-3a8d-4b13-a805-7bcf4cedc449} - {5bdfed14-3d80-493e-8098-b2f82effc819} + {27909d3c-d4f4-4f49-b5cd-b2e3f561a5e8} - {9c25fb04-beb0-4f33-9ff6-3311227374e2} + {aa10c682-cebe-4d83-922f-b0acd61f9639} - {d6e10cbb-ea86-469c-a653-71323e2289e0} + {e3d10c32-391e-4b54-bc3c-49aa1d052363} - {cbab976f-7d24-4882-a566-d9f35af1dcbd} + {9e3f7879-aa69-42df-b9e7-ea062a80265b} - {f7facbd0-ad23-48a7-9909-12c79faaeb08} + {4fdbab42-d139-4d20-865e-eea8ee080a86} - {4d3e4704-e092-4879-8296-fd0f3b032585} + {0d936e57-7010-4ca9-a574-d1e6b634a5cb} - {88f6a876-feec-4170-96f7-85429522b834} + {d295ee17-5f2f-4e68-a793-883f89fb31ee} - {75d75e63-af7f-462d-98ba-267d05972841} + {fba92c90-6148-413d-84a4-df3d818ac85e} - {ef57cb6c-3a9f-40f4-91a6-68d8b195ad57} + {ad1f0092-e682-4dbd-96c7-567111201ed1} - {f9ffb2ca-d1c6-4e18-aa7d-8332c2ae3b73} + {fcced933-fe3d-4ba0-b3da-db9354cf0543} - {2d212e45-7fcb-47f2-9c02-88deed3a1d82} + {7b4b30a8-d4ce-4a12-8a1e-8c4582bda3e3} - {fb75ee5f-b173-4c62-afa7-c730b4e46517} + {eaa64696-437e-4bbd-85fc-56706d0d49e6} - {5ff64b6b-d852-42e4-8434-731ec415911c} + {6f5f4161-ed5b-4586-a2ef-14cb407ed429} - {9e40f654-88b0-494f-95ce-8914261672f6} + {0e2ee93b-97e9-4067-8ab3-ec99c22e9b31} - {967a3a4d-16b4-4ecb-a150-b96fa3768f5e} + {6139ec8f-2909-4399-8f20-5504847836f0} - {3e9b5627-13ee-489b-98e7-476371316dc5} + {f5543a07-f21a-43c0-8c76-43397681db0a} - {72bd7a37-88df-46bd-b31a-2df8bdf2e2a9} + {acb4d04e-eac9-42c9-9522-c9e5985382be} - {3b9bc48d-9405-4815-99b7-fd2c6869871c} + {5450125d-0b87-44df-b2d9-7817aa73bddf} - {3546accb-8850-4387-a75a-3075e0403e3c} + {b2667cc7-03b5-451b-b095-5b0042fac5bd} - {0dba024d-671d-4419-949e-7f2684b96a83} + {2b87ad6a-4247-45bc-b434-f71fb4878432} diff --git a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 95e98c42f..18ea297e9 100644 --- a/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {e5bfaf4e-14bb-41f3-a62b-7d9c1a4ee2f8} + {2a8ff474-421e-45b6-af76-2d7951f87ba8} - {4c51a327-dcc8-4248-905d-f095c08b7729} + {bd0f42c4-44b4-407b-913f-e760d2eec997} - {acdea933-6853-49f2-9c6e-c9b69c0e6328} + {b7528758-cbd2-48c2-8559-0610072512a8} - {ec77427a-e52d-4d9e-b878-33d548696ffd} + {3e60cb17-e9c9-41bf-8227-5f6b9a6935a4} - {aa0379f4-84e3-4c40-ac6c-4f41a9266fb6} + {8ab6c2d5-e700-4077-82ec-2c3aeaf410b3} - {7a9bb733-f9fe-4cd2-a46d-7d2343fc117e} + {67f39b6a-896c-4e0f-bfa4-e639ad546858} - {426fdcd5-165f-4914-84bb-396b196fa9b5} + {16fde45d-96d3-461a-879c-de4a055c6648} - {3a1fb357-1e8e-4d44-948c-715932d43c60} + {01c2efb8-1282-4c6c-8a7d-e0c55ee34e29} - {814fed4b-e5d9-4165-bf5b-dd9b087a8f97} + {770a5fd0-8b85-4847-a11d-f9b9245022fb} - {dcf751a8-4876-4977-9829-15c8e51c7aa1} + {685f881f-bcfd-441a-9d1d-aec61feb621a} - {5f7b5269-24b9-422f-b944-0055193d97eb} + {254ef6a8-de31-48f1-b975-70fd72fd151f} - {afdf00d2-2bec-46b6-86ce-fac6de3d4970} + {7b46fde6-4d3d-4b75-9867-d36b905df918} - {31662164-6546-4245-ae21-76d284b9ddb5} + {f156c4e9-0f85-4918-a678-2375bfc9695c} - {a3d6b02a-0ce9-4f94-bf52-1b6b3705b812} + {008172ac-724a-4d25-a5f2-c087e32e051f} - {5d5939b8-26b7-4ac6-8fb6-579d3390a851} + {0c70f874-6acf-4e88-9a60-c895c87aff7f} - {53d58d0a-73da-4884-b412-c05a46c3550a} + {c2f8c405-5579-44d4-b539-8991e95e0f9a} - {b7c41f6e-a636-408e-a576-fdea28c127a9} + {bafa5e55-8b70-450a-b2dc-294e7c40abf7} - {64cd6827-7cbd-4b76-8a04-025a3d517e92} + {8290e1ee-3de5-4a47-8744-d658ce6a0b0f} - {bc5d437a-15b5-427e-9ef8-20b90a19421a} + {99a0df5f-c95f-4757-b70d-35b3a9bfc147} - {116e4f80-49ed-4c67-b30b-8ce995ac4b19} + {d22a6848-c009-4de7-a750-a071d53eb467} - {06215d12-8c46-4855-bc3c-0a922c7900e5} + {cf5ac490-6dba-4ed8-a518-b90bf5f58309} - {86ff1339-7c0b-412d-870d-3769ca936cfc} + {a224996c-030f-42ec-9974-b5d1ee4cb79b} - {eb1a01e8-dee5-4e8e-a8b9-066c77631fbc} + {41d366c6-7b38-4eff-a7ed-390a5f92f4d1} - {2529358d-67d5-491c-a801-6cf276ebe767} + {2c3b03af-ebdb-40d0-b80b-f7bf356486a7} - {fbc71952-35ad-482e-9722-beb2022401f0} + {44a09e2a-927c-4938-ba8c-1618510b3b4c} - {b9a471bd-31bd-4a3a-8012-ad0f1476fc37} + {60a82f1e-0fdd-469a-9bf8-5681c52412d3} - {799377de-57fb-4647-90d3-ce86a6f2ec2c} + {243f9923-ac9a-44ea-875c-150565d8acc3} - {67f37983-592c-426a-b86d-c4ea9269afa8} + {15e20fc1-951b-43fd-b149-a43ba4900dfc} - {4e68ce26-2c10-49f6-a442-469dfe63775f} + {67c39e42-4260-4273-9ea3-7e0aac87f8c6} - {eb8b3ba7-4fc9-469a-9409-6aa045159194} + {2635bcdc-d9c0-4203-b833-f705a7cc882a} - {7a749c34-967e-4e3d-8ecc-cc906f76a26c} + {8655f3f0-ec0e-4c33-90e1-5ff8e1f3f561} - {af2c9fc0-e845-44ae-968f-ab1a8afbcff5} + {bae5cfbd-46c5-40fb-b830-85fce288ac4b} - {8974fa0c-c228-4265-9607-2bb20ed8e37c} + {c5124382-cf80-46e8-b4fb-ed0d18df4f71} - {8689d331-94f9-4103-84ff-8e77dd9ce6ec} + {7bfa019b-55ca-486a-acb8-a67ed8146e5f} - {4094b889-2197-481a-b7d9-144a6fedbaa4} + {365bab21-6170-4c37-83c3-a745f3d0ffc3} - {13f5d962-9b28-4f5a-a79c-fbf72f8cbe4b} + {a1a00b26-70f7-4efc-aa12-793f87f3ef95} - {e70e1681-4080-4ff1-b4f6-c7507eac9ad9} + {1b64d30a-1587-44b4-894b-8655db84afc1} - {860817f2-f45d-4f71-8968-e39722d63d06} + {5c3ef65b-b505-424d-ab3e-ec15552fbabf} - {2d1cbcaa-aac7-42f6-8176-2b99ad7a5f4e} + {477ec101-5935-40db-ade5-3a0becbe8425} - {f7171d0e-4d58-4451-b305-a3acee253544} + {64992931-0245-4eab-9fe0-9317b65e5e3d} - {f1226dff-0e82-460e-9f5c-c10cad76434f} + {5876e8ae-3afd-40e5-a72a-26cb8fdaacd7} - {e7c10477-f610-488d-a561-87ba15b443cb} + {7ee5a6c0-6028-433d-8673-079ef50dd08f} - {c4818d77-1c04-4cca-b503-2378c554a933} + {ff1ca618-2be8-4e77-80ad-b97c39ca0979} - {564f6ef2-1901-4265-80ef-e82799fce1b5} + {194d8339-5690-4853-8df0-f258fda6a0b1} - {5882c27a-240c-4b02-8c80-375a2016c925} + {a8c93765-26f4-407a-ab4c-4efc42a700d3} - {eaef4bd8-1c21-49f0-af18-27676b85a6cd} + {2fa08a7f-f385-4b29-81c3-6b7cbe368676} - {6c572dde-1752-4a13-b6bc-f226249a7aac} + {a05651c0-df8a-489e-84b7-f014fd10b213} - {e47d746a-477d-4538-864c-c6008f989881} + {896848be-e2fc-4025-a492-89ea1834badb} - {1e235329-fd77-4fab-b375-72ec8ace4fd5} + {b929b56f-ef1f-4021-bd2e-9db391badf45} - {5609e0bd-637d-425a-b4c4-7a85a992442b} + {6184bf34-1f1a-4c08-9f42-045121a97e6e} - {4bcac713-0453-48b5-b5d7-6c7d956b77bf} + {225d08b9-e50d-4056-b6d8-6ba31eca4cd0} - {324ed658-2b5d-4439-9cc7-3ca93dd95d6b} + {649c8483-cc2d-478e-ad42-b9f959aad8b6} - {c97b70cc-16e7-4f78-ba3a-49fa8acef476} + {bdd4ec73-060f-49f0-9849-a5ea8933ae51} - {43409a07-146c-456c-adff-92a11f4c14c1} + {f2b15e99-9b99-44f0-be18-650e7cc77eca} - {4968c968-e867-45c5-8143-bf5d1078622e} + {bcfe9190-b89c-4920-9426-3073c79f27c9} - {737edcf5-f1ff-4912-b1c6-3eab133eeff4} + {eff2b00a-bc73-422a-be9a-35decee52854} diff --git a/Net/testsuite/TestSuite_vs100.vcxproj b/Net/testsuite/TestSuite_vs100.vcxproj index 05f572a84..96dba0c3f 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj +++ b/Net/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs100.vcxproj.filters b/Net/testsuite/TestSuite_vs100.vcxproj.filters index 277021830..2c4a0ec13 100644 --- a/Net/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,172 +2,172 @@ - {5728c0d3-b2bd-4a90-b678-182aa28d592e} + {b43a47dd-0210-4c54-a426-39eebd1f73bc} - {9cf95efa-9f70-4c37-bd86-2797f1dbe58f} + {bbdf27a2-e238-4746-be08-d39bbcdf5a4f} - {8f3572a7-ccc7-4af6-920c-d74b5522939a} + {2aa1f9b3-1e5e-47e0-9dfb-3b22a63ffe59} - {3eda78ce-bdc5-45f9-a654-a71736230866} + {4b1d90e9-788a-42b3-ae55-6472b04d9db6} - {9d5a47c5-3ab0-46bd-9389-16c641331a61} + {26f6a2dd-3c7c-410f-9e87-732e2e0431c5} - {0a73f43a-8b15-4d8c-968a-ca6fe5a64fee} + {6a0b9696-a28e-43ec-a7f4-9fc7a5b07210} - {2cc8044f-0568-4c42-97d4-790aee3e1d4e} + {38872078-5b6f-410e-9918-4bf2113cf12d} - {efcb2a3d-7fdf-45f2-8a03-71dacef1a83b} + {969690cf-4b41-428f-9171-33166ccf8c13} - {a649eafc-e8da-45b7-8ec1-f94d1a99b651} + {0fb368c5-714b-46d5-83d9-7e9cafbc3e25} - {4a7d8d96-3a34-43ca-8840-bb41727eb649} + {8f810987-4cbc-482a-a144-b936213c3713} - {4e705fed-55ea-4f9d-b703-3cb80f769a41} + {ddbc1bbd-6ecd-49db-a10d-bd79682a175c} - {c6c288f8-440c-4968-b4fa-a9e7533fff84} + {145e21ac-1dbe-473b-ad22-1b03e6c35b66} - {ecd0c681-f995-4388-815d-5c3eb104a252} + {e770c73d-d2cb-4188-a4cd-bd7f65f2443f} - {43e47e96-66f1-4156-99e8-c786d3b7ef0f} + {dfc9d5bf-a5b1-4aaf-b92d-a2ae789352df} - {d5694aba-ac16-469f-9d3f-06ba474450d1} + {86bac07c-35de-4fc8-92f8-8f582ed4222f} - {de557106-a0b3-4f73-9f4a-d9a391517e85} + {22716fda-06cc-4150-9dd8-266a21fa31bf} - {70c4d41a-967e-4ba8-9837-9f4b2db2472a} + {80a879da-bf17-4e41-9fcd-19fad37c2748} - {098203e3-ff12-4747-9a98-970b7c51270f} + {b01a1c14-63b2-4fde-a157-07ad085b78ad} - {1f63cca4-9c3a-45d4-8634-cd4065d1293c} + {2e844bb9-9488-4357-93c1-54ba717f35c1} - {23cf9d1d-028a-469c-891d-d5fb4a218715} + {4cc27f71-08bf-4a4c-9d53-d8dffcd73b58} - {becaa3a6-92ee-4c61-8756-b4b2d4461fb1} + {ae977df2-5d44-4fcf-8c3d-ddc7461964ef} - {614b3613-6b2f-42ed-b1e6-7864c481a770} + {a1a4517d-6b12-4626-bae7-856d112c62a9} - {a45ca68a-dad7-4ace-b5e9-ed708f20806f} + {656597c9-eec5-47b7-aa3d-0cf7c1309b66} - {fbf303e1-c1de-415c-af39-9c9d2084326e} + {18f2dcd6-168d-407a-bd73-063c204f9ac8} - {8d4913f0-6809-4f4a-9f17-60d84f74e9bc} + {84a933d3-7e5a-4833-ae02-d58731c26188} - {eb0327e4-d770-4023-a2cd-b199ae332556} + {059835c2-8c21-4899-95e3-44486009c1c7} - {07b5e05a-f3e0-44e9-a4ab-075583477d0a} + {137e23e9-9b42-4d99-be3b-ed542a05a723} - {d7d9e064-d55a-408b-8c8f-38a3efda8e8a} + {7a1bea1a-5434-48d7-b307-f57ccd2c5713} - {977fb35d-1914-4094-a6a4-342442aa021e} + {0aea623d-106f-4a6d-b08e-806cf8588a28} - {a5a28979-66eb-4f06-b0c7-7e5f925b5cf4} + {5d7156fd-087a-439a-ab35-4383f0c185cd} - {be3f3b3a-1399-4368-b6f1-7e7af29ace4a} + {cc723f7c-8b2d-4f14-9e69-aaeaa3a12bb2} - {df125fdb-596a-4a23-9503-1d4d8cd87fec} + {58575291-19d5-47c8-8f02-e8ac24e85063} - {77ddf543-48df-45ce-8e20-c722ec486a1f} + {657cbb3c-9984-4bb3-8094-65fa9382add5} - {4e697cd4-d7ea-4115-a1f9-983fd5404ab3} + {8fbead13-2ae3-4a9e-bfb0-e9019dbc5970} - {b6ab3415-4272-4246-b264-6200690abccf} + {01455b96-7b15-48af-b0e3-bf09c980b449} - {18d8d848-3f15-4699-b1af-3ea4707d2ecd} + {9f8af5b8-959f-4c62-90a3-cae856fc435c} - {80cff9a2-cbec-4aa1-afde-9d5c253d92a4} + {14690cf1-40cd-4013-8239-63baa1f44983} - {83354f90-94fa-4e41-a28a-a7d89f9556b1} + {8b956495-f3e7-4b3c-892e-d05bf7c6e9cb} - {d7ad8e99-851a-4ce9-bb99-13588f460cb5} + {acd4222a-66f7-4031-b24b-306c20b6e279} - {7264e276-be6c-40a4-bed0-8ff520189034} + {5d06b9aa-4e08-49c9-b84d-3f39e4f672a9} - {d8c40e68-75db-4cea-b83d-1f01ef54be1f} + {d8e1e8dd-cc97-4e08-8924-243651b61013} - {d8ec4a82-0eb7-46e5-8ef4-e1f317febf7f} + {173c4b35-41be-45eb-b818-c1feec71777f} - {f0b3d06a-0120-4474-a9b9-cd527e33e370} + {d9d0aadd-929d-42f6-b19b-57d366847f9a} - {86995bf1-80fc-4039-84b4-088c4e2da32f} + {83a24ad9-e410-4e95-ac22-368b22b86ee9} - {77966ff8-4865-40ce-b5a1-9e6083434775} + {8259acc6-18c4-424e-9830-0e3fd85ded82} - {25993388-e75c-4654-910a-e24f0debae4c} + {74eab8f9-6c64-4126-91ef-b11b6cf05299} - {664e65f3-bb8c-46a1-9fa0-e7107cbeaec8} + {48519cf5-7e46-48e6-81bd-bec45db0920c} - {065b1485-2f16-4e0c-8477-84e796ccdb6d} + {9a963d75-1f32-4f3f-a41f-fb73cd5a6e75} - {fc8d9dab-4818-4f33-9d1f-f2205489216c} + {1f03f1bc-eaea-4eff-99ce-91c525c22ea6} - {15d83818-f9ec-4573-9315-d159fdfc71f6} + {8cb62422-b8ec-4f48-a815-f6306eb3e2b4} - {70e0fc14-fccb-4a2c-b034-de26eb21f71c} + {28fe3c28-ad3b-4e14-88ff-d9794a9ad5dd} - {40ece1b7-93c0-4b4f-acb9-57158313bf0f} + {044ead3c-46b9-4fdd-a4d5-e11fcffa3df8} - {2f447768-7a00-4884-82e0-d8a43031b6cf} + {b3f9b40a-175c-4b06-b4ef-8c476e442cea} - {66b4a011-aeb4-4432-aaa9-a26ad44d05ba} + {8cc33f1b-7ee9-4b92-99bd-09c43fd65462} - {4264be38-f269-4c32-926a-3d151b3992a1} + {68992a21-b8cf-4bb2-9478-671c93d70768} - {afb5958c-66c2-4b27-a91b-36094167a437} + {7ecc3da0-483d-457f-99fd-d08a5da4ac17} diff --git a/Net/testsuite/TestSuite_vs110.vcxproj b/Net/testsuite/TestSuite_vs110.vcxproj index 4894bfaa9..5fd3db631 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj +++ b/Net/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs110.vcxproj.filters b/Net/testsuite/TestSuite_vs110.vcxproj.filters index 8567e0071..32da8dc62 100644 --- a/Net/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {f029f7fb-462c-4d11-8dc3-b839665ede4e} + {ca838a6b-45bb-403c-be85-0805bf3d1161} - {83652568-9cc3-48b1-825c-e1ac30ac7a1d} + {c8691451-d67a-4e4a-83a9-d4523a4a3421} - {9fb90527-c92d-4d36-8474-5e7076e1835c} + {46bc2013-8a30-49de-b85b-832f423fce40} - {0f071c1c-dbff-45b1-90a2-d78c05b95bab} + {3a546d75-9a4d-4469-b04c-2a52ab75f8b4} - {48fa083c-fa84-4591-8b7b-ee2e6f656768} + {c88903a5-fa6f-4d5e-9755-2eca5c7ca2a3} - {9d6fc41d-de3d-4400-808b-701dcdbbe9a4} + {5124201b-a95c-4b17-9994-62868a33ca17} - {986e281f-420b-4f50-a82c-8a1908ab1ff0} + {8a38beba-e254-4468-bd6e-a09c8beb5f3c} - {cb021637-9050-46d8-8c36-b8fc0cd7eda7} + {6ea6c3c5-bfdf-47e0-8cf5-ba46d1cc5ca6} - {2c2f716e-c03c-494b-bd8e-61211de89a9f} + {e78880d0-2197-43b4-8525-c00ee911f07c} - {d5e749e3-8a0f-4de1-a754-3cc3fdeb01ad} + {5f3919e3-5c32-47ee-9bb0-1b36c3d14060} - {e08e4132-1c35-40eb-b43c-38c2b2920e6c} + {8edf3668-9376-4f29-bd0a-d28682cd30d3} - {882dba78-3c40-44d6-afe5-60a175224bb5} + {eced0e4f-5134-40df-b7a2-0cdec2e56b40} - {13bd1490-adbb-43b7-8730-9354652a6a31} + {dc88c489-3a0a-4b18-9e72-aa5f36cbe41e} - {96ca38f1-79c2-4d22-90f4-34b2baba0ada} + {a53ad782-006a-453d-b0c5-c883d4c67032} - {a7f48c05-729d-43ec-93f3-605867577a04} + {e2c1caaa-365b-4841-97f4-484dd2844c39} - {28e65561-7aad-430f-a3b3-b7227e912f3a} + {421b60f1-681c-4b56-b723-eb2f23e94e0e} - {f08a76ed-f9ef-4778-aee4-be64f9652902} + {74df62a5-8bbc-4d4e-a972-691ce1c85bd0} - {e2c53f40-495f-48b9-8818-73403e8525e1} + {ab441445-3d66-49c9-9043-38811f6e4934} - {eee9ee5a-0c04-4b84-8aca-c8f58454afee} + {18965a64-fa84-46a0-917d-2ee755eb107c} - {c8e3f438-cb32-437a-8aa9-67f901e500f4} + {4300d649-564d-409a-917f-5968567c1084} - {b6e661a0-b0bb-4330-9d50-a83ab4d85f1a} + {10a6f4a0-25e7-4220-961e-a32074e7a6be} - {aa459a55-0691-4a7b-a325-1b38dc097713} + {70f09906-e677-4c42-8ec6-0a3fbec3aa60} - {f81f5c19-28cf-4567-8620-027491456325} + {dea61572-5c5b-4013-9b47-f8a456d9c3bc} - {817360b3-7477-49ae-8c4c-09ca657000f9} + {09f98018-e0fe-4ef4-ae47-c6eb678665d6} - {29b69b4b-a6e6-4322-8507-8f361afaad3e} + {da024b05-fc2d-41d3-aa3c-e163b82d1da7} - {15520124-5dce-4b27-85a0-7c621b5955cc} + {88a69fa1-a066-42bd-ab02-26ba539b17e8} - {3555741c-7e87-4e34-8ea9-79585400f678} + {8b413e05-3289-444a-92e9-5200b35db0a7} - {190f5db0-fbb8-4e1f-8aff-f9913115425a} + {27e9f68b-ea0e-489b-a908-9e5ec7efae71} - {9c4a6be8-3907-45e7-ab5d-1f930041ee46} + {5ef9ed7f-aca9-4b84-b4dc-c3bea39a5ea9} - {a04a994d-70bc-4aac-8852-f2d5b0857a0d} + {0c93ef08-1278-4dc1-b6b4-186400a3129d} - {e9ba0d74-aec9-49f5-97d7-dbaf7cf41091} + {8ad493d8-ed08-4124-adcb-3aaab904614b} - {72dd9799-ea31-4ce1-bb46-83d778c2f2b8} + {23c9fa6d-fc97-4bab-88eb-11b94e056cf1} - {046907fe-add2-4222-b6d7-d06e8f8d216a} + {ec2d266c-0784-442f-b10a-f63c7214dff8} - {44305d07-7acb-49ee-b812-b870dc2cab47} + {16c2687a-fd8a-44c7-b396-ccffd4e1184d} - {055c955d-654d-4f7c-b6ec-4963bb0b0c47} + {38a8ca5a-d225-47a1-8ba3-2b2a34eef67c} - {8dd6d8d7-7cbc-4d1a-9cef-cc38bf8598ed} + {da07d6cd-7e5b-4c56-86d6-afc90dbc2b1d} - {0c17fe74-1365-4bcd-8b68-cef4309b50fe} + {e06cbab3-6308-488f-ac14-f8ea3fc18b3a} - {d4b7cacc-27bf-4526-91e9-e1fca2eb33fa} + {51c42b4e-7a5c-43f4-965b-a17985e72eec} - {90f97a9d-f8ac-4dc4-989d-af51b59a995c} + {762926d3-baa9-4915-9926-260b13817757} - {4ccc0e4c-5e93-447e-a5de-41923196b390} + {9c2eb518-ee5c-49e8-9524-d42a611e65a3} - {de1aae49-16b8-4da9-921a-56f599d05cb6} + {17e6d675-7dbf-4379-b165-fd161c4edc17} - {449c24b0-1493-40a7-98c0-4d98e79c6915} + {719de0ef-b99d-44df-9fdd-9cde474b8ae1} - {41844278-e7b1-407a-9373-db109858ec3a} + {0607f90f-655a-4fa5-9e48-3b0b3aa8dc75} - {dedcc659-c129-4294-a4d9-220608e69b4c} + {2fc66b52-87ff-4524-80d5-bd54adc7d000} - {fcd02209-ecee-44f2-b4f7-2963e2b6c1a4} + {8493e16f-7249-40eb-9562-ebe885c6ad03} - {f1878437-a01b-46e5-85c7-df0025a2d3c2} + {f361a7de-75eb-437f-9014-35f208291f4f} - {1452b0a4-1200-44d2-a494-4af46ab066f4} + {31399444-98b8-4ae9-86a7-8e2dbcb9b9a7} - {3df89288-f91c-4f7d-bbf3-86f2946b649c} + {ee457777-39d5-41c1-95e1-b6b9b2c82058} - {a83be952-0e06-4237-9a87-1b84ea41de82} + {9fc8d536-cc8c-4a50-a415-044b36856a71} - {871df8b6-f570-47df-878d-5cd2573ddf7e} + {82d3de02-4439-4961-a026-44f075c85c9c} - {098fd799-0dc4-44db-ad68-ce1e7d584df8} + {830228f5-b9a2-4d82-beb5-638f76680541} - {b18d7429-0846-48c7-ad52-9782ce89e519} + {f7f393d2-9461-420b-9062-4da9122adc1d} - {a4fd4f38-75e1-438a-ae39-1be5623bd6a9} + {2de0b41e-4eb6-4247-ae62-75598e3bc095} - {058033e5-b495-4d41-b0b9-c109c3587249} + {c166c8d8-5a27-443b-b46b-113657248356} - {5ae0d52e-9c54-43a4-8512-8592ce343ae3} + {cadac45f-6fa5-4b76-92e5-3f3b76af900c} - {e5071d6e-c84a-48af-9102-49d42f5940b8} + {bb82dd6a-b194-4d64-b46f-fe08bd7fb392} diff --git a/Net/testsuite/TestSuite_vs120.vcxproj b/Net/testsuite/TestSuite_vs120.vcxproj index 83123e4ac..7ed86b059 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj +++ b/Net/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs120.vcxproj.filters b/Net/testsuite/TestSuite_vs120.vcxproj.filters index cd497a22a..c4effbd66 100644 --- a/Net/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {d7c40481-3f7a-4ff2-bd67-c699e120b383} + {4c8959ee-8e63-433d-8a38-fb490d1e72c1} - {97d3594e-2627-4d12-8479-d97b6e224218} + {ca71e04d-b671-4a96-a9b1-8f10eb3a0fb4} - {df6af0cd-559a-45b2-8d00-7bfebeebaf01} + {31f4027f-2c93-454f-9e7a-d5954745aecd} - {e6b4d800-092f-45f3-8809-218eeff705a1} + {29bcf73b-03dc-4d38-a4b1-ce5992e5870f} - {c7de401f-4b19-463d-959c-5e3b492edfb2} + {863f147d-dcd9-49bb-a479-a461b786bc23} - {ab40819a-8c03-44f2-83e8-3f6972d08bf1} + {82bf04d2-304a-4327-b284-d4196b787187} - {898912f8-a7d2-4bdb-8ca1-19ce58354870} + {53789c7f-24d5-4307-a1b7-4555a7da823a} - {d69aaef1-27ee-430e-b3ca-1aaca6ab265c} + {d9c8a7e0-f51f-462c-a0ba-cf32cc507564} - {1ba91b1f-6223-42e7-ad11-5637bd91f9a5} + {1f2caaa2-e8e9-4479-94e9-24f39ab17abf} - {ca624b03-7267-4b20-94f4-ecaa373b2076} + {ce1e7a52-b56b-4f4c-ad19-476a6d0cda06} - {ea8d40d1-d84d-4523-908c-23679d892df9} + {036769fd-6ad8-4cba-946c-a838251a8f82} - {22ee0b04-3ee1-49e1-a515-df67ab75f163} + {720dc57c-e307-4821-96a2-4a5b17585183} - {ad5244e7-3f69-498b-bde3-8886864c12c4} + {84a6e2de-2027-449d-87f7-c8689c57aae1} - {17b01732-3e5b-42d3-ae08-a6ad61f1c752} + {5aab1216-6feb-472b-bef7-ce99ec4e475e} - {4afd8aa9-a635-4864-b267-b2ba233d50bd} + {7d467a73-9aa1-4e09-810c-bf74969b7d37} - {36e0c825-ca2c-4c87-bd50-97181c9381d2} + {6f2cf75b-cade-4097-b7ea-c4ec2f30288a} - {a29a9e64-cc19-4c4b-828d-e0c5b2331552} + {08b5b947-4e0c-4242-8d9b-6d29132d26e7} - {d0126713-387b-495c-828c-7a79cc9bbc3f} + {f8882328-40b6-4f9d-aac0-a764bd134cc0} - {2357dbac-be06-4db6-a802-30d19e7ff3bd} + {9d4c9233-5733-4f3d-a26a-819f677e0960} - {b4166f9f-5aa1-4e1d-b851-2ed770918e5d} + {c7c9fdbb-8e4d-4454-ae7f-2dabd53b6bee} - {df77933a-485a-4c1d-9c76-dd7c5ca641bf} + {3e65ef20-7637-444d-872d-da4853975f56} - {da4731d5-9b0f-4e41-a87b-0b03bdcfd83b} + {2c5e67c3-7740-4d93-b090-bede39dae907} - {d7bb3f01-6aef-4af7-a5d3-bfcd22792ab3} + {71b4299e-1cdd-45d1-adb5-55a5610b3748} - {7d3355fe-2710-4d41-9022-feaa5e365d54} + {5d0e0de1-a39a-4aac-870b-07922123f7dc} - {a273e5c4-75d8-43ed-901a-b575643bf785} + {df3c2a16-d51b-4ea8-b369-5bb4b1fcd1cc} - {be29f318-35e4-4bad-95a6-c36898fa1900} + {bac29b31-6b2a-4990-a7c2-36fdbb5ae7cf} - {516da60c-f05a-438d-a48e-598a3dc16b5b} + {44a0c2e3-ec71-46da-9dee-7d62ae3a3e6e} - {afe786cd-1fc4-4316-a839-6614af9da8c4} + {0877fef7-3f9a-44d1-abb5-135aefaeccf0} - {c8808015-29ba-476d-af7a-e00bca433444} + {3f832eb1-5ff1-4ff5-9ed6-cc761f7c2377} - {5f32b2c1-91b2-4313-8063-4617f07746e3} + {2cd00ed8-3aac-42ad-a429-858933e9e19c} - {1952254b-642d-461b-a0e4-f4fafa2da2d7} + {d7d03cff-d28f-479e-a967-20a1686a7a8d} - {29ef0bbc-0310-4a54-9940-7564be89d1ed} + {871c96c4-b391-4a87-9f22-018776597d80} - {d8ef300a-9b8c-4878-ba98-ff26d168a0d8} + {578a6aa6-89ef-4b87-914c-294f0b65d181} - {59facba4-f907-49d2-8bff-701646cb4c63} + {709aebb5-7ed6-4253-b1c4-f64929a5230e} - {57d3bd37-ed46-4955-aa9b-9177825dda82} + {a1c2958c-f462-4d9d-8859-ee403128f210} - {157a9a7d-2d4c-4900-aba8-e2ec395c64e6} + {26401ba3-5dfc-437d-a013-68eac6e4e117} - {2cdbe7c5-a889-4ebc-8c6b-7c8be363d98e} + {be3ab864-44e0-4284-b1e4-ebd0dc4f965b} - {085998e9-445f-493f-9375-281e162a7a5d} + {84c42aa1-b80e-4b4a-932e-fedfef96d6d7} - {98ba3bd1-e164-4a5a-aba9-9194be43d7a4} + {1e0289d4-51f9-4c88-a00d-3294644fa6b2} - {50592333-b415-438e-a0c0-99539790b9f1} + {a8327815-0423-4bb0-b14e-673aca66ebeb} - {386480ac-4daf-4003-967d-b3a57edcd174} + {c89d429b-c314-494f-87ae-14a8b6059478} - {6b264b3f-4fb2-4b23-ac24-beb12531b73b} + {f1f43cbe-335b-493f-a57f-2e565c72a368} - {c9341a7f-af58-489f-8a53-d81ddd759546} + {19f6d25b-d4bd-46fa-97b7-93c1c38e3fc9} - {ce31685c-c742-4358-8d53-e0efd2ff498c} + {1b77180a-9941-42d7-b906-43391ed4ce8a} - {1cad5d06-8411-435f-a0e4-0cf49e6ecc9e} + {9f5dd450-11cf-4c3b-abb9-7b72262cbab8} - {a6d3e420-72fd-4716-841b-b16553864ea5} + {a5534ce4-f2db-4b79-aeaf-3ab3e6491a41} - {fd70b4d4-6657-4a2b-93e9-a5374dd585db} + {c19e7e50-e2e8-49d0-88c7-c35f8761e9c7} - {8703b4f9-4f23-4475-aa3b-33bc6a0f0293} + {4ca23383-2225-4b62-81a1-cb3cb47cfe34} - {cfb62b44-6f35-49a9-b886-0582191d7b87} + {39576711-3c81-4742-8b2c-e27d56a8101c} - {f9c5d7f4-a0ee-4e66-952a-7f99400b2c3f} + {b021977a-b362-4ebc-bd6e-da4aad72c54c} - {6aae1325-3721-4296-b31b-4b9e747c099b} + {701a92ee-bb92-45cc-b7f2-5c8f81bfadbb} - {661da0d4-61b5-4c0d-bb55-9ac8ed8f092a} + {facc58cf-459b-4e4d-beb7-3f0e7a3e3542} - {121f0390-7f6c-49e7-9d6c-1f24347f0283} + {9f88f8b4-1748-4e72-81a6-44f7d1817bc6} - {aa5d3700-35f0-40a5-92cd-b21a0fbe51fc} + {ea364115-3a9f-4fb7-b749-21fa3c393f3d} - {00982eca-e608-4e59-9f93-2397a6e78886} + {050f3645-87cf-4b72-897b-0ff61dafc430} - {55e598dd-5506-45ba-b3d5-ffb2e2cfba96} + {39f259a0-7ebb-40d5-8fdc-f5f4ffcf3064} diff --git a/Net/testsuite/TestSuite_vs140.vcxproj b/Net/testsuite/TestSuite_vs140.vcxproj index 24d57c61f..56216485a 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj +++ b/Net/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs140.vcxproj.filters b/Net/testsuite/TestSuite_vs140.vcxproj.filters index 43039c2a5..72e8c3955 100644 --- a/Net/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,172 +2,172 @@ - {e990bcad-6f38-4d6c-9966-58e8ebbdffdd} + {2a3fba86-c5ce-4077-bb1a-d5248b338e72} - {efb9cb68-bef6-4000-b79a-c600d4d3ebb8} + {f5157f1e-b409-46bd-9eda-9ed05daa9dfe} - {115b7013-a603-4369-ac43-9f692341cca7} + {1b41606f-c870-4ae3-bf9f-ee05829cf6f2} - {c41fdbaa-4b54-46e0-9b2b-bc4a7f5aeb52} + {eb0c6c6f-d998-49fd-a004-b6103101bc25} - {64d281df-794f-499e-912a-779a240a7368} + {408da1fc-e6ab-4c6a-a35f-063ada65d7b8} - {03a518e4-979b-42ee-b7f5-ac3069daf2e1} + {f60e9534-3e3c-4b9e-aa9d-65e839fc7d95} - {2c69f313-b291-4f8b-b28a-a92ec248cb2e} + {291cc452-4b95-472b-a31d-17bfb8acc32e} - {ff63fdf5-ee9b-455e-87ec-7125a6a010da} + {9a59fc30-c08a-4a32-8393-77b17018b176} - {378a0433-1f93-486d-af02-14d0f4563549} + {18ebed2b-1ff0-4380-8b75-5b1f19f61115} - {7103da23-3f21-4416-ac5b-a918bda6513b} + {d427aa3c-990b-4f42-ad9c-c1a3b87c9ac0} - {b62b84bc-c45c-46a2-8597-89fe8d98d6c8} + {490e7363-ac3c-4e8c-9199-14938237e529} - {40449c45-d7e2-4d6c-92bf-788cdf86bb2a} + {d21d483f-dd40-4d11-9d69-b6641264c96d} - {bef55e5f-c40f-4d33-9d6c-7aec426278a8} + {227ff444-0411-4999-beba-81c27013fcf7} - {34dce0ae-f5fe-4540-9c0a-456c1dbe545c} + {802e49b4-3c62-468d-a46f-c18fb23babf7} - {5f0a06fc-5d72-4ee4-87d8-e5628f4088a8} + {4abab907-8608-49e7-8120-9ad1e65fc25e} - {59444805-0742-44b7-b9ea-fc6ef8987720} + {c2cd258e-e1c8-4921-a54f-e01b0dc4df39} - {68dfbe55-eddd-42a0-854f-1932dfba44b0} + {06ed7a7b-eaeb-4f84-85bd-f9dac9f62193} - {d1901967-cac6-40a3-8855-874e76804dbf} + {80992659-5eb3-41f0-ba74-1314ff8e667b} - {77ff79f2-7cee-4781-b533-5f71b3f738dc} + {4817afb3-7331-4cc1-b5c6-5987d3bd86c4} - {f15a9e09-c5a9-4327-bd1c-74c97e4d78dd} + {9242d141-9e56-483f-9e07-44cf68594364} - {350f2a9d-65a4-4b65-96f2-d4e374d1bfb9} + {358958a9-dfff-4885-8340-38d40ce47be2} - {6cb872ce-52d8-4187-8e81-6d4a1cf3f458} + {15149efa-3188-4522-a6bd-09feefe2841a} - {ffe50a16-540e-42fa-8f92-b5bbc932e234} + {dc42ef54-22fa-4203-aa9c-1b06f73152c5} - {195d94fa-3908-424a-86ce-5cc50fea3f36} + {6656d88a-bea5-42a9-9a9c-126634486706} - {09121871-3725-4a0a-b871-d084f2f1c0ad} + {85fea70d-1e12-413d-819f-f9827a3dd31d} - {43cbfa6d-c57c-4800-b820-b4359c8dda0c} + {1b856ee3-d0a1-4e74-a85e-982e1147704d} - {45e2db8d-270e-4dfd-bbf4-c6dc0077d579} + {32f15d56-7887-48aa-b1c9-2c59f9059f7c} - {4b1caeb7-1da2-4bac-8242-3eb70116c9ef} + {5ad7bcc6-f458-428c-91e2-ee273cf0b44d} - {1c38d222-b411-412b-94e2-30c5719b8df0} + {6dcfef9d-feb4-44a1-b6d8-707c57d9604a} - {bf01540e-ebdb-41ce-96e7-0325980402e5} + {41c10829-0e65-4575-afdb-6af0a1cd362d} - {a2789047-8abb-4741-a0b2-0fc1bafeee0b} + {8558ab78-20b7-447c-b6f6-32d9fcf48c5f} - {82cc2ff2-416d-401a-96f5-65f28039f2dd} + {48ed2f6a-d86c-43ac-9e9a-5d32b50e559b} - {b3b9d93d-03b4-4411-a91f-348a5162df60} + {d2599ab1-c156-442b-9e4a-d9908a030748} - {e614317d-8600-46fa-a2b3-5a6a0838629f} + {cfb085c3-e03d-46ff-a48f-2c21141d6d3e} - {38a63444-c4af-4711-b68b-dda3afd65b3b} + {822dc085-d3ad-4033-b708-eb3c7bf53df1} - {2fe5f544-b7dd-4d96-b455-e493dda8db42} + {99e280dc-9508-4f3c-a7c6-28281d19830b} - {12495d30-674a-4731-8082-b6cb8e6f9466} + {d5fca001-e878-4d88-b56f-17dc15b50c8a} - {ada17a97-6d50-4613-b20a-b8e1a8c0d2fc} + {e38cb257-6a74-4b53-9fdc-8eba313be7c9} - {e6cdc335-7853-449d-9634-e7e455d13485} + {28f754a4-a27f-4718-b0a8-0a0bd98b66f9} - {1fda07b9-fb20-49a7-98dc-21af9d51e799} + {a5673596-526b-418a-932a-1413fd4e1cb1} - {395c6170-738c-4b17-8d42-07fb0ab53b96} + {67d773b4-152e-41b8-8d7d-827e191b5118} - {8f761a12-f900-4cf4-9efa-4285602688db} + {cfbf19b2-6d2f-4975-b2b4-788abfdae51d} - {a06206f4-434a-4c0c-9d87-476fe5d64716} + {a579fc17-0c8f-451d-bf99-15fcc3973a2d} - {40b6eab9-1d2c-48ea-95c3-1558dfd653e0} + {d4a5b8d2-ccdb-4f5b-931b-fbaca9619bc0} - {4b762480-2c00-432f-a000-0c1fbc2093c0} + {8763de12-e5a7-41e8-a30a-3e3b04e830d3} - {1fbbad53-8bb6-4c60-ba03-bd47b54a3ec0} + {ab41a935-8d10-48b7-8518-7c489cdf2ad9} - {054ddf47-da58-4416-9164-964585857f04} + {311cd7a2-8076-4d7c-902b-d502ae4d7153} - {47d389d1-8c00-4426-851f-856e5ce9da81} + {a95242fb-e5cd-4b75-bd82-914a69b86f2d} - {68e1ad2e-f4a0-495e-bd4a-0bb6efc9aa83} + {88ef97e7-6908-4121-8586-a24373f42ed0} - {c8052dc0-4967-4d8d-9ad3-8ff19f1e3622} + {0bb90f7b-f29e-4946-8ed0-b4b42de2420d} - {5a67bdfa-e8fd-45d6-8234-6a5383d84eac} + {6160d6ab-4189-4ae5-ba0d-74f7231b33b2} - {0c4c6126-7198-4b61-809c-d911cb1962ea} + {5807567c-d143-42bc-8a34-ec67a2d13e4b} - {2a33bbb7-8db7-4ab4-9507-cb676eac0ba8} + {3380b2c5-3ac9-49a5-a410-c409624ee917} - {2ebda656-c2a7-41c2-b8c2-0711a22981fe} + {00f66ef7-aff3-417c-b382-11d48164575d} - {4d693aab-3512-4a24-b114-48037a713f7a} + {a66479a8-9cca-47c2-a278-588333bc9be1} - {04e13af1-c1d0-4c73-99d0-91c120805ac7} + {6641ae6d-55e3-4343-8dc9-f569783fe4cc} diff --git a/Net/testsuite/TestSuite_vs150.vcxproj b/Net/testsuite/TestSuite_vs150.vcxproj index 6d76ee41a..def54ee5b 100644 --- a/Net/testsuite/TestSuite_vs150.vcxproj +++ b/Net/testsuite/TestSuite_vs150.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_vs150.vcxproj.filters b/Net/testsuite/TestSuite_vs150.vcxproj.filters index 53ff14344..572c0e5a8 100644 --- a/Net/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,172 +2,172 @@ - {a447cd0b-d35d-4c5f-92ba-fa5ccebd7676} + {b0fed850-f46e-4bf6-8e91-3e000505ebe3} - {193021ed-7c0f-4c73-9c64-fcc395f776ac} + {4e68cf5b-e486-4f7a-9550-ed1c9d9e7a36} - {a8d08970-5c78-4202-9177-336bf182fcfa} + {aaa16703-1a7e-40e0-ab5c-7aff444059d4} - {0ab0e95a-bac5-49eb-aa26-d4519024d49d} + {3c2137d6-116d-444a-947c-cc0009f559dc} - {32e847cf-e330-419e-b507-bd3f74eb8edf} + {66248ffc-5ceb-4f1d-a075-eb77b57d2b7e} - {039e2a7d-370e-473e-a530-ddd5abe0917a} + {ddc1195b-58c7-43e1-b46c-9b541d30b511} - {7eaf549a-4fac-4154-bbf9-62af27e7852c} + {1e454aef-1437-4b89-850a-7b7a9784cd66} - {4515d9c0-4de2-4f1b-9f99-e997fa6de2e3} + {98f9cac7-e622-4818-986a-bf9ea198bbab} - {6b356f25-6a45-4ab8-aae1-8f860b8c579c} + {8db2c404-a713-4a1a-b12d-7612b62f52f6} - {e14a0ae9-03f8-4e5c-98ad-3dfdb039bf95} + {1e152e39-9a9f-4521-b975-d600d64739ae} - {c9805804-7847-43bf-9bdc-f0d006d69c1b} + {deede209-450d-454b-97fe-0d280e68aa6b} - {11c6486b-76bb-49df-ae65-6f0bf7778bc7} + {a34f47e2-2006-488e-9f30-64c3e175e070} - {11ea7fa0-d139-41e8-9a96-39175dcf463c} + {3b3d4d06-616c-4bda-aafb-fbdadd980473} - {5831e1d3-1a33-4866-a093-307bf3e71428} + {af0e96d7-1c99-4576-a0a7-931af2f05773} - {2f2104d8-5a12-4ac3-a0ee-860da8b1eee1} + {f9b2d751-19cc-443d-bc83-5cef2fdbbd08} - {ca648205-22b9-4cfe-bf45-c811b8961f2a} + {36269bb8-2392-46a0-9fa4-40e9791b591d} - {6f0c36c8-41b0-409f-9c94-8b6d9050024f} + {b4d5548e-a842-460e-a043-9355904f0f68} - {f69d39a7-fe1e-4206-a78f-b4b0c3838509} + {2318fdac-b408-402f-ba6d-8e04eeaf06da} - {14278392-6e62-4957-a2da-4cc43a60a279} + {c116923e-e7fb-4648-8138-c691c37440c4} - {35ea04a9-73bf-4bad-b03c-d6b66bf4504d} + {3a84d9f5-52b0-48ae-a775-eb75b65bbd86} - {7dcd73ba-686f-4af5-9480-1f7b49ef2857} + {bb76dd6a-844d-438b-992b-ea52c795b2b8} - {6ca29e9c-10c6-4f35-88dc-2b2467033b9c} + {24d0183a-b463-49c0-9cec-ae81cc500b8b} - {ef718e20-76ed-4219-8aab-f48a3c3c32c9} + {638caeac-f7f8-4d99-a37e-dc49fc7021ab} - {500e99fe-d74d-4db9-9d4a-e8feb7554abc} + {3a91d676-4809-43e3-a1e3-543d84529fcd} - {1c36410e-e3ea-4ed8-911b-3eec5cb487b4} + {b408c637-3f0b-411a-af1a-20fce5998de9} - {28fc7da4-c627-4f3c-b942-730c9f22ae7b} + {e9a01f59-f09a-413b-a864-c2b9fdccc0ae} - {f49ecd55-b542-4a41-8cc9-48801c182d07} + {36e95c29-e3be-4bf0-ae9f-ea4247d849fc} - {0a322af7-5948-49ba-851f-054f63c2b57a} + {2503a898-ac36-4dd0-ae57-5978ec1c66d0} - {c9af37ea-ce6a-4960-84f4-1891c66615eb} + {0365a735-1626-4ae3-a363-c1c2e3a86568} - {93c0c545-7e0f-41b6-842e-e49964f9637c} + {68bb419a-f06e-472a-8a15-2eca855e7f96} - {91f02973-753f-49d1-8e8e-e790fc47575b} + {686cdc2b-fbd1-42ab-a562-61c20794be54} - {462139f4-a2a6-49ec-bba7-6553fae78e80} + {fa3197e8-14c0-45c1-a62b-090365fa686a} - {17d01959-f7c5-4e5d-97da-1cf49a4121b7} + {4e2a1d86-f39e-45de-83e2-6f615c44fab0} - {0fb6c603-a14a-4571-a3a9-3aa9378ba368} + {084178e6-7c06-4410-9fbe-670693c1c5dc} - {b245d3e5-bd90-416f-a2ff-13f53e1fda1f} + {3cc5c99a-3d5e-4622-9a37-93fa00efba5e} - {738b544c-d1ea-4376-8924-b8a806a82cda} + {2ea95213-df84-486f-936b-8239a9506ba1} - {0b56399c-f16d-444f-98dc-c2625f345f87} + {6e965435-2beb-473c-8bfd-fc26d8e78130} - {78caf1d1-7921-45ec-b001-4d74c20d1712} + {062bf497-f586-41ce-bb55-44ff32533583} - {a43cb2dc-238d-40d0-a6aa-eae184640642} + {e56b8f49-6975-4572-992f-09e2c8736980} - {0932e4dc-8748-4c3b-8a83-b2361673e21f} + {87a0f7c2-9018-4691-911a-1058d9178d8d} - {98fb1ff5-7fa1-4605-8765-41ba77bb6535} + {90621b0f-99cf-4700-bd34-67f6b924c545} - {422c5e51-0c09-47c3-898b-9496bb98e0ac} + {4bf59625-6513-41c8-8655-74615d68e905} - {b80b1922-1079-4b4c-951d-f74f0d2cac75} + {0d575938-f963-4ba2-8128-7e4ed79af953} - {fd05108c-7570-4707-b4eb-cc0dfc3335e9} + {e760fe73-d373-422c-96b0-f1b6953749e0} - {f650cf16-b362-4eec-a662-e7c234637a90} + {c8e56512-06e8-4563-919f-f98e125e6581} - {4e14f166-f6e8-45d3-b234-19942f853cec} + {3ea4518a-e7a4-436f-a51b-ae555cc97141} - {eca5a9d0-af19-4990-b448-af1232c33574} + {881ae6ac-4f64-42bd-b81f-3ec9f0bc361d} - {1c67b70c-9284-4c4a-8e8a-7417a6c784cf} + {576ccac5-d79c-41d0-91d5-7dbd42eafc18} - {cbdfaaf4-2b24-40fa-b258-52ea8e043a23} + {4cde3db1-67ac-4142-a3cb-4e48eae76a1b} - {cb2cee8a-471d-4e29-a206-bfb6cf7ace33} + {5a527bed-a0df-4fa7-a704-324c8c5a5af8} - {f607c06b-de73-4532-bb04-47af7d314120} + {f7c40dd2-2808-461c-969b-a21de4bb1258} - {00327281-dfed-47f8-b974-d9c76c45758d} + {703b5fd5-0108-407c-8ef1-85de88724140} - {c2208c2b-270c-4e83-bc3d-faf6ec9545b8} + {4839176f-4215-46f1-90b3-512da565f014} - {25e44601-1767-483a-a33a-aaa8903dbd7e} + {7eb1fdc4-b973-4924-8234-b480bd56a2e1} - {4dc3cfb1-78f6-4ed2-8a46-02bc95fab044} + {77e2cd63-ecb6-48cf-b4c1-c7f011b9b271} - {f346a326-7fb9-466a-b554-9b01b2b7a725} + {f203a372-8c39-40fe-9a55-7567552864b1} diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj b/Net/testsuite/TestSuite_x64_vs100.vcxproj index 68a2766ba..74b52e09f 100644 --- a/Net/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters index b855b07f4..8f240596f 100644 --- a/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,172 +2,172 @@ - {ab106515-04ad-4dec-a017-30c35975b143} + {c8dd456d-0cc5-4755-849a-70e31e032b46} - {5065ca31-85e4-455f-9258-f275e245a098} + {b081b720-fc47-486f-982a-47a176ea3c75} - {2f7c8de5-4866-434b-b40f-d27965c6d56f} + {0757f44d-1f8d-4b72-b5e4-b2d3d0acf344} - {dcacc945-94e4-4c34-afd9-e190a1d62d11} + {5ec5362d-6f3f-4147-bf33-f5aae9e1fb75} - {275f576d-cfbd-4e4f-8d83-5b47583c3ae8} + {71e6d5bf-4383-4e84-9e8c-6de772435357} - {b1ce7247-73c6-4a2c-b066-f7e89d7beadc} + {038728c0-1c07-4e4d-9706-b7d6fc0b9053} - {2feef4ab-3019-4b81-9a2d-0cb800c6def2} + {f5c1ef27-a922-4138-9686-609c4fc0239e} - {159245fb-97a9-4808-9d67-f3960d75e1f8} + {84050bd5-67de-41f3-9a7f-c7cb4bbe9b4a} - {b99bf61b-9975-4b2e-a74e-cf0c24698d3f} + {3a04584d-8431-4b9f-a0bb-d2099148f12f} - {488634f6-5e1e-40a5-b4c0-8aec70e64d41} + {c4fbf46f-70ea-4bd6-8cc3-70237887ea69} - {768ab731-c000-4682-bfc4-a2c1b3ce0ba9} + {e4fb4f0a-34eb-4aba-95e3-d45758370e37} - {6451bb62-43fa-459a-888e-e43aa8349060} + {6a3e452e-c315-426a-8ca0-47e3b4641fe4} - {67374d56-fcee-4158-8fd8-bc5a23fcc22b} + {ca18620e-120d-497e-bb62-6225b212cd86} - {9eb63a04-ab5e-4574-b61b-990804bcfe1b} + {d9b239de-2119-49a7-9a6c-98e75737520a} - {cffccf09-7465-464f-b1d6-6696007f5238} + {59c49bca-ac2c-4ac7-ade7-deb07482c162} - {8a7f4c4e-fdb8-498b-b054-616e571f548c} + {f9301c14-edcb-4f2d-929f-0dae922a58ac} - {394f30bf-14ed-4372-9dab-2ad0f285dd47} + {488bfa99-aa3a-4e08-af74-70590f9b0f86} - {54f36966-9417-4f9f-a69d-7be40700369a} + {9c47079d-8561-45dc-821a-1adffd6dad62} - {a83b7429-b926-4e66-a67b-60e19eca05af} + {1d3239ee-e9bd-4b67-8086-3d783e8279b3} - {11830fb0-6642-44ed-be62-d5eee18f2582} + {1464a2c8-79a5-49b2-b79b-bbcb10ef7c70} - {19f8ec40-ad56-4cd1-b62c-e257528d2a0a} + {7b69524d-c12d-450e-8a09-28e59ad194e7} - {9510749a-104f-4916-81f9-7d315c298d08} + {cac2614d-f291-43f8-8930-c478fbdb4e29} - {4686e713-ebcf-419c-858a-5a1e8068459b} + {fea6ed7d-054e-49fc-99c1-59da6c4a702a} - {12fcef24-3ad4-4d9d-a0a1-b4f2f36a5747} + {78e86c2e-be64-4944-85ec-cdc55bda4870} - {c0aba85f-b8db-4b24-ac87-ff1cced1c6f6} + {bd442491-3c91-4ca1-a966-1b8649b01fe2} - {54ff374f-df78-4414-a546-9e887a23f04e} + {9cdc4d18-ec43-4d4b-94ee-a1d9c5b5496c} - {1b8563ac-5b99-4fe1-8496-a3c2dfc691df} + {b1b7b973-4541-4eeb-bce9-080ffa3eaf39} - {e60282d0-3f0f-4976-8dc8-686af02f9f98} + {80d47547-a4d0-422c-85ac-cec1b947d236} - {508ea1a2-cf1a-49de-b716-3548c5ec9b71} + {64b08360-1ece-4736-9366-ea7d772d4ea1} - {cd82fb44-c92f-435f-989c-faa179c02ae7} + {b7032ea3-4b7a-4886-8ce8-0db4bdfefd6b} - {92af3738-5a26-4f5a-b901-c650dfd4ef5c} + {9e4ae8d2-f8da-4530-ab9e-ec37e763be78} - {bc397e45-5707-4081-b3f9-dad86f4074fd} + {16eee69b-7039-4bb9-8e0d-a164d5ea5af9} - {a2b5aebd-2ea6-4985-8caa-6123a6286d31} + {34368bfa-74d8-4568-8b39-7d19c658813e} - {31395c4c-03e7-4051-9428-7b66a3516292} + {6dc45588-e66d-46bc-b9e8-89a9a1711e24} - {b77d7be9-d4c2-4a9d-b85d-f14f4f3ac483} + {396439ab-ce2b-4f72-ae27-4471a9e3ea7a} - {36962959-2468-40f5-bcb2-3cc9103adba3} + {5fcadd55-b3ce-4db9-b1ba-ae2628ea35a1} - {b3479ec6-7381-4d0f-8b02-13f9da880a26} + {b25cc9a1-fd3e-449d-890f-1fb43f6997f6} - {6af7b2b6-7485-4315-8724-ad6c9d4cd60d} + {af3359e3-3bf9-4d6e-92ac-ee1d722b38b8} - {9cc24ba6-6b93-4ef3-ad40-b25b69c7bb51} + {1987b074-3331-47db-ba40-3f0708eedcad} - {e62d080e-31fe-448e-b4be-eb141f019367} + {7d6ff563-e286-4963-b332-0c85312c5f7e} - {5e3f5072-e142-476a-8fae-8f3bbca1ecb9} + {a301c66e-7c85-4085-9edf-216a4ca487bb} - {6ee0ea03-4806-43ea-a517-5ff3e8bc46aa} + {c4b5af9a-c6d6-4eaf-baea-ae944b027ea8} - {ba691264-9566-4285-acfa-15dae6d90f96} + {26432907-9a04-4ffe-8699-0c2ea77a7d91} - {80fb3642-cac6-415c-b812-3c666361108a} + {88818c5a-df9b-41ea-acda-fe6781684067} - {0fa1bfde-6700-4032-84e2-a9c548896329} + {75e0b383-a80d-49bb-a81b-e52f20b63ee6} - {258d1317-cda0-4364-b88a-e7e19e36992f} + {3a13497d-2e19-4705-bbf5-f2039908ec28} - {ed3520c7-217c-4625-97d4-a64c027434ed} + {4cb69cce-10f7-443d-bfd2-5f82f586e1ed} - {d09f2d12-24ca-42a3-b79b-2cb6d4132883} + {50c41dd8-79de-4cb3-a5ff-e86f3c4678ee} - {eefd0287-8e2c-4c54-a155-7909a0833e2d} + {a1c65a04-7db2-47cc-bc08-e832eac215c9} - {7f01d0f2-b408-4d6f-999f-95e29e64876e} + {db35c0dd-7487-41a8-9c12-26ad13ab2dab} - {05b5cd0e-9b97-47e7-a2a1-9d3366139b6b} + {48c5a2b5-233e-44fc-af0d-8e62e3c1ed6e} - {6238acd8-b2df-4199-b2a4-5d0ff93c66dd} + {cbcde736-96c5-47c0-bc8a-bf4a24eb32fe} - {23485362-e5ad-4853-a444-7e866655b151} + {0b6b5ce9-c78b-4634-88b2-f627cf7042b6} - {ce0a8098-f062-4ff6-99a1-418f672bff3c} + {7615d778-8cfd-4ed2-9db6-171f989e93cc} - {390dadc9-510e-4c63-9af9-396b0f739d1c} + {edf1c9f1-ba76-4661-ad71-aff29cff8c71} - {e4a9eed8-7684-46f6-af8f-0cbfe85d09e1} + {2eddb4a5-a7b1-4ab9-b803-cd4c84cd267f} diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj b/Net/testsuite/TestSuite_x64_vs110.vcxproj index 14311ca21..a9dc553a8 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters index 259b9e52a..f0882f4ac 100644 --- a/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,172 +2,172 @@ - {c16c2fc8-4aaa-40bb-8290-ceab3bb2816a} + {a68b124a-26d5-4c4b-902a-1cab9bf1ecab} - {4ab950c4-fec7-4037-a0a6-5f14eb761131} + {7cb9ceac-6798-4c46-8b86-40d91237604c} - {49a61667-1e81-4edb-b452-9a0c53c3053b} + {969a85fd-6b00-4d2a-9bc5-ffa39c1ba1aa} - {2e60cb62-c10d-4d1c-96a1-6961e4f3df8b} + {31c188ff-df86-415f-a495-36c3cfbc06e6} - {f69ebd75-72d9-4471-9adf-7d555c13ea02} + {f3b4df36-b261-433a-8c25-79023e11d51b} - {e507b590-e05d-4e24-882b-59177cad6a2b} + {b5a4de39-6c12-4083-809c-4c1f9a5e21af} - {6cb59001-b75c-4a6b-936e-50cdd2761f68} + {216604e7-083a-458d-9273-2123807cdddd} - {798de698-096a-47f3-a34b-4b2bab4ee40d} + {a02722bc-2c60-4fc2-80a1-fdf09b6fbf64} - {a5a17a81-4160-4565-8659-2164d7ea95e8} + {97853d90-3058-4765-9d97-a8cdd56daa4b} - {e8e9a3f2-a7bd-490f-939c-7fc7248a1a23} + {a83e1fba-bc3a-4980-a892-f29157d063c7} - {a5e5dc8e-2512-4f17-bc31-e905609f03bc} + {41f1f195-faa1-4f7c-b7b4-2a38cdf1b477} - {3438feb1-3dfb-4fd4-9a4b-df1184b6cee6} + {d3e5c5fb-6ab8-45af-ab5f-2616cde63142} - {a9842816-4eda-4e87-8689-bfe87f6c36c7} + {9bcedd1b-d7d0-4001-a480-5bd57d1abee4} - {8b03df6a-8036-46d3-9b0b-64d55f664286} + {374e6098-aa41-48d5-a07b-ccfd708816f1} - {ee2cf994-5246-4be8-8d3c-0d5dd9627566} + {ebb233f7-6217-496b-a66e-c8a90db9e803} - {1729d387-7069-4e9e-a319-7e35d218a78a} + {0f4012f1-95c9-4c96-b38d-64dfa3b1a87e} - {48459391-89f6-4031-8401-df3f6cad4fa6} + {28b0169a-55b4-4ff3-bcc3-6793a683f950} - {f83e4d6d-acc7-46b0-9938-b6014e1df4c9} + {52a1513b-ae5c-4324-9585-333027fdc6ed} - {9cc2ea0c-7695-4259-ad24-4b0e0ebc3e1c} + {73a040d4-e5a9-4eb9-ae6a-3f18f6c4b56d} - {5060b4d9-7081-4217-a8f8-e87f80c21710} + {b97ab4d9-483f-49d8-9516-329a26d59b9e} - {81ee167d-1735-40b4-8e76-7812831b178e} + {4261bc2d-3101-467d-a06d-56df4ad4eb25} - {692cbb8f-9639-415c-b5e6-ac21450b1cba} + {3d5a3a78-706b-47df-9e1f-bf9cdcdcc83d} - {273d4736-81da-4af5-b156-1d703d9a82dd} + {485d3bc2-8f1f-4fc5-8924-89985476f48a} - {3c5d1765-9a8b-41ce-aefe-50222acdca06} + {ec52a0e5-afee-4251-acea-1cf29119e466} - {5a8d667c-97fe-41dd-a49e-2286069bdef9} + {ac1f5dd9-c2e7-4c08-80f1-487d0c245141} - {83894fa2-0c62-4419-a20c-dff446b1d775} + {0a2a24ed-62c3-4199-83ce-31f02618f6bb} - {1a69c536-f70d-4539-810c-a38cb3966f08} + {e55aff18-5466-4162-a447-09e5e91e3b64} - {6c394a4c-8981-4061-ace7-8708422213d5} + {d095da26-40f8-4261-88a0-b70ca5139535} - {9023c2c0-da29-4ca8-9f1b-b2a8d512e4fb} + {7b9c1f49-b24b-4a45-921e-aaa7b4838e36} - {4525ce91-81b7-43e4-b46d-926e8d9530e9} + {3b4f40ed-74a8-4a24-8050-c539f731b070} - {45690621-b725-4223-b5a5-8a736f8e5cf2} + {d83ed624-172f-4c46-8db9-5c036a32e7d0} - {9869fb00-987c-4ba1-bd09-3c9ccd33d1ac} + {ae0324a4-9e22-4260-8b8d-e7f3cfaa2fa1} - {5138bf27-d811-440b-9fc5-7e9ddd5e2596} + {f663829f-2684-4e29-b02a-0d1b038d8e79} - {29225721-74f5-4bd2-a89c-ae2f7e793800} + {dabd1529-aa9e-4f02-8fdb-15d706e090a1} - {1166c985-6329-480d-9e7d-98906d78575e} + {c9f3cbd7-d79e-43a9-894e-cfc05bec531e} - {30f40bef-dd0c-4be3-be03-775170fc4156} + {2646baf2-e4b4-42c9-ae30-4698898b0793} - {0191c171-294a-4a0d-ac65-0d1358ca0747} + {1967c780-4bbe-4276-92e7-ae9e8880bd8c} - {a06f03de-d5f8-4d41-8bb3-6b31f4d3c723} + {7b748644-193c-4268-8d39-0e7e2ee2a803} - {d1fd9043-e1b0-457d-a7d0-771712aca9c6} + {95a05870-a1e2-4bcb-9162-f13a48edb842} - {41d92a27-32ce-4113-bac0-1570aec7b159} + {32f40323-674a-40e9-a254-feca0e5c7be6} - {7de4f70f-1c3c-4481-a80c-47513384cf97} + {25820bbb-f59f-4c6a-a9ea-1dddbb5c4139} - {eddab5c2-d0f9-4d98-a212-4e3a250a2d61} + {dfac2a32-73c6-4869-a617-719953bd7e08} - {4997263e-5a3f-41df-888c-2d3f2347f400} + {bd571b55-1e3d-419f-95fb-49c973cc1baa} - {3b376188-2a47-4172-83f8-f625cc9b192b} + {d7d9c5fa-b44f-45dd-abfe-9345cadc5d41} - {f186fb21-5f43-4f53-ac6e-679a510ab871} + {ab1dbd26-7060-4f66-b73a-931dc03d0f84} - {a842a1c8-ae33-4807-b544-97df663df8b3} + {c4470914-6acc-409e-b76f-60bd002c1cb7} - {b0d1bdbf-0f78-48d1-893c-16ba5aa0132d} + {f1e829f8-f733-4b5d-b6c7-d10483741083} - {be7f948c-834a-4f43-bb5f-f374b1b67d37} + {89180f63-fe8a-452a-964e-cd0f4aa161dd} - {00a7f005-de2c-4c20-ba44-568df13fbafa} + {cee48bb9-50d8-46bb-9dff-28dbe5c62672} - {3dbe3600-28ce-4632-be89-ae9af822f8f0} + {0aa77177-6228-48e2-bcb3-fe2b6092e428} - {69873c32-1970-4820-a020-25c5c56f05b0} + {956887ad-71c9-48b3-a28a-f0506388e525} - {4a41f4e0-f12b-4e92-8962-481d5424a4ea} + {83eaab45-974c-4c64-81e5-b79c8fba1db4} - {89e60afa-92b2-405f-9d03-aa15db11bbcd} + {0f167ab4-da06-4cb1-86a8-9816ad40de82} - {7db5c3e2-f260-4b37-8f2b-e1eebe5078c6} + {c4b8b7f2-b2ec-4d59-9c5b-a4b48b3be810} - {b31338c8-fb19-413c-ac98-092d04657337} + {e5fa38a5-5469-4966-b4e0-84cb7396bda6} - {419bdba9-cc68-4c25-b783-0ae4bf51e49a} + {15933f87-c53b-46e9-b845-454b6258dd44} diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj b/Net/testsuite/TestSuite_x64_vs120.vcxproj index b43cddc72..99cdb706e 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters index ddbade822..ea313c32f 100644 --- a/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,172 +2,172 @@ - {a4e22ae9-a2b4-4d6b-9c44-c66035370ea0} + {3866a9a6-39d6-4b7e-836a-6d4028815c9b} - {7e084467-27ce-47bb-aa77-d1ee60a2c5d7} + {e3bb8522-d4d0-4cce-8843-7062b83f5bb1} - {a4ec157d-1a62-4113-a878-d1fb17372f72} + {898d2402-6f66-43c2-ab3e-c7083d9a389c} - {6d9e6e34-8884-43f8-a3c7-4ddc38779092} + {c43f3510-d725-4f9e-a8a5-c7d160c67fde} - {3ff3fead-47f3-495f-aa30-bfdd6644f386} + {e289a8d7-9e54-4bfa-88a8-40ac97a879f8} - {6c8747c0-d659-4a23-bac9-ebfeef1e18ff} + {b7de9185-bbfe-443e-9d06-5ab2e073d3d8} - {3f27b6c7-d679-449c-a0b3-733b38b3f0f7} + {12b7ebcc-e1b1-4fae-93b5-9ef92107b471} - {cbc723d3-2144-4c5c-87f3-fd92caf9cd4b} + {f106818b-348e-4200-863f-abe22063fb83} - {53385872-dc75-4834-b391-24c87f9600f6} + {990f1439-f5a1-4218-8dc5-daad8c085380} - {6d2d49ed-ad31-48c4-9f11-4e129c1b0d38} + {8f182b93-d2ce-485f-a305-ee3bb725afa0} - {3827210e-9f79-4f02-931f-94c2a7fb1eb1} + {59af66d0-23c7-4d98-b557-20505b01f112} - {677081fc-f972-4380-b129-b258e18094a6} + {35a83440-37d2-4347-b0ca-57ff63332c33} - {545ebd1c-9dd9-4326-b1b6-1b12f7bcb73f} + {49ba8bf2-26b7-4dfa-8d33-5f339d1c7d08} - {9876ab32-8f7b-4bc4-8438-df12c49c78ab} + {8ed65cd5-2e3b-41be-817b-b9dd3224e0d7} - {b392ee03-b177-4204-91ca-0f429a2b2399} + {4a64924a-54db-44f8-976d-9d7f1607e231} - {9c5d99f8-0cdb-447b-b933-da504bd7ca75} + {9de13aa0-2536-4bf1-9e41-24804bdb7784} - {cbdadeb2-d221-48ca-9b2a-6ff584b26af5} + {c366896a-2d64-4e93-98f3-a79eca4761a7} - {dbe0bd2c-8995-46b9-b4e2-2fbce39f03d1} + {5dac255c-9fd6-4774-9b24-64bbc30ae8a0} - {d98cdee0-3e86-4552-ba36-0fb480c07c5d} + {962a17cd-a412-4372-817b-1366f184344e} - {8497a096-fad3-45e7-81d7-22ab508656cd} + {e034158f-646c-4b86-af3b-1c6ff7c25120} - {be11dc41-f23e-4d8c-83d9-2197bc6ad203} + {448e3a16-90e3-4cfa-bdfe-7554b72d3951} - {c02eded8-215d-47c4-b38a-ae2d29d1c11f} + {6588dd61-c6f2-4d9d-87f7-b30c6ad75e11} - {cb626ec3-f025-4f5a-a54b-dfc6bddbef8d} + {c1294328-f319-4ef4-89d8-e45cd14dceb3} - {9b561e6c-8b78-411b-8805-3fe224692d52} + {ecab1a91-7e9e-4053-9c85-e53a71ba6e08} - {2d68bc8e-ba82-4d67-a0e7-5c3e8c0f6bd8} + {b42c5f87-0177-45b4-9902-738640230295} - {bb9a7985-069f-4b0d-b3f8-a6a10d533053} + {b45dcae6-6904-4018-9f58-452e5c0dd774} - {cf4bfb01-a2fb-4c35-a2a6-85373e721ca8} + {441f1304-6253-4d96-b4c6-0496c8c10fb9} - {c0e6512e-9745-45fa-b393-c01794e37cf7} + {2fa4c185-4f96-45bb-979c-efa3b7e2ec22} - {a1edb7ff-bbbf-4917-9900-37e68946d61c} + {02f628f7-7c26-4194-af6f-e06da241bba4} - {8833b52b-2f2d-4183-9ff7-d493ccc88954} + {921d62ed-eecc-4c17-9844-e801c2749c22} - {32ededf6-b088-484c-8f2f-011f72263bdb} + {97613e86-c7be-4ea4-8aa6-b2e3a9353ae6} - {51c1bb5f-286c-4b59-9dbc-0b92ec818701} + {6813a99f-0550-4161-a450-b3004c1e180c} - {9b1bdc68-a413-400e-8f3e-26b1257cddbc} + {8ef0e256-44ed-419e-8515-71e9909aa7df} - {232b21d9-0833-4265-8882-c04e1d968240} + {ef05f24a-07f4-4a83-a387-b113375353e2} - {e391b393-9b99-424a-917b-bff63c432258} + {49d0d6bd-f0e3-401c-a0de-7dac8d8a1572} - {f151da71-6cff-4c44-8326-e307cd7859fb} + {166665ce-7943-4178-9da1-b1faed81ccc8} - {b82e2b85-49d2-4f0e-a3bf-946f70d802f3} + {1130946d-fff8-4f15-973e-75ce2ff423fd} - {ae4feacc-1c36-457f-b78b-fba2b38f4fb6} + {7d709c65-46db-4e51-bb16-b6aaf2308e85} - {abe958a7-22c4-49ee-84e0-bb6a51e8c7ab} + {b261ad87-0807-4eb1-9050-13a23878c509} - {a7e06a0a-60e0-46c9-a40c-2b4f7b589333} + {afa78f39-d6a4-4e46-9fb7-84ebc4caca85} - {5fe7422b-a4df-427d-8b37-88fc72c81343} + {d82b809d-7586-4568-92c6-d59c133259a8} - {7c33a805-1125-48c3-9de4-4ea88e0222d5} + {69e10c52-4821-48bf-a091-713930b9cfb1} - {ecb72fbf-435e-45c9-820d-9aebaf9aca42} + {2a7299d1-8e1c-45c7-b967-3acb26f37b6e} - {93d5f775-0868-4242-9cc7-c47084b523b5} + {099c7228-a032-4a60-9562-7978f10c0cf4} - {b4e8930d-e658-4bbf-95f8-aafa0637441e} + {c54cb026-a614-472f-b964-3d59ecc176a3} - {600da5ba-4c40-4128-bb07-dd01f02170d5} + {3ef02296-67de-48aa-b38e-a5c4e8996b2c} - {bf4da595-c818-48cc-a76e-0ad7b45a1892} + {c1756a56-55ea-4dee-8c36-81247d1de178} - {6f507489-1f74-440c-a70c-be4296b2ff75} + {e1932ea5-df79-4609-bde5-9af89de0dbe7} - {000e691b-cc94-4c54-8f24-1aa66b07a69f} + {dd6c97ce-2c70-457a-ad7e-f664fdefea93} - {887563d1-e58a-4d22-8777-63849ee84d4e} + {4c858fad-11bd-41c6-9672-ec600491124e} - {deb09001-9b11-407d-8f0b-53f1ca1e0fcd} + {4199a008-9773-4a58-8f75-0d5675f2c0a3} - {74ee579e-7f81-464c-9e89-ff3433f11fc7} + {34a096f2-59b6-416f-827d-f8f3d43d3b2d} - {53b73ac8-3058-4a93-8f10-9a1ecd76f290} + {09ad509f-43f9-43c2-aca9-05a039274450} - {8033b931-b040-4a5f-acac-660dfa35e3cc} + {0f1b867d-b276-4216-b956-c5832f718059} - {266f094a-ce66-4d14-8c50-63b41401f293} + {08077c40-2624-4de3-91ca-d31459d5f759} - {a5844a83-5883-40b0-b82b-cfc5c6e567c6} + {ad700ec3-839c-4ab9-a326-c1b0100911e9} diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj b/Net/testsuite/TestSuite_x64_vs140.vcxproj index 4230afc10..7133ea483 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters index 73d5d0f3b..87f34b2a0 100644 --- a/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,172 +2,172 @@ - {7ccdc4cb-6c33-44f0-b86a-629233d54da2} + {e073f4ec-b689-40d7-85a4-36fd54b0ebe9} - {6d6c371c-6fa6-46f1-bd79-19900a601be1} + {ff210c9e-6039-452a-96b3-e77bdea92be0} - {3da6f06b-c468-4b7e-8197-f2a0744a0163} + {e2f947f1-7574-43a9-916c-73fe7bb4598e} - {c03f1681-f65b-44be-8df5-20887548e1e4} + {db5750dc-df0e-4910-a8ed-6abc1abd12f2} - {2b4c6345-b17f-4147-8829-a61e4e27fe14} + {a31f5ec9-6543-424f-9128-bcc79191c8ea} - {9ccfc455-557b-4ff3-b12e-69d9b5c36afa} + {e9f458b1-e47b-407b-90c6-2b5ca3183ddf} - {6cc67790-d462-4ac5-be35-e65865f5232a} + {c64ebf15-ba96-4b33-861d-5df1318da49e} - {69bb4ef2-dcec-47c5-926f-0c8787171c3e} + {4db5aa47-7139-489e-9d26-dfa4f625c529} - {49cb1aa8-649d-460f-aa54-f6a3ea04cd51} + {2089566f-a9f0-4ad7-a258-e15256e4bf8b} - {c6fdf3c6-d20c-4f6a-b7bb-8d99daece4c7} + {07e31e12-b8cc-44a2-88bf-5ac491b31fbc} - {634666c3-e141-4fd0-bae0-75ec50017815} + {582f1f66-7e28-4fbc-8d16-6726ff403d59} - {2ef1de20-21d0-4e7a-97ca-c0f91aeb9ee4} + {0f8b19bd-2356-4cb8-bfde-0f8850547250} - {cd90255b-b43a-4133-b11f-eb9c0e441484} + {8d6e774e-bdd3-4aa6-ba4a-8ed15e935905} - {63356a72-b14d-4730-a78b-f9b5232d1030} + {e5c2f0c6-ee73-44cc-a85c-a3b3df217fe1} - {fb6ca49c-2a28-408d-bb00-d9aeac8c5293} + {0efe6117-a42d-479a-bc4a-4a9afd92bc5c} - {1ebfcdcc-797a-463f-bcca-6d9f0e4df91c} + {27fa1020-f25c-47c6-a3d7-17be53ab7737} - {ac6016ca-fbf5-4b1d-a28e-d0dd15303c68} + {975956cf-8b6a-4f09-8b0a-9dd98cf988de} - {b6a2c7d5-bc5e-49e1-b65a-540181d405ff} + {8afd66ee-bf06-4f82-b85b-bd037b68ff50} - {1100c4bf-ac47-4240-ad74-532113ee8cee} + {1fe46d69-a8f0-401e-9c86-5e935b3a3eb5} - {0e863f08-27ed-494c-8977-b03413a9631a} + {b71ecf0d-3e23-4d30-b3bf-2ea67a977e7f} - {52d76196-c57c-45a5-9163-a4860ea7e50a} + {a7130b2b-bf66-4eea-8efc-66c83c523245} - {edafd0d7-c8eb-4ff1-9b5a-c3da69b6af41} + {30c9e78f-425e-46e7-b4ff-c2174694ea6e} - {afd08672-1d12-4b45-9187-10bc72bf8441} + {3307e6e7-57e6-49f7-9cd2-d621dd85003d} - {3f530142-f4eb-4d1b-8bb5-2468b60ac192} + {7f064eb5-890c-4757-82a5-0563ef8d8ee9} - {71f65ea4-aeb0-42d5-99c8-f40ea220f597} + {685a04a5-7538-4082-9fb7-225e12a50792} - {0666137d-0380-4259-aa88-87781e533e31} + {7ed97871-4610-4e7e-87b3-840b56c1eb06} - {1b0fe140-a103-4767-bdfd-6606d8d3fbde} + {4cc33c02-1263-4f7b-9221-d779a24b1f50} - {69565086-be71-428f-81d8-b0e5113e55fd} + {638d56e5-096e-4610-a16f-b8ebc8885ecf} - {6bb7a0b8-0f43-425e-b774-7c9dcbddd70e} + {efc47d21-920b-4709-8faf-13b6c20a7e53} - {10ad2875-599f-498a-ac47-6f8cc8f35bf5} + {b720bc50-b338-4c9d-89cd-a89a8a653f0f} - {5a9f496d-34c9-4c23-8288-fb799806aa24} + {d44522fa-9bc4-4735-8529-51ffb44dc0e7} - {dfab0fcb-af4a-48e0-82d4-35af9d42eafd} + {a582712b-218c-4a13-aee8-ca033b5888b1} - {d290dcb1-a2a4-4ae4-a1c5-0e4780933e53} + {68503135-65a6-4ddc-a214-e4bf326a269f} - {ea3c1ba2-5ec7-4201-8879-d07ad2458e35} + {1d0b0f8d-2d4b-4a96-a4cf-38d5673eab71} - {47dd52e8-e926-4b34-9b23-1dd1574a61eb} + {d7cdbfcd-d4fc-4706-9e4a-70ae8eaea706} - {b265cc67-a530-41f4-bb7a-d6f48874b5e8} + {98c74e3b-4d86-4e1e-813b-fb47ed28524c} - {807098dc-7832-4789-8f0c-ee052369e9c2} + {04b5e544-ff0b-4753-91f0-1b45f062db60} - {58b40530-eda6-42cd-a81b-33d87f46e18d} + {42f54160-0606-4ec7-a762-ebefc23718a1} - {897d376e-aa72-4a6d-8241-2c7b7d0637ee} + {edf242f5-6f37-4e8c-a703-96d568552c86} - {71e7cbce-b679-47bf-abf6-35e6efe47859} + {ccb4de3c-c21b-4707-b98c-7e2d020ee379} - {794295dc-6460-4036-acb7-9e9ce400b181} + {ffa122e9-d7c4-490e-8f11-66e71dbc1e08} - {0fe8a99b-9685-4346-ac1c-9da9aff2f969} + {c1704edf-2fae-4bb7-9e44-b843a1f05013} - {8c450d53-3aef-4844-84ef-e69fea6d854f} + {d7883bce-1267-47d1-8c21-2e34622185f6} - {b78cd1fb-6755-4262-84b7-fefb7a5a401d} + {7ebce36e-c33d-4973-af59-177b04e9f293} - {c22cc3d6-ef07-4bd7-8a13-92f7db8d8fd5} + {5db1d4f2-9ccc-47c5-9fb3-0b5d4ea65aae} - {1f8dae3f-131c-4c59-9121-cee189500944} + {efb645ee-e7a5-4e17-b060-9482f8898757} - {421a10d6-964d-43ce-93b6-b791d8bd9509} + {814b5071-a147-4bb0-a42f-adb66b387166} - {0e9b803c-efe7-4aca-9377-d167345e4c5f} + {a342bd40-7575-41ee-9827-549fc44a7ba4} - {29a7bbd8-c518-4be3-9a82-faef7d18037e} + {54cb430e-da60-4f0e-a164-bffe52a7cf72} - {66cd4c67-6d1e-497b-8e55-996efbb6d94c} + {a10ef1dc-cccf-49cd-ac2f-bc8e3b5f8a12} - {fb36f3e7-a396-44f7-a4e1-8d98ec46254f} + {a86606b8-5d3b-489f-b06b-2f05c2b965cb} - {4b44cc89-6102-48d7-8bd3-ffcf4fee4413} + {05798490-b5a0-4b92-a009-b1bee7133f79} - {7dca6da0-f56c-42a5-858d-7d88ddfa07b1} + {6e0d1bc6-dadc-4402-a29b-145d09f06105} - {6b0192b1-397d-469f-84ae-e9339ac0be4c} + {8fdb54c0-4634-44ec-b993-62052fa23bee} - {35e430d5-1336-494c-be1f-709c66fd53e2} + {c12534c2-8f79-4a74-ab7b-96d1647706d2} - {1233db90-78c1-434c-96c6-d9dd65ac4ebf} + {5b956504-964d-46d7-ad70-73d66259cd96} diff --git a/Net/testsuite/TestSuite_x64_vs150.vcxproj b/Net/testsuite/TestSuite_x64_vs150.vcxproj index aa2d28fe0..669b9992b 100644 --- a/Net/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Net/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters index 7a6b35cf0..91dc4c008 100644 --- a/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Net/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,172 +2,172 @@ - {641c3de3-2f4e-4596-9785-98d59200cc81} + {67bc37f1-2bf5-42ea-b4d3-8d3feafb47b2} - {d5ca4e13-e42f-4258-b608-0afcbf216a1d} + {91702f62-45d3-4186-afb1-032527b5619a} - {a7b3e440-8239-42eb-89b7-0e0eb98070e3} + {d9ba932e-08c3-4728-a4e2-1b7ff5c47856} - {d4c4c9b1-38ab-4e08-9e16-983139f08968} + {41733a17-1998-46db-990f-ad38215e3850} - {07697b79-663d-4b73-95c0-a6adffee4e04} + {744a7d9a-5b0c-4c73-a0a3-e1bfd0582326} - {9ad66a39-7e25-43e1-84f9-14bcbec492cd} + {7b0a20c5-2c0a-4f12-9ef8-0406abfa0a8d} - {39c59339-6499-4d3d-aac6-ab5dfeafa4fa} + {69834426-4fb2-4d2e-ac3b-4b21ebe6c87d} - {fdfe376b-2fc6-4bc3-af7a-e9e422e7bd89} + {d981f3f9-27b4-4da3-b60d-f8e4c8999736} - {1702aac5-5dd5-4caa-b7b1-491c0960a964} + {54b2cd6c-2a17-4286-b4f6-701047c5d41f} - {a6707554-3ee3-4447-8f6e-e2085d12c631} + {d835d2b6-8a1d-4ec6-857c-5a2cc01d3080} - {6e0ba6aa-5c5f-4b79-b7c2-2088f61ae97b} + {afbf11e2-3c33-4c3b-a479-0c4823249041} - {1fe1c1a3-fecd-4143-9fff-70f40bb5ef38} + {4f22609d-cbfa-48fb-9751-17d90cbae326} - {ea91d715-dd1e-478e-9f31-df4391221124} + {4459f234-62df-458d-8e8d-4914d03492d2} - {d2bc45f0-4635-49ea-b6dd-45d346bfd519} + {4df6930d-e123-4194-88f8-278759c3b000} - {943707c4-d20c-472b-b1e5-38987cebcba2} + {f7046985-4ef5-4e05-99d0-af80dfcffa29} - {f95389e5-be1a-4fb6-a288-a37e7503accc} + {00f2047c-46ed-4a2b-b1d7-f2a69307a6ce} - {b8248b95-725d-4d45-a550-9f9edef2258d} + {51d9a2ee-60c5-4d20-978c-1b6948f3d7f6} - {adf0cff2-f92d-4358-86bd-c51849330a8f} + {7ef21df0-8469-4fa7-b724-2b7536c7e3ed} - {ee9c5eb5-c155-416d-a69f-78e33b0a363e} + {638b835f-8abd-4804-ae77-cb0dd087a380} - {6e416888-c7d0-457c-a189-548f06ddcd28} + {54ce15b0-df48-406a-a22f-52319281d0e0} - {9dac734c-986d-407b-be8d-859dc275a069} + {279823ea-1756-4dee-a7b3-093770a16ce8} - {ea1a208b-56d9-450e-8d8a-079a80aa9b6e} + {5b44e895-105f-492f-a9c8-35e6b624e97f} - {95364116-be62-4f46-aae7-01557dc9e36f} + {dd421cdd-0a5e-4274-88cb-7b9e12dd27db} - {20c2f904-163a-49dc-bc48-6f502036df23} + {dd9981a2-9825-4e71-89cc-c3850362aa6d} - {c1bd6a97-e27a-4463-ab90-95015fcb1d3a} + {4ce4b1b2-0896-43b6-9af6-36ab81c85ec1} - {dbfd52a7-7580-4087-8649-8e95cd55673c} + {b44e567f-4f6b-43ec-aeed-ba0c4aa1f7bd} - {d511653b-ad97-4197-ad95-abfa16210e56} + {5bd02c6b-0deb-4dfe-aacc-8d04c0f2a8a8} - {9f728f88-816b-4b2f-9265-b9197888c0fc} + {fe3c317e-40bf-4b8a-ac9b-0b6a203e71e9} - {d8c614a2-35f1-431c-91d0-52e33f047e8e} + {bef44955-85f3-40ad-bf66-aed303ee7fca} - {85c1255a-975d-435e-89bf-591d8150eb6f} + {ba2ced27-32f2-479d-908c-ebacfb2d87bd} - {05c23e26-3173-461b-a026-81f7b10356e1} + {e7f7c55b-5668-496b-9d29-b6e790e7ff57} - {3a5938bd-febc-4a67-99e4-0cae6ea01d39} + {15bb1cd8-ba52-4fd3-9d26-243e0868189d} - {74e4bfae-f2b6-4d85-9318-67ec2edd9b39} + {7bbb6d85-7481-4d5f-8226-588ffc6b4051} - {bed73841-62e1-4d86-ac39-66ede1ee2585} + {49b7a867-2d24-4e4b-8d05-5731bf3b072f} - {580b29cd-5289-4f81-ba51-2c86032dd679} + {a3c47623-ad50-4f15-a04f-855897520cb5} - {bb07095a-569a-48c3-97d5-e5f7cd3d9b58} + {d28a295e-f96c-4929-82e2-5448ce483362} - {cc492368-24c5-4646-b3b0-740c466a0d85} + {ebc10fec-b525-42dc-8b05-97532e8b0a91} - {6719e6bd-2711-4d9c-a32e-a4f86d5258fb} + {93fdc5a7-ec4d-42a4-add4-3fc70be6624f} - {16ea20f5-4d94-4713-8ad4-1a69f895d58f} + {69ef8403-2b8b-4960-8b98-98a60632b12f} - {5b3aacbb-0d51-48f2-9ae9-60c0fb01b430} + {cda0ff5a-e125-43ae-9822-4d97a80261e9} - {e997d869-b49e-4d44-abbb-4e44a232ba82} + {4f668fee-2351-477e-ab0a-e8b2302f12dd} - {5bd9e0af-fbe8-4d2d-9481-30b61f92e4fb} + {d5ee0a19-727d-4cfb-be76-0b23b07d903f} - {833937fa-135a-4cba-bb8a-8e5f79f4e023} + {a70c2c38-3c36-470e-b115-5b77a7813ac1} - {f499d60f-9ed1-4066-acd4-b6332ef4d308} + {ff2c9bbb-bf93-44aa-a263-44cf3758ac6b} - {307eb85e-ce99-46fc-a529-114b038f9f94} + {7031405a-fcbc-4a26-8582-9c8e1fd99f0e} - {c117e211-5890-4341-9b62-ae310f8b3ebc} + {545c4d32-3319-40ac-9645-defc3186fd68} - {90d78508-469c-4ddf-9654-8cf6ca427470} + {0839b7cd-0f78-43dc-b258-30349b4aaf61} - {aa7d6435-ecf2-4ace-a2d3-470c64f465a7} + {8ea2a5f5-8637-4e22-85c9-c2aa7329356a} - {c0f4820d-19d1-441d-86ec-58cfaa9542ed} + {5530d153-e66b-4220-9a5b-1ee772f0c049} - {4346da68-7b36-4223-b3ab-159304193cbe} + {7e000647-ddd1-47a3-9614-d4e9311a224e} - {8f2992ef-549f-4d31-a512-fd8a54009119} + {de51586f-97ca-48ab-8fe4-28562f4ddf05} - {afb5c286-acb9-4f5e-b028-7200d66b02f5} + {b3a6e4ef-69d4-461e-b922-8812c1904b93} - {f692924d-208a-414f-afbf-93742c3330f5} + {01818bfa-d3a6-4a5e-9e4b-5188eba09773} - {e0ce7445-dcc4-4973-b5e8-9453c914205a} + {29becd53-95be-43e7-bd02-0c7baeb0dbe9} - {ee7d39ca-256d-4467-b014-89539973fc57} + {b049e461-ba77-4b28-bb16-ddd742b39b13} - {229f99cf-6398-44e1-9031-8d4d83461dd0} + {10827e19-19c5-4325-8de9-2fb2a5a5288a} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj index 905f3262e..c518769b1 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_CE_vs90.vcproj @@ -198,7 +198,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetSSLmtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetSSLMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -214,7 +214,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters index 8547982d0..86c0eaa80 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {de4bde86-81b5-409f-9785-21e25df50fb6} + {301fcaae-5bde-4974-8bd5-cb3c40400ea0} - {8e740e5b-b035-42e3-a18e-0a059b54e1b9} + {6b2c3354-f897-4f7c-99ce-462b72df86b5} - {fa9cef92-1cf6-406c-9040-03b8c9cf7ba7} + {6630ea56-1b45-48bc-801c-8831ecca79c8} - {f1bb4aad-096f-46c3-b00f-42b66ddffa68} + {34f035a0-d7ad-45a1-9b4a-36e4d9c83fef} - {da536134-5cab-470f-9a6a-3fcf04d36e5f} + {35ef713e-9cc1-411c-bfac-bbb65f85a97c} - {092ce90c-9a13-4f50-913d-760ab25b6d3f} + {354de5e6-26ca-4efa-a25b-b44bc6794fc2} - {3160d8f0-6621-497f-a014-57bae23548fd} + {3f8b6bf7-8ce4-49e7-8776-a33d7f97585f} - {85753ab4-919f-4121-bb79-eab556ca702d} + {216839b4-0ae2-4043-8637-5f8aac8b868a} - {afde73de-c467-4531-a6f8-6201152bef9d} + {959bee96-40c7-49a5-8521-6b1dbdcdd022} - {08a3e285-b4fc-496f-82f7-90688209cbbe} + {5d93bd23-4ff0-49f4-9431-b2aa38ef05fc} - {ed1814f3-c267-44f7-9a26-36631c9507b7} + {2f50f6be-0d61-40a4-bfe0-f44c8c3f98c6} - {3a03ec56-7a28-48c8-a63f-94878c826165} + {47e3376c-c087-4031-9dcd-b99c36992635} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj index 32e4b45ac..ebe353e84 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj @@ -46,11 +46,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters index 6b5746595..f3404c818 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {873cd939-71c9-459a-b3ce-728c37230958} + {e63fe6dc-25b9-41cd-90a7-b2eeb06781a5} - {354d11bc-2807-4652-acaa-a32950414190} + {087ca4aa-9188-44c2-8272-91f3e7220ff5} - {0f8c9e4b-9bc5-4e02-8b0b-d056495cce88} + {dd05edc7-410f-43bd-863c-f75af84272fd} - {f35da691-b70c-4767-9e73-b9a19ca47adb} + {420f9d76-263b-4756-96d2-a6fb467613f4} - {23acd224-06e8-4b5f-8b62-f0bc2ebd70e9} + {f57b5f6e-fb87-4e7e-82b8-498e9c5cda89} - {c2fe383b-febb-4dbc-989b-859d924807a9} + {0efadce1-e300-4748-8aa8-3ec2c146e54d} - {194af52b-99b5-49a7-9069-20dc49dd9ddb} + {51d25555-de97-44d2-9c63-a52f222f2737} - {a88912d4-563b-4c54-a581-6e32bed8efc5} + {9d60666d-2ffc-4b81-9854-0360220bcdae} - {62edf581-36cd-4f83-bf40-8c2c8baec494} + {ad12891b-0b56-4ea2-adca-0113d75fb2c2} - {0f32686a-6c4a-4065-8a2d-910d08a7a8e9} + {89e37ea1-4aef-48fc-bdc5-79d50be57dba} - {10d62e86-6576-40dd-9187-83d4bc2b668f} + {0561907e-1af6-480f-863b-89fae1851393} - {dff2279f-88cc-4283-89ef-e4fe5c56f1bb} + {2992cc4e-56d4-4733-b193-5e5f2f380885} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj index 90ff1cbe7..865e4eb4e 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\NetSSL_OpenSSL\$(Configuration)\ PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLmtd.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLmt.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoNetSSLmdd.pdb + ..\lib\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLmdd.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLMDd.lib @@ -271,7 +274,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib + ..\lib\PocoNetSSLMD.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters index 18732e87c..cbcf9828d 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {1cc83f79-bf2f-410a-a7ce-66eda2f76221} + {660cf939-bfe7-4035-b763-78960b86ee35} - {b603b8d8-1fdb-4751-8eb0-5460d0d43e76} + {a1d38d4e-1415-476e-be82-c44ee39127a3} - {5faa19a9-63fb-47cc-8219-a175819ccd5b} + {2539414b-4266-4ccc-8c0d-7cd4b38cdd5e} - {b069d250-5f8b-4f2b-a210-89edc0ec8242} + {6d1e5a86-d93f-43d5-b9e5-f7d395a73dbd} - {047b73ec-4f3e-44d2-a1ac-d4150988dae3} + {28c8efa9-16a7-4114-8ed2-4091002ce50c} - {e59ccb6b-be2b-4b63-b06b-46ae30c3fa1c} + {6d94b86c-7117-42a0-a911-f04e92099569} - {1b29dbf6-fdd5-492f-9b68-45a06428029e} + {f1bf9e4b-ec44-47f5-b74d-b1d3519f0ce9} - {8125f775-2adf-4e46-af4e-dfd0cf73ecea} + {2f112486-90cd-40de-a385-5144e04ea148} - {acc4cb9e-c88c-482f-a27e-81d7d04a4cdc} + {32af8b85-5dbc-401e-9beb-b6c0642be4b0} - {97c7eef9-2c06-4f66-b6c9-398119fcb3e0} + {89adad86-10a8-43fd-aa69-0470cd68693d} - {a8d1d7ae-aeec-4473-b572-15b13cc05153} + {d42ab717-2898-469e-8003-94f835d8e64a} - {a60bb155-b04a-4941-b249-6c9ac5a91d86} + {5e80f8e0-ca42-4432-9738-4031e1dac974} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj index 7fd4977ab..8398c0fd2 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLmtd.lib + ..\lib\PocoNetSSLMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLmt.lib + ..\lib\PocoNetSSLMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLmdd.pdb + ..\lib\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLmdd.lib + ..\lib\PocoNetSSLMDd.lib @@ -275,7 +275,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib + ..\lib\PocoNetSSLMD.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters index c28387921..7b84371fa 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {cccdcb8a-b2b5-4784-8759-47d7c075f26b} + {f520743f-ff46-48f4-9dc7-0e42c697c731} - {b59220e7-4793-4bec-a1e9-7a4059a4d73e} + {8a5c071d-738f-405e-9c8d-f7b839cdd536} - {9db1dcdd-8143-41cc-8fe6-cb844c995821} + {225932fa-ab1c-4109-a861-0da5171e2853} - {394a7ef7-a1bc-4aec-8379-24cb75a8c0f4} + {d7776524-98bd-4125-80ae-ed992fc9a730} - {3b8c62b9-8fdd-4f3d-9c96-6f191c6dc64f} + {fb9f6206-3d9f-41b6-9a1a-779d4d7cb0f2} - {1060843b-faf8-4556-ad56-95dcfa39ed81} + {bac87765-6e39-418f-aeeb-479667bc215e} - {44f42aeb-b236-4282-a137-9f8101df0fe4} + {b07e5256-3739-409b-8393-6ae50df3bc3f} - {5a358f56-8711-4729-95f8-cc6157754704} + {0e1eb1b4-d806-4c84-8a65-3da4b3402194} - {75427ed6-f8f7-409b-ad88-4eb308916659} + {12198754-8760-4d5e-987f-9b1f10996b53} - {df589355-1d27-4c5f-aa46-44dd1d2b3387} + {5cfd488c-5267-48c7-9fce-8aa3c0727c98} - {f12d4b93-3114-469b-a509-5c3638332a54} + {c29fad24-f43e-4d34-832f-3f582e801829} - {dba85608-d92f-4bdc-a53b-59377e4f1198} + {3ddc6430-cade-47c1-9d1f-9d39d57e181f} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj index fa9c8d9c9..420f87444 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLmtd.lib + ..\lib\PocoNetSSLMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLmt.lib + ..\lib\PocoNetSSLMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLmdd.pdb + ..\lib\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLmdd.lib + ..\lib\PocoNetSSLMDd.lib @@ -275,7 +275,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib + ..\lib\PocoNetSSLMD.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters index 4d70110b7..62f7ecaff 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {447d3457-92d6-4ed5-8621-1f6ff863d448} + {409071f4-2d1e-4635-9288-68d2ab4736a8} - {33418c9c-0f31-4645-967f-86610240f5e9} + {83666213-9fb6-4c59-8782-04f5d2d531b8} - {892446c6-d9a0-48bd-a815-e58471cda786} + {a3fe4617-8efc-44c3-b10f-c8f4f4019acb} - {0f9fa4f0-36fc-4a9b-8b66-99ce73682b2c} + {14c9179e-7c60-49ac-b74d-a26fefb360c9} - {ce2c87c0-e4f9-44d1-bf10-e701917e60db} + {acc1e4a4-5f9b-4ffc-b43d-9bea3694efd8} - {8116c3b7-ac54-4b8d-a71d-a8fa3739e699} + {e8cd7ff3-61de-4f7b-851d-a778bcdcd220} - {ef45c6bc-74fc-4772-a769-6bb061787e11} + {7f6473ab-7e4f-434b-9236-7989958e284a} - {fb348529-6478-4a01-a181-ca26883daa8d} + {3d0ac050-af43-4493-9419-7ddbbc39115f} - {11f3bd95-d163-45d2-95e5-6b99baa1d0e5} + {829a914f-74fe-40d1-bde8-737327a5d4cc} - {518e0008-7a73-45b5-9cd0-4c8951849e92} + {4818b855-a9cb-45b4-bf18-9d3bc0ad6a38} - {d0a4221d-3eaa-452d-81f6-6bc96264370c} + {ab838af2-54da-428a-8993-c6f3b0c08160} - {c05a7af1-460c-40ea-8630-393d0a301868} + {b2eea05e-6316-4393-ac36-50516e5ed4dc} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj index 078598b58..c4d4c9dc6 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLmtd.lib + ..\lib\PocoNetSSLMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLmt.lib + ..\lib\PocoNetSSLMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLmdd.pdb + ..\lib\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLmdd.lib + ..\lib\PocoNetSSLMDd.lib @@ -275,7 +275,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib + ..\lib\PocoNetSSLMD.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters index 89296594a..e596855e6 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {372070af-2d16-4cef-9d5a-3ab6e9b04b5c} + {2d09fca7-5647-4d8b-997f-bda0ce76b3f9} - {707e1232-6570-48d4-9ea8-e4f9c73fd946} + {65cb5a05-f949-4ef9-96da-d61d9f59be49} - {90de6ee1-3c38-423a-82a0-f6c54d4b7666} + {0a874dba-92ed-42dd-ab53-8d12a4b9e06a} - {ba18da2a-c347-45db-8b7a-84dca9a307f8} + {385f1a1b-03be-435e-ad16-b3d40e4d410e} - {3b32d159-e189-427a-a86d-dc6fcdc04e62} + {05e2f544-6fd3-4e95-af2b-0e7b815822a3} - {a6fb8f84-f90c-4a34-9365-12f96e78a737} + {eb37bd02-47d7-4e06-b333-65eaf5b0fd82} - {078d2788-dc66-4c36-86ac-02142cab1371} + {2c90d0f8-dff5-4fe0-bf85-32399c0b8748} - {6437f2a1-f29c-484e-a2f6-1aefa4cb33d4} + {2693abbb-6df9-4cf4-992b-a8cb8f339659} - {026a79cd-61f9-4508-af82-266a9a1e060d} + {3600902c-c9ee-42af-b63b-a1bcb013e0d8} - {31aa3784-d799-41ee-bfc8-008aedfe2075} + {99df2dc4-a051-4a14-9aca-b0840501359b} - {435e3d78-57f8-4156-8e6d-9ffb4b5d1a8f} + {8aa530ee-ac9c-42ec-82d8-8c1c1d28ecf4} - {c8975c83-d8bf-4b60-9478-59e6a8367442} + {bf8932cd-2b7d-41be-98c4-ffb8cdf3b592} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj index ee5fd6b1a..6494cecbe 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNetSSLd - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLmtd.lib + ..\lib\PocoNetSSLMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLmt.lib + ..\lib\PocoNetSSLMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLmdd.pdb + ..\lib\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLmdd.lib + ..\lib\PocoNetSSLMDd.lib @@ -275,7 +275,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLmd.lib + ..\lib\PocoNetSSLMD.lib diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters index 20c58bfc1..de2d85eee 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {9c2efa26-dea2-423c-a9f9-d97d9985aba1} + {f26fbde0-83cf-47da-969e-5db05245c87f} - {694caa45-e0b5-4ee9-b6b7-61f82d37e24f} + {d42f5b96-7701-4b62-8996-85111327070f} - {c4a15c90-feb5-4478-83d6-e79ee6eda9f5} + {0b173b42-0a37-4715-a0a8-77558ce1f9e6} - {c034c674-828e-436a-ad75-73e85a394a70} + {2463c611-4549-4cee-8e34-7d330d3e4d9a} - {62970996-92be-45cf-86e1-6dd81e61c72d} + {c0977026-13d3-4492-9caf-103f5d813f01} - {97ff61dd-fd30-40ef-bf84-05c14e75e5c0} + {3773db7a-8013-43b4-8fcc-19a92ab78064} - {5105f523-1701-468f-9190-747c32b66948} + {8112d7e6-f9ca-4b52-8b4f-5fdbd80514cf} - {8160a6d5-3eab-460c-b71c-6a5110d201ab} + {41cda08c-5072-4ac3-a389-aab48b97e63b} - {d6aaf798-ace0-4fcb-b6a4-3ff3cf8bade8} + {1f1ccabf-6607-483b-84a0-2c33e3998ff6} - {fea6be12-7547-43cd-87d7-da65b4758e00} + {29813b81-e993-404d-bff1-6500e284dc19} - {43d99542-6d1b-40aa-9bf0-683899c462b2} + {b502f3a8-c116-48a4-84ac-5209f697d821} - {d635bf65-bd04-4179-8615-e9468f3eba7f} + {58d88cb2-2e9d-443b-a5d6-1f334c31ab3a} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj index 7a074bb89..77709a755 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs90.vcproj @@ -185,7 +185,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\PocoNetSSLmtd.pdb" + ProgramDataBaseFileName="..\lib\PocoNetSSLMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -200,7 +200,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoNetSSLMTd.lib"/> + OutputFile="..\lib\PocoNetSSLMT.lib"/> + OutputFile="..\lib\PocoNetSSLMDd.lib"/> + OutputFile="..\lib\PocoNetSSLMD.lib"/> ..\lib64\ obj64\NetSSL_OpenSSL\$(Configuration)\ PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLmtd.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLmt.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + ..\lib64\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLmdd.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLmd.lib + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLMD.lib + MachineX64 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters index cbbe68d38..35467e3d0 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {3b82232d-40b1-4b4a-8080-faa62300b621} + {2e7cc50d-7f98-4839-9d86-4d4f77c4e65e} - {4b6ccb20-d875-4014-a787-964fe710bcff} + {cbcc6e43-850a-417d-b18a-d1aaa84b346c} - {05a09f83-ee9f-4e1f-9f3c-a0683acc0239} + {04fcc0c7-6aff-4c03-9683-88b3a7287736} - {10739beb-0f09-482d-a743-919e72513866} + {f38a06b5-7442-40be-9fdc-01bd2da03cc1} - {a68264bd-0dd7-47be-a2a5-69d427879c5f} + {191ee24f-b4d1-4468-8285-710a74027f3c} - {87e168ba-df9b-4930-9a21-b1948159c0be} + {900b4d12-814b-4a7e-bb0c-3491d25b91ec} - {ddda8851-33bd-4920-8f89-6c612c7d1904} + {e5d42d4a-2e54-4ca9-8e55-4f7a5c81b9a8} - {755fa7e4-52c4-4de0-83cb-342e7e8e89f4} + {be9f4d73-812b-4bdf-aa67-752339f7a151} - {916c9417-c099-46a4-ad1f-476cb2fc31e1} + {335efa5f-e3fa-42c8-a571-2035c666bc0a} - {11195836-aa5b-48e3-9ef2-e9b175ab3bdb} + {09fb28cb-f093-42d9-9316-cdc98b04843d} - {d1918f07-e666-4cec-8e5a-68c0080dfcd4} + {32ad150a-7dce-4048-858f-096290e2c94c} - {59d4140d-9cc3-450c-aeb1-a34c0dc7fa31} + {91c01d3f-fb7e-4d01-994b-b59f299e965e} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj index 8084126a7..6fd232f8a 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLmtd.lib + ..\lib64\PocoNetSSLMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLmt.lib + ..\lib64\PocoNetSSLMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + ..\lib64\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLmdd.lib + ..\lib64\PocoNetSSLMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLmd.lib + ..\lib64\PocoNetSSLMD.lib + MachineX64 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters index 539b50e2d..29287f1b0 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {5fde21e3-b4e3-4138-bd7a-656aca4f79db} + {135a331a-0769-4955-b775-5af1f58f6adb} - {c2c42b4f-1d23-4de2-b166-1b60e7e7f594} + {f67fa080-0d03-46b5-a9ba-1987e1d3d2b4} - {68ad80b3-cf23-4f6c-8df6-196aedf07157} + {a6f7443c-07a1-4615-aa39-ba6e8911de27} - {6224dc57-76bb-4582-b801-614464415a5c} + {59bb2e93-e4a9-47a9-9983-c08c85a22375} - {5ab051ca-5937-4e55-9626-d6dc21ef287f} + {899b61af-fa4f-48fd-8322-2f9245aa1106} - {41e88c91-5cc8-4e59-a6ce-a5de1ef8464a} + {7fbd5aa2-3e8b-42f7-9551-4a9b5f2915ad} - {656e051d-1fd0-4a12-b6f7-f5a17c807568} + {a007cbdd-e5f4-46ed-a65e-1576319a6713} - {5f878b79-0592-448d-b62d-c32846edbcb1} + {d26b4673-905a-42f2-acea-4b3e0f757cee} - {6326304e-d59a-4131-af21-eec028332542} + {138e33d1-df43-4544-92d8-b7cad6c2fa2c} - {38a1023b-c393-48af-a6ca-2229fdf3ad7b} + {5e23c637-1074-4703-847d-9c8a81559ef6} - {fd16ac4b-2935-4fa1-b9c4-9426823cfafb} + {6e173a72-db91-4873-b60d-67a35da3b072} - {bc979006-3014-43b0-8e98-f3b45d0f3c5a} + {66622087-d276-40a9-a3dd-03234d4a1c6e} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj index 5d23f7968..12cd55cac 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLmtd.lib + ..\lib64\PocoNetSSLMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLmt.lib + ..\lib64\PocoNetSSLMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + ..\lib64\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLmdd.lib + ..\lib64\PocoNetSSLMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLmd.lib + ..\lib64\PocoNetSSLMD.lib + MachineX64 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters index ffa72cefe..33d04f2ec 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {d5a60b28-210e-4bc2-8c00-502aa9bf31d8} + {721e9c40-5c6c-4e75-9d1f-8cc19e97aa04} - {f31e352e-e6e0-40f1-96d1-c4dbc59a7385} + {7f62351a-588a-448b-a859-d5e350fe5565} - {df71e582-af12-4300-be91-52caada9d3d3} + {38251d30-a914-4dcb-bee7-9570f7362b25} - {4726f576-8464-48a9-b829-c87241000638} + {062c3f03-0a8f-4dcb-9a79-42bff1534cd0} - {591d7a56-daeb-4b65-8806-e0966985f1a6} + {e131cecd-2efd-4da8-a5bd-af72a6a3b3b5} - {2d1086a4-a377-41f8-af88-17452dc75427} + {bda09407-e169-4d3e-92a1-750910fb6d14} - {9acc93f3-33b0-4c59-87f3-18df92602409} + {f0f46553-21d5-4a52-ad8f-299189e248f9} - {83810dc9-04e1-4033-a9d7-59e18635592e} + {d8179827-e4ba-41fb-aa31-15e2d1408354} - {cb76989d-cae0-477f-aaa8-dc50c17cf3f4} + {5cc7c4e4-2420-4d09-ab7c-974078f360f1} - {6786361b-897f-4616-af25-5c3a00a972c3} + {c8efef5a-2693-4991-bc4b-e038f516a4ce} - {df6a573f-4135-4388-a366-b1b0d219cf7d} + {aafb3045-00f3-4884-abee-d2a0aa67b62d} - {f5c92a5d-a483-4ac5-90e6-e48180609ce1} + {98386a86-fdd3-45be-8521-c6b070cb1960} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj index 0bcf95373..6a0275d63 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLmtd.lib + ..\lib64\PocoNetSSLMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLmt.lib + ..\lib64\PocoNetSSLMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + ..\lib64\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLmdd.lib + ..\lib64\PocoNetSSLMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLmd.lib + ..\lib64\PocoNetSSLMD.lib + MachineX64 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters index c874c25eb..bf5949d53 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {17ee5989-92ca-4d04-a5c7-001092eacf05} + {dbc5b400-a272-431d-8ba5-4eb4b467a159} - {ef6b4b39-1e7d-49e3-9fdf-1faf7a64ef58} + {ad5f4381-b81d-4623-961f-89ab7f4a2a77} - {fe1770e7-d189-4f10-a0f6-e35364f58e1d} + {b26a7830-1df3-4c67-89f4-76e1821283a1} - {3f16349f-1e5c-4708-a069-88a273acaa93} + {1997ae19-2764-4195-8b86-a2191d93a830} - {3c8f53ce-ee64-44ee-900b-c05a345b6809} + {82b5222e-5875-482b-94d3-5affb65bc241} - {435e3cd6-86b4-4350-ab2f-4e82d8cc13b8} + {f40176b9-9fbc-4561-9954-36c391a11096} - {dde07db5-6e85-4a3c-8b71-a36f358c848e} + {bfc7f55e-6e6c-44cf-8899-313c85760c4c} - {77bc3055-1613-4526-9384-6e344f28c2d2} + {3966e419-ff04-454e-95d0-856cccff1011} - {05cf9015-1d5f-474f-b202-c033747b4f0e} + {b7e253f7-8881-4b22-a519-8e6ba9aa60bc} - {0c67aaab-548b-4968-ac3f-d78367d0fccf} + {1a852fcd-babe-4ce0-ac15-bc57e52cb1bf} - {d860eedc-01ef-4a80-8cc9-f933a1a1415b} + {f2dbdca2-a4a4-41fa-9a10-20d51dd2cb31} - {14824451-12ef-4f02-b020-ac14018eafa2} + {53015e13-780c-471f-98b4-3a403b5a62d4} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj index 64948182a..151ede081 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNetSSL64d - PocoNetSSLmdd - PocoNetSSLmtd + PocoNetSSLMDd + PocoNetSSLMTd PocoNetSSL64 - PocoNetSSLmd - PocoNetSSLmt + PocoNetSSLMD + PocoNetSSLMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLmtd.lib + ..\lib64\PocoNetSSLMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLmt.lib + ..\lib64\PocoNetSSLMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLmdd.pdb + ..\lib64\PocoNetSSLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLmdd.lib + ..\lib64\PocoNetSSLMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLmd.lib + ..\lib64\PocoNetSSLMD.lib + MachineX64 diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters index 9fbce84b5..620531120 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {774c5c33-bbbd-4e88-b20a-d91534245ad3} + {c988a8a1-beeb-49b4-bac6-e7b6b70832ab} - {e0d729ae-c066-43c0-89ea-bd48bb1a22ed} + {3bd01c14-0686-46f3-9283-dcfc65414d1d} - {e31b84e1-5fd5-4483-b529-43cb5f0c5b5e} + {ab06d0b0-5ca7-461d-8e03-e39fc9064562} - {d9a98381-ea4e-40eb-a551-1f886c765417} + {1bd68532-d59b-4ac5-b5ce-77a391a88b99} - {2d10d9f1-37c0-4db0-bec8-b83ea88dd51a} + {d7d0bd15-28ca-4750-86e0-46ea9ba63a93} - {df887a80-8771-4067-bd89-f429fc826996} + {9e830f95-df95-4e07-8dfd-f611d9ef2939} - {bb8cbbca-ec4b-4219-a460-b9430c680c5a} + {b4b6318b-67f0-4b5d-9f3a-fdeebfeaab9d} - {2f8761fc-715b-481f-a04a-73561f0c7f21} + {e59dbf9b-7085-46ec-aa83-1ffc493a0799} - {578f3c5d-6b63-4b79-96fa-848dd2d60451} + {ffcaefd9-b457-412b-863e-dff57e45183c} - {80d90131-d0f2-4e45-8acb-62a2559fef16} + {f4621c33-f3b6-4d2e-96d1-1249aebb4ca3} - {0f548b1d-03be-4cc1-b7d9-e864bf9f1fb7} + {c1bff49d-cea1-4ae1-a146-d0841e4081cb} - {a38f3e61-d3e3-4635-b0a1-5417a8712e00} + {ebcb907e-c9fd-4708-9b7a-e7fb36eaff39} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj index ed15d40d4..b022c59cc 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetSSLmtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetSSLMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,7 +201,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetSSLmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetSSLMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index 4d433ea4f..cfaf9e1d2 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {9c27b20b-1575-4883-a5b3-e21fe2c91de7} + {faf3c6c3-e436-4090-a34c-4a25c760afae} - {690aa1af-3a50-4a44-84bf-a671da320cfa} + {6fcd6bba-7995-40a6-af46-b2aa60c923fd} - {13331a17-087f-4bdd-9cd6-fe733a939a72} + {89460fcf-966e-4fdf-a379-8c58d7f29ac3} - {c27af793-9708-48e1-ba72-257f2a5dfde4} + {3931b595-cc4e-4750-b84e-0148d63858f1} - {27c03cf4-77dd-45d2-8cd6-9fe7027bc1e0} + {64de9b18-ef52-42db-95a3-cf40df028c22} - {ac0f97e8-8d2b-488f-b7c1-57b36729109e} + {71177f86-f657-4093-83f4-7679cc73e5ec} - {3d3cd1c2-b640-4076-b580-faa167a97ed9} + {5420984c-1b2f-4462-a8d6-124f9e0c8fe9} - {3f149b2b-37bc-4d6a-90c1-5b38ebee1873} + {4bf18b6b-0c43-4343-9bd2-06339b1c8c84} - {3d1ac5a2-3c90-475a-9fce-84a764cb1f51} + {14d4c8d0-4e8a-48f1-8a86-692d4faf1045} - {d8b6d060-06bd-4d67-969a-75d528cf92aa} + {c2e9ed5f-50cb-4fed-9d20-4a2fc0fa20d3} - {120ff0e9-e654-4d3d-8106-c90c183bcfd8} + {a685b4fd-91cc-4533-b22d-c015178ff5f1} - {6c18d667-285f-47f3-8952-4c4db5a1e008} + {26635836-8d44-46f8-bc06-272411511d82} - {41c9ec76-6bb7-4b74-b06b-2b6c32fc10f1} + {e55f6fa3-97c1-4338-acc6-5015cce2c062} - {11c80eea-25c3-4878-9eab-04b341240349} + {80ab823f-707b-4531-af33-925fede282dd} - {7a4e9dff-b634-4139-9c60-73b0dcca5f0d} + {0b4f1b01-bfb5-41f8-b7f5-37a4d7c2670d} - {8d5a050d-78ac-46b2-94fe-6716964f25dc} + {86065ab3-7724-4fd8-bafd-e066984f9e27} - {cbc81b62-1881-4664-9e4b-66fd9f173b0a} + {95255c8e-724d-431e-820a-57b123a37cf8} - {256afedc-cf3b-4e1b-934f-87e591a84411} + {98eafdfc-5c6e-4952-a4d8-ad7913ff1ce3} - {e84d23b9-eff9-4c21-81dc-4d20a783f831} + {74ec9b9c-84f3-44de-b4a4-28e71059111a} - {5aa24339-681a-4f42-b345-b645174afd53} + {cae30bd8-1727-4a84-9e1d-ec00f11e9f5e} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 15b9e6539..05f8ded45 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {9166edca-d890-4cfd-9a41-c875a755b926} + {bb7dc8fd-4ded-4333-888d-2c50694b088c} - {4cd35ed2-475a-43f5-8921-4a0a5ea2be6e} + {abcf4e1d-a5b9-4b86-bc9b-e8fa896d6cd9} - {dd9ed803-4eb0-4167-a548-99abac9228a7} + {841fd954-d2ab-4384-8377-d5c39e6e089c} - {60a9286f-329b-4d71-8ead-23e446705bcd} + {c3efbee7-f86d-40f4-913a-5d3ca91147be} - {f864e265-2115-4ae4-bbb3-4165b5b799f8} + {cb104c61-73c9-46a3-aaa6-459fe9daaa67} - {a508e16c-5731-46ff-b1ba-dbf7514eb5f3} + {603ece09-e4b1-43e1-aafd-4d70fd1de271} - {cc05fff9-609d-4520-8e11-3f5ae2ce138a} + {dcfd7408-5bbf-4adb-8c87-c2b9c461dce9} - {e4ba5e65-d6a1-44c7-91a5-ec39e4b097d5} + {c7088586-7658-4991-b855-1ce5b5b88f98} - {57b429fc-624a-48c3-a510-225bb0f6b8a5} + {6e842477-bd9c-4b78-989a-18ab4ad7bb29} - {c5f60a1d-ece8-4251-813a-cca93fae0bec} + {7d71122f-5dd1-476d-8025-e577ac8e91ba} - {d9c4b718-e3ac-470f-bd53-059de7d9746d} + {e7d0ed6e-0b3c-4810-8b07-7e029fc2cea0} - {902218d5-b4e6-4eab-aa76-97f3405281f0} + {1a19867a-c619-4ca3-988f-e715e8eae35d} - {3bf7259a-9f7c-45a7-93ae-79129fc48111} + {180ab85e-946b-4cdf-8ec9-87f822ebc01f} - {3388f19c-d168-423f-ad17-9adf4beb1c0a} + {cdee3508-d427-40a6-9a08-003df2cde95c} - {e0ec249c-5dd7-4c2a-a2c8-8381eb43632f} + {8bd81e21-885d-4cc5-b52b-c5f54ff65bd5} - {caeb8c47-f969-4ed9-9f83-10972d840d97} + {5704e35f-95e4-4fc4-85ea-861a1cc5dc56} - {1157d07f-8e4a-4324-8c58-f9e1cbfb1c51} + {f20fb053-4c16-4859-9b27-78d6edaa775b} - {cd3cfe46-ebd9-417e-8cfa-d196813c7cca} + {8ebf0334-e59d-4832-8719-3bca76d652d1} - {d871de9d-f89d-42c3-a64c-6dbe2caecac9} + {8637b39b-23e8-4859-9f0f-4101bae82671} - {5cb98b99-f585-4641-9243-a4961b6cb394} + {c1c373e0-2925-47ee-b764-a27937135e18} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj index 171f288dd..378a59c29 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj @@ -201,7 +201,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters index 4b99a3ec0..00a105228 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {526f8dd9-8191-4d83-bed2-38a498da8b66} + {6b88a31c-d813-4284-9991-67d6461ae9ea} - {e256eec3-03af-4027-880e-105fb6083591} + {ce9843b5-890a-4972-a989-cab1355887d1} - {8619b12b-a077-41c3-b4e1-f6380fc0474a} + {fde861f1-61ca-4894-bcc5-c4c04209c068} - {1a831e4c-6209-494d-a916-c78a75a88c56} + {9c1a951f-6a1f-473e-8aeb-ec64435158ce} - {751dbed1-2d7a-4ea2-8ee0-2dafaf076e11} + {ea3b26f1-0773-4ae4-ade6-d002bcfef953} - {fc1685c5-9690-4d15-9029-87d69eecd4d5} + {95a6a9c9-09f4-4114-ad45-36cf4491ad33} - {1c1bbd63-086b-4358-9237-8e5eb4d3b3d0} + {01bc7996-d9b2-44ff-b418-f0bb374f9c88} - {6812ca22-8872-458e-befb-b6582a95686b} + {69628225-afa7-4ce0-bf9f-c3aec80d3fa5} - {9ce9eaa5-c23d-4d78-a8a0-bffcbc631f0b} + {47116936-f5a0-4044-aaea-2fd677133bb4} - {9bbd9eb9-594c-4639-a125-61a93ef648ee} + {a6be1667-ccb2-4bbf-a55e-dfdfe7cd4510} - {c49d92ec-0b36-4fff-94a1-3f77536d12ec} + {86042036-1dd5-4943-a184-1df8b93bba0d} - {db8dbc67-eb62-4a7d-8d29-8d8faf1841a0} + {42ed9c59-ec43-47a4-8fdc-965dbc6f02d2} - {1e3c990a-b119-4cfa-9abc-34840d533167} + {34f7b74d-27bb-4c4a-b64b-5ee8c99357fd} - {a32dd7c5-fb77-4caf-80e5-71616f531479} + {b88e8aca-6401-4c59-abb6-7c89e1f18199} - {3a884411-4b16-4bbf-8957-fb6d4906429a} + {2f94697c-f676-4ab5-9122-3f69f36454db} - {1d1ee699-c258-4a24-93c3-a4c8909dbf94} + {3e7f90ba-8e9f-42fc-8357-f5b02f4f5cfe} - {7b98180b-2412-422f-abca-65b2b580abf7} + {cc1b4ff4-5353-4cf9-9ad5-197fec276425} - {20a03ced-8b30-4500-b4f0-52a9d610e72a} + {ce3a2cc6-8c4d-42fa-8cdd-cf25d6bd7ce2} - {2b4e71d4-389c-4bf4-bdc1-37b6bf3beec8} + {4117c0fb-13f8-4b4d-b7e0-c8a06d303eec} - {9eab0089-b97c-4113-a70c-cad4e6a86d32} + {bea6e6c1-2cb8-4e9f-b67f-9a54de6e30f8} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj index 043f816a8..847619e33 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj @@ -211,7 +211,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters index 6955dc383..76b47d03b 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {391016e0-7e7b-426b-a9e0-5562c17c265b} + {881239ab-4327-40ed-82fc-8defdc0723a8} - {d97e8552-36fc-4ef2-8e09-719da609cfa6} + {9c9014a9-2b7b-43f8-b39e-420fa81bc1d6} - {5d158d36-f791-4aa0-b293-e6cf54930cd7} + {822191fa-d398-4a85-b29a-0b39426287b5} - {00891835-cb2b-48ef-a470-881cb2d6c419} + {63cfd4a9-0eb1-4ed8-97dc-6f428c0233dc} - {34d98c7f-a78f-4b60-a3e7-10fa184073ea} + {95006b94-2e0c-42f9-8599-e300c275a71c} - {d6c14dbc-07f5-4574-bab8-18543032a209} + {0d15678e-1146-4475-91e1-8968461f4a71} - {b7012f50-e77c-4e3a-85db-b2fa16fa7209} + {66301fa9-a335-493f-8bbf-b1d8d49d0f7a} - {232e8877-72f7-48b2-a869-446f14c097fe} + {b82a1a06-d6f1-4543-8bf5-7a5220b21313} - {bc56fa47-6734-4476-95a4-7e6390a539a5} + {be339bc9-43fd-4ea5-87c6-3f6320db97ef} - {1fc0fc14-2646-4a8a-8205-770f72aeb6b1} + {29e64427-9840-440a-8d64-454f677f8b13} - {26cfb58c-d280-4410-8b63-7788865f51e3} + {ebbb0a2b-2326-48d5-b41d-888a24119ea4} - {abd31979-925d-4f8b-bd79-ef519fca4328} + {875ae267-cd87-4d28-be9a-be5c248e9c12} - {513ff3e0-ed21-4d80-aaeb-34d3d1220bdd} + {27aeaac3-9789-42b7-bd3d-3cc956517289} - {decd96e6-2170-4ead-a20a-5c4330e9e120} + {af32f56e-0acf-41e0-80eb-769d6840596a} - {9d7da482-e45f-4f20-9396-a710aa65ea3c} + {2009282f-51c8-4512-a513-5fb8ddacd231} - {7fce5619-7645-403c-a2bb-0cb404029277} + {a3b23197-b689-409d-880e-8b6d35aa58c3} - {3d8883ac-b145-4800-ab28-6d351080ce0f} + {83176fad-19c5-4e1e-9658-676df9e8fa8d} - {b42ef2ec-42a6-424e-a19e-b8210f7bbd45} + {1a48f80b-a38e-46da-bbf6-17b828e5d8b0} - {c1550e9a-4daa-4349-ab4a-c2d7b88bfc50} + {32815a4f-c3b7-436e-8da4-31dfde9e1b7f} - {6f5d4822-5897-4d08-9278-980c9ce5b46b} + {67e0cb14-3043-4e36-90ef-226048633533} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters index ea6bb10fe..cae83451c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {56815554-ff48-4ac6-a8ee-b07a3d36e6e3} + {02757cc7-9d70-4e42-bd95-c966b7525a42} - {2214664e-ff62-4673-a198-bc411ed8f606} + {06959aa3-cd2a-4212-8360-7c9489748327} - {44de53d2-ba65-43e1-a195-d4b883a11b04} + {3569a634-3c6f-44d6-bfdb-f2a875412523} - {b398174d-22ad-49fa-b037-2e60745acff1} + {c3c0ef8f-3741-40f0-b3c3-35687c112f7c} - {9968335d-ffe7-4a16-a248-805f34ae2e14} + {0970cf2b-abc9-4d2e-9fc7-8eb3c029c89d} - {9b64c59e-ad1b-463e-91ca-bc67420c511b} + {dd83460c-4ced-47d5-8005-b1f3f9cc0e2a} - {88e896e6-dd3c-4d77-902a-60394d5b6d67} + {5167813a-cb6a-48b4-a346-f98e73c9794c} - {dbb83d90-19f5-4fb8-a251-3d723ee62528} + {e2a8cc2d-b79f-412a-895e-cda4cc133e81} - {d1a36462-735e-4a0c-aa7a-c3b2a725aa65} + {a81a93e4-7b25-4f93-bce6-f715e8c6976c} - {b252087a-ae89-4bc1-9771-f839b7b0bbb2} + {8c254b1f-469a-40dd-b1c6-67f62670a353} - {748c8716-48f4-4cd1-8c91-bf5252e0ed7b} + {5ccd1f5d-f331-4650-bc99-78775f4bca7f} - {80c214f7-3cdc-478f-aded-52f3f4a9e440} + {ea300d18-018f-4106-a701-ea6a0682553e} - {21233de7-0b45-4928-b081-5873d792b85b} + {1480dc16-06e8-41ab-bea0-ababbcc62b9b} - {2a55afcd-a12f-42b9-a472-c71bf7c5b595} + {ed97a6aa-5f4e-4e47-8aab-072696491e72} - {891d380d-4938-441f-945b-721571d74dfd} + {edb7aa15-800c-45b8-83cc-bb29a7999031} - {2eecc851-53d3-4fd6-b7a5-e6bbf344af27} + {c0d0e6be-af2d-4e06-9da1-82e8a0682d2e} - {5450a0a7-a44a-4746-9b9a-7156927c1e05} + {948cc728-988d-404b-ae5f-689b5aec1e36} - {9118cc30-cb37-444a-a314-19782196eb9c} + {0651dec7-631e-419a-8ca1-a1df6b4233c3} - {af67f9e2-e34b-4f04-9ed3-017b31ba9e7f} + {89dafd08-999f-422d-9034-ac2b1126b66a} - {1f1e3e1c-aba7-4100-ad34-9e89b1b9ec9d} + {79aee9c0-d0c6-40f6-bbaa-004cb6d762da} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters index 2795e1ecf..695ccd0ce 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {622ef242-5639-4885-a59b-9c314233b4be} + {3f3f1a4b-4c79-4c50-b7fa-a2cba428ca1c} - {2942443c-1553-4d51-9bb1-ebc879e8ca4c} + {2d1a7e1b-24be-4370-8548-47f4e2f50a4f} - {c5cbea78-40d1-46db-a987-34f904276487} + {5b155164-5a46-4f7f-9611-575fc6f91692} - {3b9e7e8f-5d5f-4761-9fef-5fd1b1d22a85} + {556d87a6-3c40-47e5-84ec-d315ae080938} - {53614f9c-dc67-46aa-824d-ec83ffe1a4e0} + {e2e714aa-6537-48f8-a708-af2c3519c0e4} - {1ba07cfd-37c8-478d-945e-79e84b25b0aa} + {af3eef94-31ab-4554-ada5-c82b7656ef59} - {321daf0c-69fc-44a4-9dbe-b503d3af6c08} + {ca26df47-876d-42db-bd03-4b35eb6fab74} - {89fe5afb-0ddc-49aa-8699-72a57a60ff23} + {6a469366-3c11-4211-a8ac-ee15769aa6de} - {47b343e9-30bc-44e5-ba7e-af80b227b624} + {071c3839-56ae-4199-b346-92284e6426a3} - {14cd7e63-71ec-448b-a6c5-775ba476a698} + {6798f524-c4b1-47da-8efe-964755e30b90} - {cc496037-5589-4872-a840-347569224b58} + {e0b0a13d-2519-4a1b-a69a-baf667c21857} - {5a26dc22-d20d-40cd-a646-7c14ffcc70bd} + {8b4acdcd-d6cc-439a-9310-39fbbe5fc3a5} - {18dd3c1a-cdbc-4bf6-8d48-694450dd88ac} + {2424f27e-3225-4aad-a6b7-b0b3f6e13a5a} - {d63ac5c2-793b-4ca0-9f24-683354b46dab} + {517246d6-f87a-439c-b5e5-884a81851312} - {880e9d86-d728-42d8-96d7-90a4568eb559} + {c68783c6-5e83-47e1-815f-a37ed336cb40} - {ed25636a-b46c-41c9-962e-1a252d6a1d2e} + {2118835b-c078-4702-bce8-5a37db0f8dad} - {0f170a1a-e426-4000-8e4e-6840011c8883} + {3da65410-954c-40c5-b1bd-95b4458cf1e7} - {a6ceb291-0f65-4b47-9d24-5cc105df8988} + {5c63e438-0fdb-44b1-b168-b52647ea2a61} - {f5488a10-1b37-4d39-9b76-baa087ca6783} + {058dc52e-0134-468e-b72e-fa374c3399f5} - {5e339e55-46f4-45be-85bc-340f3c37f3e6} + {ce9a60b1-165b-417d-ad50-50638bdd1a39} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters index ece78ac65..5849ed98f 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {8620b0ff-b5b5-46c8-b9a5-4bbb4a433d03} + {511d0184-7ce0-4b11-85dd-bde92e350fb9} - {ca45ab2a-8153-4e27-9657-4c2aefe3281a} + {95e9e549-34ea-4006-ba90-973713171cd6} - {7f0ae212-3d6c-4844-97f4-3b01b723ab4c} + {2aa8199d-1baa-4f24-b6c9-f62c8dcc8ca1} - {4b72b9f7-eb7a-4f44-947c-b9b194abf6c6} + {e4e1274e-039a-47e3-af01-c0dc0d080b2b} - {8b99bfbe-0d3d-4e3c-9dc1-6762f3b0d118} + {4a93ecef-f6cb-4899-b6f4-59c5acbc50da} - {869e289f-f0f9-4b25-b3e7-e05232c50462} + {93f95aa8-22b7-4518-9cee-f46d0542184c} - {731162b6-64ce-45d4-bab9-01d8aec1a06d} + {0a1181b4-446a-4780-9ec7-5114887f6c86} - {d47cdbb7-db89-4349-978a-0ab257979412} + {43484766-4144-424c-9c64-b2bcf06de755} - {10e0f27e-fe24-4bdb-84f4-3317b0c39eb1} + {3fa9c91e-b4e0-4a4d-8f1d-fb44cc6c0159} - {20b27749-7da3-4113-bde7-1c853da0f8ea} + {1777fbc4-9c49-4319-acd6-105354e61523} - {4e7952d0-23c0-4dce-9e39-164d20726070} + {cfa8f542-30f4-406b-87b7-7e523392f20a} - {1a688107-d87e-4b3b-a248-c8bceb95f5c1} + {e79692f9-8955-4e78-a6d6-4d5a969e8125} - {65d6ee79-ec09-4cd1-8264-35f02abb27a6} + {5995acd1-43d4-4fdb-9995-c12b1615b104} - {b45c57cf-ee60-4664-b4b1-4c29b2165b3a} + {e17a20cd-6c18-44cb-82bc-3108b7916c4a} - {e839fb00-1cec-468e-874b-4a8c5fc5d1b1} + {45c2c2ca-330e-425c-8dd4-0dbb28223b3d} - {72a195c1-6809-4db6-a6b0-4508b3e310f1} + {4d2fa224-c4c3-4b78-88b5-a7bf58c97e01} - {efb5c059-6a1d-4251-9590-d0c222884a97} + {0274ba58-a081-49a7-8df3-de111b87506b} - {2a629ee3-e362-414e-92ff-3d839c767f25} + {bf220447-46b2-40aa-93b1-d197e5593201} - {edea0ef2-e01d-4420-a7bc-82b4305353df} + {39a92877-243a-41dc-876e-c82b0e38c52b} - {f5a49a95-7099-4b16-89ff-644e1948c77d} + {5ac39613-b118-44ee-8cb5-c41e5665ea24} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj index 8c7285170..3e44a53a7 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj @@ -201,7 +201,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters index dce4ab074..e1857da85 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {5a909aa3-f2c6-43a1-a94a-c55c8dc461ab} + {50c8668e-9ac8-4459-9a09-ebf9a54365a5} - {e10edd73-6300-4966-b368-6c8342d86d2c} + {4c5c5fb5-e57b-495f-be23-a1c4af396cf3} - {f54dbae2-2199-4058-b1f2-6c4eeb142d7c} + {b7a9947e-f555-4f34-8026-59f4e5f2f207} - {8fa9fb5b-025a-4e52-9a59-c2d27d1ba63b} + {da1ade20-7797-4776-9a02-873936c7294b} - {3c44a3a0-2c3a-449d-8251-c805c3b8149b} + {f082547e-1e03-49f2-b7b5-811824d1980d} - {418743d7-24c7-454e-9ae4-961afc53509e} + {71af5924-037f-4614-b81b-fea5dc6aba06} - {b25aed4b-783c-45b3-af47-e03adca31ca5} + {9d9f0972-5810-4cfb-b43c-f9fcc3349e1c} - {04ef72f0-3ced-45d5-a5a0-65ed64cfddb2} + {5dd733b6-9fc3-47ab-ba3d-856f04b3477d} - {af559953-9dfa-455d-9daa-3ec27efc30bf} + {c7050d95-c36c-4ac5-a0ad-69b91d94ab64} - {1a059a04-f86c-4905-91b6-c0e78f2583dd} + {1de7cfce-ba76-44a8-9f7f-48bb27c4b311} - {d1862fc1-25f4-463a-8d98-4a88234ad875} + {41e095a1-57ba-459c-b5ac-dbf63ef65620} - {0e3d92b6-829d-4cff-873d-7fb158915175} + {ee1acde6-c3e4-40b4-b799-6284e958636c} - {f08661c3-a6e6-4589-87c7-35005022fc52} + {595f1579-20df-4281-8520-983f73178be8} - {b753e8ae-4567-4e1c-a0a0-da0a2345c178} + {93169b30-2f68-493f-b424-a0329d1ab8c2} - {b5be9728-b820-4612-9a26-93058ee7438c} + {c219c394-c723-4488-97ff-847d99ed9f75} - {278f8cda-c84f-4df2-ba04-76b032a42ec7} + {e742a86f-5e6f-4fb0-8d31-d5fe46b1112b} - {ca262a9c-bf97-43eb-9913-af5e51712c70} + {84064d87-4b76-48ef-a233-db67a04fee01} - {c31cde9a-76a9-4215-868e-67b18ec32fca} + {69811d46-2fb6-48c6-bb83-3b8e82e69668} - {f2cf6523-46dd-441e-bd99-bcaa0a67daf3} + {c6f829a4-29ac-44e6-abc5-43598e7aaf5d} - {5aaecffb-d722-4025-98f2-28a88fd18376} + {b3cde0b5-bb03-4435-b5bb-038e4cfd0abf} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj index ca096f988..671d1542a 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj @@ -211,7 +211,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters index 1c7c23edb..6d162859c 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {a510f6f0-d16e-4a92-877d-9c4aa64c5692} + {a8f03d52-e32d-40cb-8b45-89f21fc65326} - {187c49d1-f924-4b2f-9303-c3562463314a} + {c898be04-3ab0-46a3-b769-d956c9b3f197} - {1384e05a-a9f3-4b01-8fda-5b54662d9307} + {f74bcc5b-611e-4717-a9e8-c313f4b5ab03} - {65140118-1604-4bde-8efd-b00ef6e4732c} + {a12d705a-bf9a-4ad3-b584-8bf4407413b8} - {19565b2e-d0ed-40b0-a2d2-b0c41f3b4756} + {37a673c7-3013-4bde-8aa1-ff55df2137cd} - {45d331ed-d85a-41c7-a0c6-2cbb7ce2c5cf} + {77a3e938-84b8-4b70-90f1-50ec91ccee28} - {005cc0c7-a25f-464e-9bf0-a71f5ee33cf1} + {38ae334a-9e08-4ed9-ad7c-a97281c5e0ae} - {f02bd7a2-8a16-49d4-b5ed-be36d1d60d4a} + {3d00a542-a5de-40a4-ba7a-d27ac85f001f} - {2018057a-cc37-4594-a7f9-f9f9fcba9060} + {968ca0db-a58e-4a0f-bf3e-78f9a2f3a63c} - {600d7a3a-090b-47ca-b42c-5541f46c2aa6} + {6600f83f-38d0-4714-b094-2751314caa5c} - {82e8ffe2-4eb9-4884-bdaf-d8b7873a1636} + {d4c16626-7195-4e24-b9a6-aab30652887a} - {443d352e-4461-4e41-b935-bc4f93ddaa9d} + {0fd5118e-0b5c-4007-85e9-cdbc8dbcf9fa} - {0014948c-6ea1-4fa3-9b76-2cef6a0d09e6} + {23d46601-7f4b-4f04-be77-7e4eed56a0c0} - {7e49f21b-8659-4189-b387-33a2aaae7acf} + {0111ad92-7118-4030-88b8-22f9b3ad4d12} - {6ea3324c-7ae3-4d57-9b9c-d5b01e60640c} + {f5bf9e62-a9fe-4877-b554-ad8a2c673b72} - {5f865109-d5ef-494c-be04-ee6a1f07da9b} + {474351b0-ce0a-4b7d-b83e-773dab0ddbbe} - {ed04f9c2-d1c9-40f7-a03e-610f2273e6ba} + {cd188c17-db0b-468f-9d7e-0734d0985a71} - {a490fcff-60db-4701-aa78-8493e5af0a8b} + {7091df48-ecba-44b7-95e5-a3950bce8096} - {563e2669-1dab-4508-b83e-c9e206acbd97} + {ab6b40ed-0eed-420b-a711-5afd7dc2cd87} - {8eabd61c-27d4-441c-8a5b-4d0d9a6702e1} + {3b38b052-51f4-4ff5-ab0f-6e5c4edd646d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters index 4ef4c725c..ed184408d 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {ff0ca9f7-fda4-47a2-a628-24d082b50c29} + {b9560133-164d-4391-a47f-3125f7eada18} - {0f5ad05f-daf1-4d13-a367-83eea3c1b569} + {99b48d5b-05e6-44c4-a944-191c60fd620b} - {910f8262-f73c-46be-9bda-50c6a86a355f} + {d67558ea-fe7b-4674-9dc3-edd83eca5ec6} - {4de1fb74-7638-4511-9367-a0685fb9fa82} + {6feaf9a5-de51-4124-aad0-49c4cda32772} - {e4a7703d-3d69-456c-bd60-dc29506d6b19} + {9a0bbbd6-1d33-4573-84b3-bc0dde165743} - {ac438f78-ca9d-49da-9f24-aa7793588985} + {fae76499-2867-47a6-93b8-43d154714ee6} - {ad63b7d2-08b8-40d1-8653-29d292fbd481} + {966dcfe6-4093-41f4-bb10-88296388626b} - {f9b374e3-0654-4c88-8179-2f82e960bcb4} + {23ba4997-186a-4b36-99f0-e86a599bf6e0} - {a047c89c-9a00-4115-ae6d-7c94d43d4cd6} + {3c372658-fa80-4811-86dd-e2588986ae64} - {80aceee7-6ee5-42f7-8ee6-8e8765917e19} + {9d1ab7c4-6be1-45c6-be40-14618592a85d} - {bea87d34-81c5-46db-9c30-f0fa7bcd69f3} + {0dbbaebf-4429-4708-a527-4528b99aa356} - {6a92cfe5-8a0a-4967-8ece-d24e60f202f4} + {ed2ffd9d-5716-4f27-a6da-7f15c0223aab} - {97578bae-168a-4663-88cd-78c0c82b0dfc} + {41a34260-9776-447b-8196-d5000b41c60b} - {06caa7a6-8bc1-49f3-b161-c7dbb8d0017c} + {c835c529-dc19-4cae-8c95-5633213d6d3f} - {da10e198-6154-4da4-b0e8-46b8685e4fa2} + {c1a0a578-c3f1-4ad3-963f-09b6af106040} - {95d2478e-597f-40e8-ac11-7753bce9cc68} + {4537ad05-0a31-4ad2-999b-8f973bad8ad8} - {a52007b0-103d-4be2-937c-a9f69e20fb12} + {5b4d2678-748f-4525-a101-eec212a60a22} - {35814c79-6f44-4516-a095-841775d4a9b3} + {944580b9-1c76-4b42-bea7-03a9148f373e} - {7fc0377b-d2aa-4038-89ca-98499b2049e4} + {eb0a36ab-03a6-44d8-8308-0285405ebcb2} - {dd518031-d032-4621-9fb4-30e4d115f027} + {70cd660e-e46d-4453-8b54-018a8bdd6f9d} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters index b7c5c25b0..ec047e725 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {89b4541a-52bb-4b85-b41c-dd15d55e1a0a} + {4dd36af7-a314-42bc-9056-980114c16bb2} - {27df703d-3972-4078-b031-ed844d0fb358} + {7c153adc-6d78-4e2b-a529-1f0c2b8f724c} - {4eb74448-d8c0-4e05-91ce-659b020ee12f} + {5dfb3d86-a2c4-4820-b610-e0abc58c4dbd} - {0eecb657-9162-42e9-ab3d-c56fc77209e4} + {aeb25f57-0cc5-4d9b-980b-702693329a19} - {3c0ae314-f213-4fee-9b34-353275f5b345} + {cc622668-2c3f-443f-bb10-3193c93d8b59} - {9d099b07-96ec-4eeb-9c54-26bbd9bbda79} + {50c00ef2-0f59-4160-ac7e-819f2d4e4f95} - {44bcb5f5-9c24-4371-a34c-64b3e90ef8c2} + {5d59efb8-0033-48d4-b014-e02a9d5d7be5} - {ed006a47-8fdc-4254-9179-bc7443c6aa3b} + {ca22533f-22d0-40d0-86cb-4fea8765b31c} - {96eb83fe-d103-482e-80da-d4065da85596} + {205e7915-73e0-41b5-9c07-07d8b8a88e67} - {99a5ed57-5651-4d5a-a7ab-36d7c7165584} + {a42f695e-63b5-411b-9a0d-c68f20b5f5c5} - {6cb43296-7230-468c-87b8-6af06aa70f24} + {8b123625-7a71-495d-bf0c-6a919df88dfb} - {dac24d37-bd5b-4dc3-a6da-ee48a8b331d0} + {b14fe48d-8099-4c57-90f9-9c7f51e75813} - {b39529d8-9470-4cf8-9cf7-1d89026342bf} + {7785023f-88df-40f1-af81-85e3f398c328} - {13f1bfe5-f902-458a-83ea-dbecf86fa6c3} + {99f2c287-229a-4f1c-aa3f-462e667c73fb} - {e501814f-f2f2-4dba-9f49-775a10273c0b} + {419bc693-b8b9-404d-b9f6-74e4558c3f81} - {36338f26-ddcf-43e3-b6ac-17033e0ce5bc} + {23715a12-188a-481b-9990-9622a53e5983} - {535ca1fa-6e5d-41ca-adf5-4bcb5b2bbd0f} + {a2ff7ca9-eca9-4ad0-9769-cb230920ddca} - {89371b5e-1447-4f63-b093-3c6e8e1a6a9d} + {26691cad-d4b9-4ba2-9651-662f0934129d} - {e3004af5-a344-4500-8ea2-9991d6832f3a} + {1cf42911-4cb1-497a-8899-1fcf0267b90d} - {f910ac10-7ab4-4e4e-9d4f-952b40349f89} + {44bfdbac-ffca-4772-846a-bc56d3727e6e} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters index 1ce9699c5..d15d1a0dc 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {af60f5f9-b963-451e-bcc7-352ca8b683f1} + {4576e2d5-5d56-4971-bedd-b123c1ac8a43} - {28b80c90-bbf4-4dd0-9588-fa332f83d915} + {07b4aafb-faae-44ad-a47c-c9d5e8917e47} - {bc868344-0300-48d7-a920-0f1fa1cbddef} + {2503cada-9cc3-4e6c-96c5-7db067254b2f} - {29fc6fe2-a71e-49d5-b6d0-65e7bcc0829e} + {7c70a47c-ae65-4171-a141-b9e696e1def6} - {6c95d605-c063-4748-b963-ec3439a12f0b} + {caec6cf9-0581-4c46-9a4d-e53bfe2174d2} - {ff2a88d3-d8d7-4d23-9e80-0d66b92446d6} + {38809bdb-ec8d-4f6e-8ae8-1be5765f194f} - {64495201-8656-4606-a478-2e9cab53958e} + {ce86f38a-a787-420a-bdae-4aa7116f839b} - {216d9cc7-5372-409d-a999-7f75eb32f5a0} + {8261a6b4-c164-4ee4-ab7d-afd0004837ab} - {028e8e2b-d431-46cc-a749-902a03535344} + {6f66448c-4332-4d00-b478-cf3b6c45bc3d} - {b392b00a-3cc6-4cdc-99f3-3053be9f8a14} + {93ae363d-bbe7-4232-8085-0059398985d4} - {eb22c1a2-d2de-4ef9-b94b-8a049b15ab5d} + {5ea55692-a62b-45cd-886d-7ec1be6335bb} - {f6ce265f-7ade-4a4d-b7be-52170da1ce95} + {8e2c2378-1a43-4404-ad34-6185aec0b200} - {ef2b6e4f-c9ed-49eb-a5fe-5647fe1797fc} + {d1a7a8a7-25aa-4d31-8732-0d3ddf8b1c2f} - {cd2837fa-86f8-47db-9356-4fc2a58889c7} + {32ce2337-ea7e-4481-b64f-a30e8e70166a} - {1deb9cae-90e5-43c4-89a6-1ec675fe26c1} + {35a93d0d-36a0-4966-905f-914b0ee8e3fc} - {7d08d914-c3b5-4372-8a90-ce1dfd38a737} + {24f8181f-b5c6-4f59-a3c9-fca1bd72a82c} - {4660ea3b-79a1-4c0a-b99e-52304c80cc5a} + {f73ceb2a-821c-4b45-8fa8-1da79b57480a} - {f308c4eb-6ed7-4b71-ae1d-d6a9bc5e9d87} + {77af0fa9-7e88-45a0-b8e3-62d0ea34c365} - {ec1a9608-51fe-4c6d-b603-f0cb1da3832d} + {15b89a56-4b4f-4142-a15e-d9ea01b967bf} - {bf2a3c42-0478-44b8-944a-9844df15016a} + {cca6462e-60c7-4aa6-985a-2db959badaa7} diff --git a/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj b/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj index 1d95ae5f7..f59eddda3 100644 --- a/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj +++ b/NetSSL_Win/NetSSL_Win_CE_vs90.vcproj @@ -198,7 +198,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetSSLWinmtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoNetSSLWinMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -214,7 +214,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLWinMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLWinMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLWinMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoNetSSLWinMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters index d935fc890..2c7096390 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {a0c82ec8-8b8b-4242-b2ef-893f93a460c9} + {f688dcd2-8767-46e3-b11e-4126c3a4190c} - {26c67b2a-20f9-4584-878d-8386a27d9bb6} + {f59658af-340c-4eaf-8771-6d6845cb8c4b} - {19777075-a3dc-4ac2-bb93-f0bc1d9b9a13} + {101c4e7e-470d-4f0c-b01d-b51cd45ef752} - {60442a81-fdfc-4a13-9b17-f81991499082} + {61acee4d-4263-4485-a4a4-dfa0a0dff23b} - {7b7cb407-b6eb-4acd-a3a9-121be520d15c} + {692e390b-83d2-4795-82f1-a308443bb9ab} - {c88e03ea-8be2-4a65-8808-542c673a3b4c} + {ba5b6fbb-cb06-4adc-80a7-31ec0a9085ee} - {47776cda-b63b-4367-8209-6654335c5473} + {ca0936a2-f2c6-41f8-93b5-48c9d0d56250} - {006821d8-1873-4b23-aff6-e439778f94c2} + {99efd02c-4b55-4f9a-9f15-0c8131816004} - {a0403664-946d-43cd-b82a-964158e8b117} + {bed530a5-1137-4514-afd0-182e9dff048e} - {a5a53cf0-4e0d-4f15-9173-09a2ac4f3b59} + {6e0daadd-105c-4604-a7d1-7b6ea01930ee} - {6267fc96-100c-4f3d-955b-b23d4ba82361} + {cb51a5ee-6577-4714-a50b-ab00a1e5a5bb} - {4099a142-7027-4a55-97ad-6bc50c5805b3} + {b1de3319-a4a3-412a-861f-6d7ff69a76e0} diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj index 2f2281e49..1d42ac7d2 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj @@ -47,11 +47,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT diff --git a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters index 250db9091..fde04745f 100644 --- a/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {a6035a16-c327-43bf-b9b2-2d977eb45992} + {c57c0bf1-9adb-4201-a378-7b582ab44315} - {fd96a11d-8b72-4a81-8b52-48de48a97d61} + {b8a17ca9-8574-4779-bce3-c7c2a7341487} - {9bb4df7f-d0b3-40aa-8870-9714662ea21d} + {7b6d1f5b-3aa0-455f-a2f2-9b67c12459ba} - {8d3b57a9-2f47-45f7-864c-00d9be4439cd} + {e714a20d-3c01-46d8-bc2d-2d57c4dae718} - {f14fbcbd-4379-4e44-ba4e-ac0ccd5e2302} + {62cb4241-24f6-4fa0-a0bc-dff28901e92b} - {7d514256-4828-4e31-b869-debeac2f5f00} + {590a766b-17ba-45d5-96bd-4da3c2194223} - {b4f3146c-3c22-4ead-94b8-bdc43de64f51} + {c9f2e3c1-1608-47a3-96e3-3ca5fdc5f113} - {bf94d401-62f4-4f09-a3b3-b3719ef7c491} + {8e519afc-678b-4d34-b885-37b179370c0d} - {5105176d-6840-4a77-a650-c1345c8bf5e4} + {92067f7c-c0aa-4b6b-870f-ee1d90650cee} - {fb43d56a-4ba4-4be7-bad8-e25b355d3fa4} + {9cfd8670-249a-4914-98ac-8dd75a5d7e71} - {9f683a88-d3b8-49f5-8752-005e1998afba} + {7d23446a-7a68-4e1f-9ace-13ac55687f7f} - {ccaf7901-2dab-4a47-a8f5-142eae3415c0} + {f7d1733d-f980-49bf-a093-a97cc36b64f1} diff --git a/NetSSL_Win/NetSSL_Win_vs100.vcxproj b/NetSSL_Win/NetSSL_Win_vs100.vcxproj index 62e661bad..ca33e0b49 100644 --- a/NetSSL_Win/NetSSL_Win_vs100.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\NetSSL_Win\$(Configuration)\ PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLWinmtd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLWinMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLWinmt.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLWinMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + ..\lib\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoNetSSLWinmdd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib\PocoNetSSLWinMDd.lib @@ -271,7 +274,7 @@ ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLWinmd.lib + ..\lib\PocoNetSSLWinMD.lib diff --git a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters index 9b1cad311..945700355 100644 --- a/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {d44fc7cd-7123-4459-a544-fb02c573ded8} + {fbfe4be5-b3b0-4f90-8f85-07f076e0bb50} - {b42fa0c0-7482-4fbd-a681-e0966f87f0f2} + {cbe57a0b-c18e-4862-a2bf-c7fe11d6d86f} - {17793a04-3993-4f1c-9457-66eaceb08bba} + {7791a557-899e-4f5e-b1a3-3d258dccc3f2} - {45fae5c7-367e-4abe-bccc-5084aa37ffde} + {0746a666-8642-46fb-a746-9d6e0c4c7cb6} - {042bc49b-b7bb-48ba-bed3-d58f63d8defc} + {cb39bc52-c7ab-4312-8753-08354153286e} - {d7d5d9e9-43a1-49b5-94a0-dfd27eb2c519} + {effbb682-cc1a-4da7-90a7-0bb4e1559a20} - {f9a77f73-7bd8-4a4e-814e-7aca0716ff4d} + {a9c4e9a7-9dee-42b0-8252-2e04925948f9} - {df2129bb-0cf7-4ff4-94d5-ffd84ad1fd26} + {0821eea1-15de-4675-9540-f8856133c4f1} - {621c1beb-16fa-4588-8419-989aa9043f2d} + {d5845e2c-364a-46a0-9e3d-1cf6ecc4b56e} - {d18f5d40-16c2-446a-8f99-471cdd8022f3} + {a658567e-5aca-42f9-b135-368b9775ab33} - {5b2253de-e017-4c18-8339-acab198d8468} + {d4870c34-282a-4f35-aafd-a4b8ede225ac} - {954e316a-e4ce-479c-a3b4-e4282f500280} + {b86b67b5-ad4f-4909-8a48-6795e461f092} diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_vs110.vcxproj index f5e7d47f3..d4c5dd680 100644 --- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLWinmtd.lib + ..\lib\PocoNetSSLWinMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLWinmt.lib + ..\lib\PocoNetSSLWinMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + ..\lib\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLWinmdd.lib + ..\lib\PocoNetSSLWinMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLWinmd.lib + ..\lib\PocoNetSSLWinMD.lib diff --git a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters index 2d1627e18..111aee220 100644 --- a/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {17837a76-c6b3-410d-9f12-fa770ede2c47} + {3e591752-438a-4cde-9f9e-ec037c558fa3} - {1072c3f7-bdca-4ca9-af0b-1bc471beedf1} + {159a61c7-5fad-4bf8-a262-b9b00186ac27} - {8af9f4f5-f4f9-4246-b5fa-aac0cbbf9fc3} + {6c78f3d6-7ee8-4f12-a705-02370957e962} - {546bfb4a-f542-419f-b599-bf2f8976d005} + {559a8825-ec1d-4abc-92db-f1eb6153a358} - {2ee6a423-028c-440f-8084-e94b46b9c539} + {afb9b89b-a117-4452-a2a7-e4eb1718e135} - {ce1f1bb1-928a-4cb7-b4a5-9cd9b1e0bc6e} + {32e7d62b-892a-4a88-9199-8afd2fd9e27d} - {7d92fae2-e83a-4ffc-999f-df0d5fd0e52e} + {1bc93dc2-a4e4-48c3-afcf-ec8f9d1c76e5} - {843947b9-c29e-462b-8cc8-4e3b31fe9185} + {aa103327-a21c-435d-a5d2-ef1e42a0d918} - {e8b80fad-ff4b-43f4-a60a-6e77e2c92eaf} + {d1bce349-1e45-46cc-96d7-7077a6969efc} - {b314a4bf-3ec0-42c7-a7ed-ebe2d2de8414} + {5b7cbf26-8a54-474d-8fde-24766cb2b486} - {a1f09f6c-5066-4bf2-b014-7a2936e21192} + {eb88027e-6fb9-42c9-ac11-c6e4d99b648b} - {a20ee76c-220c-4f6e-9e4f-c6333a3683a9} + {d4a43cdd-1f96-4917-b6b7-6a77f438b828} diff --git a/NetSSL_Win/NetSSL_Win_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_vs120.vcxproj index dc1c6fe87..f72e416d0 100644 --- a/NetSSL_Win/NetSSL_Win_vs120.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLWinmtd.lib + ..\lib\PocoNetSSLWinMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLWinmt.lib + ..\lib\PocoNetSSLWinMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + ..\lib\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLWinmdd.lib + ..\lib\PocoNetSSLWinMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLWinmd.lib + ..\lib\PocoNetSSLWinMD.lib diff --git a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters index 4d4c65a4b..747ca7ec2 100644 --- a/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {7088f115-e351-48b8-bd57-0bcd7749d7d0} + {f80ea747-ae65-4cef-8861-bb77fa2fe738} - {258a60bc-bc58-48aa-92ae-28f8bd7dac55} + {0d847e81-60c6-4594-8558-b4870c3944e9} - {dddddcb9-9753-4b80-9e35-2fba69e1a2ef} + {4da64117-26bb-4b4c-8868-2c37fa12e20e} - {ceb568a0-a531-43f4-91f3-fc937187bc76} + {76f9f84c-ecad-4ea0-8812-a09cfec31c8a} - {4a723689-0599-4f78-bc36-b2ebfba03451} + {1a3f4669-6c52-401b-ab83-e4067fd1fcb0} - {2dc6af6a-2f84-452b-8410-d39864262b6b} + {0d95a853-5f09-4de6-87ed-c99006527f87} - {d80b1309-7b76-4cef-8601-c85295dc5bb5} + {8c1f0cfd-37cc-4653-8496-66a04121c748} - {b50aff90-e492-4492-a531-6de58261e48b} + {2148444e-c3e2-4660-ad52-24163a5b77eb} - {867b2084-fbc7-40bf-b65a-630e74b799c1} + {0562baf5-f509-4b2d-979f-d1930f0ade03} - {078c83f2-4573-496d-b027-40233e164d5e} + {cb576efa-da36-4a4a-817c-be1cfa07afbf} - {0b188691-a2b2-41e4-9066-200aaa845562} + {3e01a494-3252-4ec5-a1d9-7b0446263914} - {e579528a-2028-49a8-86fd-f03891e7a2ff} + {063da31b-8320-4507-987b-2d15a38ae4ff} diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_vs140.vcxproj index 39275569d..0b92763ed 100644 --- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLWinmtd.lib + ..\lib\PocoNetSSLWinMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLWinmt.lib + ..\lib\PocoNetSSLWinMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + ..\lib\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLWinmdd.lib + ..\lib\PocoNetSSLWinMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLWinmd.lib + ..\lib\PocoNetSSLWinMD.lib diff --git a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters index 6c2ea31dc..e11bace49 100644 --- a/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {c161f211-5989-4966-bbb4-49d2868d1fcc} + {1ea52c6a-f325-40e4-8507-bd55696df72b} - {2f75312c-48c0-4ed3-bb65-aa0a5b631a57} + {ca9c7e85-e9c5-456b-82fd-aeea0a4fb232} - {35f2ff70-c637-43d5-9216-d1d0a2294e06} + {ca66ba29-d29b-475f-aadd-d7d5f2c47398} - {d4f59bb2-e281-48e7-b5cd-d98f71e0b709} + {164985b6-c356-4c37-9c59-6a78949e8be2} - {ad57d232-3991-41bd-9a07-c385e994ab62} + {aa8deb9a-a925-4578-bfe1-99489aa2e007} - {460ca731-fed3-4fa7-b917-36b7ddea77e7} + {4df86e0c-4d0c-4b7d-8598-f7da9bd7664a} - {8dd65e1d-ed6d-4b11-9663-e9b00295c4c9} + {d5b66cd6-116b-4194-ae7b-641a3e713fb3} - {f5d301a1-1e40-425a-ab4e-77ad6235f95a} + {38b8ddcb-deb8-40d0-9bb8-2b87f480e2a0} - {468c961f-5606-4ec2-84f5-eed948ba3464} + {f63cca7e-d894-428e-a85a-a1fb4032a1aa} - {8bb93f5e-4223-49b3-aa12-e7aa57ba6fb3} + {0cb04ff2-e665-4b4f-9744-76d03153729a} - {da9dc65c-4f4a-4d6a-90a3-d71038a73de4} + {8beb0043-246c-4d59-8983-8f2cf6150c17} - {0fc9aeaf-26f0-411c-b0c7-430e66dac35e} + {07505214-aaec-4484-a655-20aa8c29e960} diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_vs150.vcxproj index 78ebf7316..84fe27689 100644 --- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj +++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNetSSLWind - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin\ @@ -202,7 +202,7 @@ Default - ..\lib\PocoNetSSLWinmtd.lib + ..\lib\PocoNetSSLWinMTd.lib @@ -226,7 +226,7 @@ Default - ..\lib\PocoNetSSLWinmt.lib + ..\lib\PocoNetSSLWinMT.lib @@ -243,13 +243,13 @@ true true - ..\lib\PocoNetSSLWinmdd.pdb + ..\lib\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoNetSSLWinmdd.lib + ..\lib\PocoNetSSLWinMDd.lib @@ -275,7 +275,7 @@ ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - ..\lib\PocoNetSSLWinmd.lib + ..\lib\PocoNetSSLWinMD.lib diff --git a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters index a6d425ccb..417d6baae 100644 --- a/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {b7e49256-d518-492b-9f0e-99111d157330} + {c0f23bf3-0c95-41e8-9a6a-f475884c7c29} - {2353da61-3889-4dc5-bd6a-d70f950a9702} + {67f62438-713a-4a7b-9994-7312fc07c3c7} - {dcc73eeb-9929-4d37-8061-9b922519c3e0} + {b665c1e6-6746-4a45-a81d-6296f04f3562} - {5b2672f5-3096-4015-a96e-ad6f5bbab734} + {522e7db4-e832-4e18-b1f2-6c408cb6a1f5} - {739edc4c-e58d-46aa-b640-acc15324a056} + {a9bf20e6-72fb-4c02-bc87-6df51cc956f0} - {b2161dc5-122f-44bb-8c08-25e7124f0e00} + {3126f73d-059f-45fd-89b4-26051215b623} - {9849eed9-69e9-48b4-8d2d-dd84407fa78b} + {d30263d0-b1a7-4069-a188-fb62f727b73e} - {6176a3f7-86ae-4b92-926a-6b27ffdc5d9a} + {ad3e9a29-3678-4f0b-b6bd-2a053df91cb0} - {8b9bfd91-48c3-4cbd-92e5-9f4efa02d453} + {6bdc358d-411a-4b09-b883-d59c87a9a28d} - {0dd403b0-8349-4356-86b0-a7c79b186d66} + {27ac2520-b36d-4fc8-b18e-03ecb382c8f7} - {e63ee727-41e4-4ef6-98e1-996060e9b492} + {8d3cba1c-36d2-43e1-bc80-eefd280cec90} - {b6c91120-727d-4afd-816d-1d9af78b9576} + {038c25ed-ebc9-4036-ab87-78f92800a6b5} diff --git a/NetSSL_Win/NetSSL_Win_vs90.vcproj b/NetSSL_Win/NetSSL_Win_vs90.vcproj index 848158521..b1411f3af 100644 --- a/NetSSL_Win/NetSSL_Win_vs90.vcproj +++ b/NetSSL_Win/NetSSL_Win_vs90.vcproj @@ -185,7 +185,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\PocoNetSSLWinmtd.pdb" + ProgramDataBaseFileName="..\lib\PocoNetSSLWinMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -200,7 +200,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoNetSSLWinMTd.lib"/> + OutputFile="..\lib\PocoNetSSLWinMT.lib"/> + OutputFile="..\lib\PocoNetSSLWinMDd.lib"/> + OutputFile="..\lib\PocoNetSSLWinMD.lib"/> ..\lib64\ obj64\NetSSL_Win\$(Configuration)\ PocoNetSSLWin64d - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin64 - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLWinmtd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLWinMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLWinmt.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLWinMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + ..\lib64\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLWinmdd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLWinMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoNetSSLWinmd.lib + ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ..\lib64\PocoNetSSLWinMD.lib + MachineX64 diff --git a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters index fd08b091e..3528af147 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {456417e2-2939-4b15-9583-ce334d918474} + {3cee40d1-0d1e-4726-a4c8-5d9fd376ad1d} - {7fa867c4-f33d-42de-a5ac-947a44121d03} + {2a9cd4e4-19de-4fd3-91e4-125335f7c371} - {46d5cfa6-567a-4255-8ac7-dd7fa8338480} + {fc0c000c-e2e0-4e24-90c9-f1834b00a00c} - {14290e0a-d52f-4ecc-b809-2d64e7acf273} + {32d91bce-668c-4f93-afbe-1aaff1f1b39f} - {61bf1273-0bfe-4d1a-9c48-e9d220a068ab} + {b21ac744-c211-49d5-8d2a-7c66f7e877e5} - {3442b2ee-cf57-466e-8815-ad97ffea99c1} + {266c6a27-3920-4243-ab76-ce35a5073495} - {7af2795f-a7fc-448d-bdf1-cb171daa0284} + {b1935aec-e225-4094-af35-c1011843266d} - {338c0580-0d3c-4c87-a1a7-a34ee9c2fb5d} + {c05f85a3-44fa-41d6-9d93-2407328d4dbf} - {78e20ac1-7f21-40de-a55d-0773640c1221} + {44b4c303-33ad-4b69-b581-499accbe2c37} - {0e25f034-5d34-4f35-a078-645d91e76bd7} + {e89bd5c1-4f3a-428b-87ac-549b49a6df4f} - {52ef5eca-72bc-4ecd-86f5-4a1ea6b8b551} + {65877160-3604-4f54-88e2-c7c702b25c62} - {dcf41622-4c50-4b08-9d53-7a8d012d5407} + {15e6355f-234a-4fde-960f-b4cf342b8b06} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj index 3a6fecd9a..8c872e8bd 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoNetSSLWin64d - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin64 - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLWinmtd.lib + ..\lib64\PocoNetSSLWinMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLWinmt.lib + ..\lib64\PocoNetSSLWinMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + ..\lib64\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLWinmdd.lib + ..\lib64\PocoNetSSLWinMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLWinmd.lib + ..\lib64\PocoNetSSLWinMD.lib + MachineX64 diff --git a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters index cbfd910ce..d58582032 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {86486de2-aa6c-4783-be62-27a411f6b0a4} + {c69e414b-f8f1-44d7-ae86-a4c55a5cb771} - {c7ae497e-4190-4173-a83a-ccb195fff361} + {2a187aa0-1aae-47e4-93e3-f4e04c42a970} - {d525bb9e-8f6b-4790-b509-e83da4af2a09} + {f6741226-dbb7-4470-948d-e975f21f72e2} - {3d6cd1be-f552-4930-b0e0-6139539b4400} + {bdb2ac42-1c67-443c-a2ec-d44f699e534f} - {428e8cf3-f2d2-45aa-b5c2-815ba77eb3fc} + {6cbf5b42-35ce-426f-bb06-e9760ffbd2e8} - {3654bb41-2806-404a-9366-4184beb72fcc} + {5661e7df-2d7d-4536-ad51-0de894d58db8} - {fb27be65-8fc1-4070-87b1-01ee08cdf77d} + {6bf27ac4-6581-41f6-95f7-72f801ca4ebe} - {62aa9a58-b820-485c-a163-051e5ee5fad9} + {de6816b3-f026-47ca-8b97-c1e8080e8ae5} - {41e2d6b3-906f-417d-8f63-d1d932a65ea7} + {3b6237cf-6cea-4a60-85d2-91800ec6ad0e} - {9b4da4cd-a654-445a-bbd2-fa17a678b5de} + {793b81af-7e21-4e10-b01a-a917b9c263bc} - {9bbb62b9-9208-43d2-99da-b3fc8606cdfd} + {1797549f-00b9-4b68-8c2c-c4e4964014da} - {49bcbf18-d072-42af-8979-cd3373d4a914} + {ac709a22-a7dc-4c9b-a2b6-b7fb77612686} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj index c74f21db2..daba455a2 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoNetSSLWin64d - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin64 - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLWinmtd.lib + ..\lib64\PocoNetSSLWinMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLWinmt.lib + ..\lib64\PocoNetSSLWinMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + ..\lib64\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLWinmdd.lib + ..\lib64\PocoNetSSLWinMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLWinmd.lib + ..\lib64\PocoNetSSLWinMD.lib + MachineX64 diff --git a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters index a833fabdf..c2fbe952a 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {af7ba983-ef91-4422-ba90-6212b7ef4543} + {9976a775-2489-457a-ac01-011d1722b99c} - {ac0ec2a8-2780-4882-b481-3df9b6fec594} + {5d7d7961-69c9-4ced-97f5-4ebf5882a5cf} - {d124c2c1-52a8-4bc5-a4ac-aaec3dcb5e7b} + {846b4cdc-be29-401b-a52a-d9a5354ef000} - {f3e162e8-dbd4-4b31-aac5-37f61b0c85dd} + {6e1e8cce-8c9c-40c4-833f-e0f9a3d7f2ff} - {6f6761a3-f5e6-4350-9dcb-4f9944c5eb5c} + {aeaa5bd0-6c8d-4e7e-b4bb-254da1edc622} - {5f45deef-406b-4ef3-a5fc-a65831c1cda1} + {efa577ac-f1ac-4313-9e30-3b57a204dd79} - {b5514e71-eb39-4acf-b3af-d0579ee41747} + {e08181fc-7479-4c56-a623-4e4fd124e0d3} - {acd8a1ad-a381-4659-9207-044b81098ba2} + {20879f15-8ee8-44e5-9ae6-b2e0a4814229} - {9457dd7f-0e98-43a7-bba4-1aea5e41e4aa} + {12ee67f5-5b93-44f8-b6d3-1589b4080d6d} - {006827f1-4eea-4b7b-9db9-5b275bb2d467} + {d219528b-49c7-4f5a-ba5d-b13654f8f6ad} - {be045dbb-1ba5-46a9-bc1b-56d4975de21e} + {a9c4282c-dd10-4606-b495-4cf890972088} - {13c04125-a325-4d73-9ff3-4736ef1c95e0} + {608e2061-5bf2-4e67-bca3-412f3912ad82} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj index 03fcf20ae..cd2d8ed44 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoNetSSLWin64d - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin64 - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLWinmtd.lib + ..\lib64\PocoNetSSLWinMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLWinmt.lib + ..\lib64\PocoNetSSLWinMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + ..\lib64\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLWinmdd.lib + ..\lib64\PocoNetSSLWinMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLWinmd.lib + ..\lib64\PocoNetSSLWinMD.lib + MachineX64 diff --git a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters index 34e86fdab..1138ae40e 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {195d7abb-73b0-4caf-bdd8-b2b8469ef8b7} + {0a898560-adb5-418f-93c9-41c026e96a14} - {3b7f258e-7861-42ee-8feb-38b97cfb3baf} + {1a06602e-e682-4e6f-935e-ed6952aa2480} - {534acb19-71c1-415d-a142-8d6fdf318822} + {2c206e7b-da4a-414e-a789-f6d4c40b6dbb} - {fe8381a5-5cf8-4505-94ca-9cf8dd37f1bd} + {dbd3eae1-60ed-4ce9-8ec5-edc3072ea29a} - {33a04922-4288-4405-b31f-29d85b22bf79} + {cda64aab-4352-4e84-bddb-eafd8656ea1e} - {584b33d1-9309-4b26-be38-fb3f3c7b84fa} + {5596dcb4-525a-40f7-ab91-b5dd857153bd} - {95bff298-a7bf-442b-93e7-30ef83fb6613} + {cc87a2fd-5159-472e-983b-2bc0892d3951} - {ff34f1db-fc70-4a09-99f0-f43583a2315f} + {99b45d7e-9f70-4539-adb4-689e9230d1f7} - {938dc364-c685-45ef-86eb-a3cff79dedc2} + {2b28e86b-95f3-4e96-940f-8cba8e17cdba} - {c024f8b5-a141-4cc7-8f57-f29858d1d71f} + {03355698-b224-4e20-95c7-092788eb1c03} - {ab8d1fd0-d423-4259-bd80-531105e22c87} + {080e6d88-7ca0-4400-914f-f7199a14883a} - {924ab81a-d183-4c6f-94f6-414a121c23f8} + {5b879d82-c2b6-444c-b08b-8446d3320aa5} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj index 8f4536ddd..8a36d77c4 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoNetSSLWin64d - PocoNetSSLWinmdd - PocoNetSSLWinmtd + PocoNetSSLWinMDd + PocoNetSSLWinMTd PocoNetSSLWin64 - PocoNetSSLWinmd - PocoNetSSLWinmt + PocoNetSSLWinMD + PocoNetSSLWinMT ..\bin64\ @@ -202,7 +202,8 @@ Default - ..\lib64\PocoNetSSLWinmtd.lib + ..\lib64\PocoNetSSLWinMTd.lib + MachineX64 @@ -226,7 +227,8 @@ Default - ..\lib64\PocoNetSSLWinmt.lib + ..\lib64\PocoNetSSLWinMT.lib + MachineX64 @@ -243,13 +245,14 @@ true true - ..\lib64\PocoNetSSLWinmdd.pdb + ..\lib64\PocoNetSSLWinMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoNetSSLWinmdd.lib + ..\lib64\PocoNetSSLWinMDd.lib + MachineX64 @@ -273,7 +276,8 @@ Default - ..\lib64\PocoNetSSLWinmd.lib + ..\lib64\PocoNetSSLWinMD.lib + MachineX64 diff --git a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters index 6ed672917..34872ac20 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters +++ b/NetSSL_Win/NetSSL_Win_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {576b42fe-b5aa-47e0-98b2-573934e095f2} + {8df91779-cf8a-4e31-8af6-9d6d5ea7ba05} - {6af74f94-33b7-4a23-b20b-c515275beb1a} + {ee6fcfe7-4fa8-4536-b832-78dda5c992fa} - {5b6536e6-9cbd-4a25-8768-f52c11c05a52} + {2cadf45e-496d-49ef-bac2-9119f2678384} - {44013d1f-43c1-40c1-9993-87f19ea7bdda} + {aee4221f-4046-4a94-bfa6-bd3f177bb8f7} - {fb776141-0687-435c-a251-d09f1ecac2ec} + {2ccfea05-fe81-4b43-b951-30d5530227c6} - {d8a27445-d4cb-4887-a4fb-ad5a5340e810} + {a359e0b4-4ef7-46a2-b4ad-6f40a1756d89} - {77c5c900-7166-4de8-86ff-9e2da08ebfaa} + {ade04958-c57b-4871-abf8-64dcb8802d0f} - {6b4ef558-7a40-4b56-8768-036fed117595} + {82b2f196-c1d2-4f65-8b33-888ec0dcc324} - {765ccecc-29cd-4aa2-8dc5-17e9d39ed73f} + {cdb6a245-2014-48f0-9650-643c941dc76a} - {5c542840-6e3b-47db-9fbb-bc2b1abe2c82} + {02ef2e0f-8523-4a72-8ca7-4d1ce06b365f} - {f8de1674-86d5-4e1d-a5ec-677bd4f1aa68} + {6410ef95-3afd-4612-bfe2-84b55a4d6e57} - {39bbb7ed-66b0-4098-a931-82269773d8d7} + {ca7af155-527e-4307-8ef8-84bd76e0ddc8} diff --git a/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj b/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj index 4ab5eedaf..954d1b971 100644 --- a/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj +++ b/NetSSL_Win/NetSSL_Win_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetSSLWinmtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetSSLWinMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,7 +201,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoNetSSLWinmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoNetSSLWinMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/NetSSL_Win/testsuite/TestSuite.progen b/NetSSL_Win/testsuite/TestSuite.progen index dcc2941f4..a542c7cb4 100644 --- a/NetSSL_Win/testsuite/TestSuite.progen +++ b/NetSSL_Win/testsuite/TestSuite.progen @@ -7,12 +7,12 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include;..\\..\\Net\\include -vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib Crypt32.lib -vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib Crypt32.lib -vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib Crypt32.lib +vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.x64 = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.WinCE = ws2.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = -vc.project.linker.dependencies.debug_static_md = -vc.project.linker.dependencies.release_static_md = -vc.project.linker.dependencies.debug_static_mt = -vc.project.linker.dependencies.release_static_mt = +vc.project.linker.dependencies.debug_static_md = Crypt32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters index b1831251c..f2ffe8017 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {25a156bf-e3bd-4697-9787-db13d4a7a7a8} + {5977dd7a-f8ef-4fa9-bfa5-6aad1ab29e28} - {dae3e082-5724-4034-a1b6-205c712c556b} + {bcc38fca-2ba8-48f5-9444-95bbf4e2a130} - {39f2da14-bfff-453e-b2eb-85a56a18eba9} + {6c80f489-f346-4666-8e44-e515c28f99d0} - {5325088e-b562-49ef-a1a5-6a3ba9b5f42e} + {628f1cee-aedf-4fd2-9c46-322847648333} - {f95de635-275d-479c-9d52-77d15a97dda1} + {4928a575-dce8-4353-b105-69f98d13c231} - {5a40c452-1786-4604-8fb7-5a0d447a67a2} + {fadc4e66-d862-486e-8413-300f6e6686c9} - {b98554a6-ad8c-4496-ad3c-632faadd0572} + {adba5997-4e39-409b-9a42-c7c78b413963} - {3a5aa353-82f7-4f7b-9bf4-c669e590b156} + {8e1f8066-b28a-4b84-9cea-c88a1f661cf7} - {53a04886-ffa9-44ff-9de4-b0c1298761c5} + {838f3b29-a464-4faf-9603-98597d772752} - {8f06ce9e-1378-44db-a08e-619f09585a3e} + {86be7663-037d-4c81-afa7-9eba5dfe4886} - {a4ee6e14-2864-4234-b416-e4ebe6642ba6} + {c4d82f5a-bcdd-4b8d-a469-5b5259c338a9} - {de27518f-e094-40e6-817b-1a7b73da4be9} + {ff23b1b1-c450-408d-85d3-78b894dfbcc2} - {7f0c2495-d5e6-4d1f-bb44-0393a3fdb3b2} + {141b97dd-35a1-4095-a94d-55628149d6cd} - {9683449e-86d7-4cef-956e-67605dda3c58} + {64e74f92-794f-431a-9478-3b34e0172410} - {b646e2e8-18b5-474c-b178-0fc2b1e09022} + {ab947ce5-26f1-4345-b2ad-6ac45e7c9ecd} - {d670faaf-0415-445e-b020-83031c1ffe26} + {e02f16fc-ddd7-4e82-8fd9-0d9c731cc279} - {748f4932-ac2e-4621-9fcc-c5b86f155f65} + {5c324944-9e84-4904-9a8c-96d3b774b4be} diff --git a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 95e5b43cc..9a5e452d1 100644 --- a/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {1a96d783-a572-4abd-a559-b8836db9274b} + {873b5cbc-8082-43dd-ad5a-aa9f71a81aa9} - {e078a961-cad1-4737-aeff-019e4e9082da} + {e38a9c6a-c209-4152-a34a-6303786c9f2b} - {6b41eccc-8810-49ca-8294-55026c645a45} + {111d5555-0a65-422f-98ab-fa6e57760f19} - {7df638dd-9d9b-4a56-9d4b-d84f9f5671dc} + {47f414ba-fbc8-42fa-86d4-3656a28c4d02} - {7f8b3fba-1472-4ba7-b371-4925f92eed4a} + {72aeeec3-a750-4d33-a85c-f44d3ccfcc9e} - {31a7d95a-eb3f-43b9-8d3e-be86e7b42a14} + {71f82a08-1685-4b0f-9059-0bd7f5619b60} - {3b386dce-e484-4de1-a4d8-abde5be418ae} + {a716685e-ffe0-4294-a0c6-cacfe3980953} - {4d4caa6b-600d-4ebc-8944-ae706435a243} + {8c3d476c-4e0c-4aaa-afd5-b2c52d3387b6} - {3d392d5b-6b99-414d-a166-3842c3e5bf62} + {610d67fe-97f8-4886-be7b-06f983240646} - {ce72b523-285e-4700-a524-6deec2f27769} + {bd1cb6a1-6d7d-425a-9e7e-a2e7f76b562f} - {012d4a59-ee43-42c5-9b52-820b3a1be9b0} + {0b65cbd6-01c0-48eb-93a5-307e14e8489b} - {21ddad31-1280-4674-b57c-82f7d588dc14} + {ef5de08c-1c10-44c2-ae13-35754f1a835c} - {4139637e-e4ba-4ab8-a103-680ad72e2061} + {229fad6d-1acc-4b54-840a-01bd90016a72} - {d6d5ecf8-79cb-427c-83b4-d5c43ef7a23b} + {b9ed757c-2a96-46a7-85f2-95ffae0aa7bc} - {61f51417-b718-4b71-905b-0e5bd22872a6} + {a7c4fb4e-5ba7-4091-8ce3-cce0db69fab5} - {37241103-ba5e-4452-ba44-e84a29c07ad5} + {4c7aaa5a-517b-4290-86e5-848933f4f43f} - {eb1e899d-2402-46b0-91d0-4213073a2b76} + {1468de2e-b6d5-4007-b8de-ad9ae8cadef8} diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj index 8151d9f8f..08ab6a87f 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters index 0b9a27688..52af779da 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,55 +2,55 @@ - {46f4786c-da7a-4b65-8e9a-5f42d9233ad2} + {4a5cff68-95f0-422c-89fa-231d9df2fe19} - {b0379ba4-88a1-404e-bad6-9a75d2b85aab} + {cde13504-785b-4410-8fcd-6baeb16317e2} - {774ba64e-961e-41de-bb95-a77552d5e3ed} + {ba0affa4-e447-4bd1-8ee6-31658445294f} - {dc1effc0-fbdb-4fcb-809d-9677dca63152} + {fd157fda-02f8-4a39-9bfd-0d3ba619531b} - {941d3677-9d1b-4406-a19d-1ea6058b9a59} + {46cf1197-3749-4173-b8b6-76e938a1bc80} - {284088e5-87f1-4c84-afed-c6814246d946} + {f4f098d0-2a34-427c-a2d6-77c3fd977532} - {47ef9231-039b-4d2c-8695-c6f1a462ed0e} + {b5886016-dd32-4be7-87c0-cc6f0c4107f7} - {c51b0582-6b42-4db1-97e3-829a11bac16f} + {8ca2981d-def3-4255-8412-97f32b9615d9} - {8e96b4ca-bb1f-40e9-9012-b01b1a7a30d0} + {364edbeb-9485-4930-87f5-4ea8e1da4e69} - {7db3bda4-8d01-43b8-9191-e598cf74a51e} + {5c1a4bbf-a3da-4105-8f04-60725e8e0cac} - {9f5846c2-d8ff-42f0-879f-22b13cf39d1e} + {19623ea0-3913-432e-84e5-0ae960c63b96} - {5f434ee2-e044-4f59-b72b-9bd00db3ef18} + {9b53d534-290f-42dc-968d-68d6363d31ba} - {5a72ffde-2f06-4f61-b6de-19cf15968996} + {78163dde-3750-4e41-8121-981e84454859} - {05e308d2-624c-4258-9478-feb30f5aef35} + {7669f3ee-5484-4ce6-8ba2-23a3071cece3} - {35a83a23-feb8-426e-9c2e-aa546b15e0cf} + {e0817296-d088-4004-ae12-00f685745f5c} - {53b4d280-0bcb-422c-a9a1-7b5286f27b1e} + {83acc592-a7be-4f9b-8594-b19ca1d0693b} - {0e1d2595-7ab9-4689-96a7-6c53dc136317} + {86a0b86b-4c10-410e-999c-15d353a9d8ec} diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj index 0682ed2b2..27a692011 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj @@ -148,7 +148,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters index ca9c3d8ac..9e44cb0bf 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {6e8fbfec-9ecd-4998-b4f4-cf12689a5dc2} + {f386174b-0d37-4c89-bb41-e19373df52c6} - {4bdb160f-91f9-4129-9f17-9b7090910c47} + {1a111a47-a24d-4612-b458-a8324b46f396} - {b70b359d-fec5-4b5d-97d9-9b0c126dbde6} + {54e58f7c-e322-4f03-90e4-b09d785349d0} - {55a71d07-6087-405f-b600-116876d1aac4} + {ace5bc41-8db8-4c4b-8ff2-f05ae652f824} - {2ad97208-275e-4774-a80a-ef46d9f4d890} + {9e7a2125-4e9f-4e1f-b7a5-90e9f4c166c5} - {98534da0-eb60-4bdc-aa26-444be92b13c4} + {8e51dfc5-20d6-4880-ab3c-4a2f5242ecbc} - {217b9bd1-7995-4f76-ab2a-520d4cb582a5} + {90e2736d-fa47-4be9-a330-37fd71e7e11c} - {3a830f18-a9c1-4329-ac5a-3ce506f7743a} + {1ec6c392-e45f-4038-b2f0-45b5314ebe36} - {ec2c60eb-4f8b-4cad-965d-8a1382939e4a} + {9cf9f938-45c8-4007-9a4d-b15d2face020} - {d2c4210b-b9e3-436c-b1d5-5be77253e1ef} + {0746cc33-c35d-48be-b99e-2c809bfd49ec} - {95f6eb48-55c3-442b-9841-8ba9de7ab1ab} + {86b93e68-d18e-434b-a3f5-87d38a0f30e0} - {6f512c26-1221-4f1c-ac72-8cc0384aec62} + {f4cbc295-0d6d-4898-af6d-abfdf43da561} - {52d87d81-e666-408b-9a04-98fc65caf8e7} + {26656485-f0df-4028-9abc-05f2846764f6} - {9d0b600c-bf4c-4221-a6f8-f001be81e96e} + {8b8bc006-ac11-4279-9a4c-804a75794e0a} - {f3e0aca2-fc35-42c0-b53a-be9280424f11} + {83555a7c-5406-495c-9d19-543ad3cecfec} - {d8d275cd-4d40-41f7-b143-940f938af139} + {77d99d16-2222-44bf-b235-a1a84f07e2e3} - {ae3eb3f3-a683-4aa1-aea3-3beaad26adff} + {8f88d45c-5407-40ae-97b7-28a86f112d3c} diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj index 3c7c64f54..9dd205068 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters index 90dd61095..cfc282fb2 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {04065258-bb01-4bf8-a85e-c3b76b1ff482} + {d32f2e09-5c74-4ad1-9a97-04c3d601bcf3} - {efa4fe13-ecb6-47f9-ae7e-ac4959f2f63a} + {3cc06e01-f970-4b36-9379-48c86f3e59f8} - {056577a3-4afd-4a6c-a7c1-8b076eb6282d} + {1d16113b-0c72-4f92-9b97-6c97cb7caea2} - {caf3dcd1-23f0-42b9-b59b-1931ae69c926} + {20f8f5a1-26a2-4c99-837f-eadcd43ba510} - {eb0f5df0-b4d2-4268-9118-b76db26ad64c} + {71b906be-a29b-4284-b156-21a553cc081d} - {f7744661-9e08-40e8-a3c6-62afbde52031} + {59d0ff53-88e6-4c54-8e2c-50616c89521f} - {ba81b6a4-f004-4c1a-ad97-da1c8308c9f6} + {b9f909f9-6460-4691-ba6e-baa6478f0228} - {fd758286-b8f6-4fea-8ead-e36ca0a2ece0} + {0d10b096-4151-44da-8cda-e5799398f3d1} - {4b8232c4-8448-41ae-ada2-79df848c1872} + {10c204d1-d61e-4276-805b-92b27ce11f47} - {7b54cd59-f273-4acc-993c-691b0c103ad8} + {aa2dbf2d-ca20-48d8-b1fa-7718d72c9de7} - {e05a2b91-3618-4186-820c-acf5c6dbdb11} + {aeebb789-0b58-46ba-9995-a5f2b1d1c527} - {1a818181-208e-491a-884d-cc41bd35f676} + {b812c453-c08d-40bb-bf1b-04bb24217a2f} - {70a8b28a-574a-48c8-9b9e-c3a80c1b83f5} + {6ff40d5e-3dad-4786-8293-08030e21fb53} - {8937229b-248f-4713-be44-a5a240981238} + {3bd5ee4d-96c2-42cb-90d2-438b78d353a9} - {16b495f4-1c06-4b1e-9401-0ffe498dc59b} + {39fc0286-6206-4637-90ff-6a2a2146fd5f} - {13de4b7b-b7ca-4c48-99d5-6b1a79408b1d} + {1106a826-639f-40f6-b50d-7d594333fdf3} - {83e5fccd-8597-42d0-b332-a218228357c7} + {9902e894-fcaa-4383-ae01-dd7a6073e7c2} diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj index a3cdffe52..093376df4 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters index 766fc59b1..8bc2ffaf8 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,55 +2,55 @@ - {d271502e-2967-495a-87c8-f95f64c1007e} + {9bc5fca0-f475-4034-9aec-18d41eac3098} - {18ea005f-f08f-4ae3-9dd9-b23e15fc86ca} + {08e72b0e-afdf-409a-a886-91c2d164b3f8} - {cef1aac7-2a44-4bd8-8374-f6428308c57c} + {f2626e08-ba7c-4471-a8d2-5c691053dcd1} - {27884581-bd04-41ba-9163-414101d11063} + {41ed4466-660a-4edf-b4c1-33df1c2ee90e} - {1ef2b730-3003-414a-a011-3270ff46e0a7} + {dd2f4a2a-07d1-4e0d-a954-44f7bc891746} - {002fde7c-357d-4877-a18f-be7165735f46} + {5b2b532c-1141-4a90-b2b5-edb4ac1eefd1} - {f7cefe33-c6ab-40c0-9175-2d1783a46cf8} + {a962af6f-5a18-4114-83a8-f6e037f5c37b} - {921954b6-3044-494f-8230-985eb2bde9e1} + {990502c6-03da-4e10-b6bc-0e2db9687c96} - {016ba4c1-b108-44a9-80bf-5f1ab5cd76e6} + {9252dd0a-a69a-45a6-92ab-d3e90b9f57d0} - {80c27895-6878-4e89-b0fd-858944779267} + {eca42bf8-f533-41b6-8458-a69605637b85} - {547198ae-c0a7-4d66-accd-777714d5ae4e} + {28cba7c4-dab7-4139-9958-0e92548a1aac} - {7c6829a1-45aa-450d-a427-2509c45f1f98} + {2eaa5c7d-9150-4632-bfb8-50b146e2e9be} - {095d91b3-c052-49d8-8ee6-7ad7fd7987b3} + {67d2af57-673b-469c-b65d-aaaa18c7b68c} - {389c5764-c5ca-4bef-a94a-01a5e4b84bfd} + {93a02bac-638d-40f9-8063-f0d358151476} - {b08e0953-7004-4eb5-bbb2-a938f96578df} + {7603fd0f-58fd-4c44-a62d-c8a49fdae121} - {e4295021-a722-4744-9b8b-0c227bdbe288} + {894cd63e-b38e-4640-ac2a-9c32ef4b2c37} - {d522d191-53db-49dc-9968-b27a30ecc9b8} + {2028d57b-3d54-41d7-beb5-ab662f914be5} diff --git a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj index bd6f0d4ce..6986fd44d 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters index 3b573907f..a3a423746 100644 --- a/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,55 +2,55 @@ - {13f67848-0b5e-48cb-80d9-8d74866802ad} + {4f3c68e7-99d7-40bc-a72c-3d2518ad9a1d} - {67e9da10-33c4-4d63-8812-a1976be945f1} + {fa9eb21d-bd88-4dea-8fd0-ffb710bc9183} - {1b5b22fa-4477-4959-9f14-64a21554ef71} + {c7377e15-60d1-4c07-86bd-575bc3aef277} - {bce983c1-6f78-4dde-b98e-830aa41cbb4a} + {d5f9b124-fbe8-49da-ad04-e213017e7895} - {2534fa78-3d7f-48c8-a8a3-fb17a08aaa5b} + {1b2d4015-2ede-4102-8916-9ef23d0b9b29} - {b01ce167-30fe-4fc2-a64c-e29990f267d3} + {2548bbde-8170-4d83-816f-c3e98c1acaff} - {31b00c9f-7e5d-4886-bcbd-8a43d7179cac} + {a7131d97-7e42-4d4b-8f38-f88213237e04} - {8a16e4f5-477d-47ff-b9ca-0a3d18f48c88} + {979f412d-3106-41b3-bfd3-bd04d7169ef2} - {cccf1429-ec9d-484f-b149-d0c27563a447} + {b0834c99-654f-4535-8d76-77983952cee1} - {ad325498-9e8a-407c-bc30-d55597f26efd} + {0048a785-a23c-426e-b8e7-23ac46c9658c} - {b4d3d935-a80d-47ed-90f2-cc969484a0dd} + {481c4485-1c33-41fc-b9d4-cec7220a7fd8} - {0ee866e6-9fe2-4eb9-a2b3-e99f1fda08dc} + {ca4d6aea-8b2f-4c2a-b37c-21dc1a388691} - {85629b31-a6c8-4d45-a0a9-19c33ed48f2c} + {1e7874fe-b1a4-4c5f-b730-bef15b37c005} - {6e757848-0d40-4d14-94da-306fb850a6a6} + {5abfa3ea-8298-4a39-8447-b8b16684dbc5} - {94b53021-04c7-4a61-a157-edcd71582120} + {63f3538b-a389-41f3-b3d8-172f2a6c8831} - {5737b3b0-2800-4383-aa0b-56a3e95da7a8} + {94dbaf0f-726a-465b-a178-89db8166d1ee} - {30d89cd9-ab52-4059-86c0-2a298dc61c07} + {fd36ab59-2b9d-4879-9f82-ccd80c8c3344} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj index ee062cdf8..0e41743bf 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters index 665ad3de4..954efbac3 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,55 +2,55 @@ - {8245e5ef-3ebe-4377-9d1f-51de32bdea8c} + {b9945c11-6297-4030-8f13-b4402c864640} - {a2be7860-e384-4a92-a5c3-ba2297fe7710} + {01b660c0-78a9-436d-a5f1-321a58e18600} - {cdc12fc3-61b5-4268-8f4a-3d32b2108638} + {4e868e62-6ff7-4d1d-84e6-421a574c4be2} - {dcbd24d6-f452-41f6-952f-685a24ebf7a4} + {d6e64117-ebc4-452b-998e-ec1f03914494} - {abde523b-1c61-4bce-a37a-885e507b5fab} + {032981e2-132c-4000-9a62-27f9aa47b0a0} - {af853821-aff9-4574-b99d-19b6e81183ae} + {0d2d3af5-4ea8-413c-8a06-132ba5ac1d61} - {107099da-4a97-43c6-bddc-bfa37c9e4bb7} + {c218f972-39d4-4c9c-ab55-855987978d5f} - {6fce4b9e-5908-4779-9137-a0ce1e725da0} + {0b634d17-22f8-4869-9ab0-285dc68fb7a9} - {f7a94db2-93f0-4b35-8e60-1d36de08f3ea} + {ae3be400-215f-42f6-9de0-fd9b85ca4ad8} - {66c9cd0b-9e93-4c41-aed8-28c00a6b8011} + {6d4ee19f-7509-4625-a601-ed8eefe8bab9} - {38d52f3d-0616-4961-9405-755e1f514fa1} + {9269c30f-4d05-4ba2-969a-5eff0f2d3439} - {cdd11b1b-5847-473f-b584-64809069acba} + {cb88d19f-a466-4964-99b7-bb32cbdd9f48} - {b107364d-db0e-4622-b2d9-bd345cf31bfc} + {103892ed-eb36-48f9-b81f-e532d7f61004} - {f2ef4b7a-7bf9-4978-8527-024988c6d4aa} + {e259318c-f385-41ae-86b0-6b758943f6dc} - {ea92d46b-7e3f-4af0-a528-7d559c6a6688} + {95dcd5ec-9e1f-456e-b0cd-c0178d4c91b5} - {1b308667-b7a9-4f89-80aa-78859ec5b004} + {7ec843ee-00fa-4ba1-80ac-fb22beafeba1} - {8711fc43-183c-44ef-9438-e8a828dc4140} + {28993ddf-9121-484a-a1a7-04e37b35fccc} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj index c8cee4879..848977c59 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,7 +148,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -179,7 +179,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -208,10 +208,10 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -240,10 +240,10 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -270,7 +270,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -301,7 +301,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters index 12bc21b8d..49f0bcd30 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,55 +2,55 @@ - {ee87cd0b-adb4-4825-a696-3b1a62c93091} + {112f9b54-459c-4178-9c40-270b1354ee3c} - {902368d8-2c21-40d1-ba4e-1b45b64782a8} + {1f7645a6-b259-4d7f-8142-a853cbb1fc5f} - {5c687ed4-da9f-46eb-96c3-270acc4e4c1d} + {ebf91459-98a1-45ee-b2db-9bc6ec75747a} - {ba8f271e-7ce0-4735-bfe6-678e65a6f319} + {ab96b602-0142-4e20-aa6d-35cb95b51e00} - {0dc3a725-2825-49cb-a3f6-9c381af832e9} + {e3438b6b-c938-4fd9-af17-89058766739d} - {e5719766-63b1-4e80-80c2-951d600e3d48} + {7bb8f2f7-6b08-4a64-b2a0-7518a108356d} - {9a404be7-0a86-4dc2-b93f-342d21a2bce0} + {6cf88cff-fae6-4415-a4f8-4129f4d47ef7} - {3968e954-f4ea-4681-b08c-dfc7dcab051a} + {97473376-e104-4ae8-9789-111cb4f3b805} - {94938e44-1045-4466-88ee-291c851036f5} + {b9f5744d-c270-43e7-adb7-b913de8bc2c3} - {d8de7234-99ec-4839-9e6a-f540a7f225e2} + {c4a12137-c041-45fa-96f8-737aa5cf0bbb} - {3f6682fc-182d-409d-8a35-abdebf8dcd9e} + {b6c66c25-c0c2-4abc-a3fc-29f4c86e36a4} - {93f440b8-7413-41c4-8fc3-f6d8afce4a59} + {a04e543b-f312-49d7-a55d-50df046cef87} - {36358012-d55c-40b2-bbd9-cacf5c016485} + {3f4e20da-3fa7-4203-998e-d557e71ed595} - {ab165f87-953f-4265-a309-6ca5e893c6a3} + {943e5c3d-3985-4f21-82d1-23f7db4c8f99} - {b60a4b14-f7ad-4499-a55c-072513bbf55f} + {a8e3fb7c-5807-43f2-ba6c-f9095b261248} - {fca37bc1-cb5e-4ad2-ab80-c960c38ccdc5} + {2ec4d109-3055-43ea-87a6-342347129d78} - {437fbeba-763a-409f-96d3-6c339b58098b} + {e3bf6dd9-71b0-458a-a65e-f54bd53ac192} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj index 80693894a..c4d3106bd 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters index 4aac1d79c..f7d16d48a 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,55 +2,55 @@ - {86cc2765-3a25-4c26-827f-023a85320f97} + {26229675-8ea7-4c4d-b041-a01851143daf} - {891a7ee2-abe8-4392-a34a-82e7759fb148} + {ba36b6ac-9642-4a80-a6ba-64e138495b0a} - {1cfa8df6-c6fd-4402-96c7-fc6daca5e4f3} + {bbc2d7f8-2f45-41e5-8e7e-1d8fdc500f34} - {2e660d9b-3af7-4641-90b7-daf55f586b87} + {77ca76de-087e-450a-bbb9-4704420727af} - {6abc86ad-a98c-4302-8c73-b3aad157a347} + {b716f1a3-736d-4287-be18-cb52cfd7caab} - {8a673009-c90b-446b-887d-d48abef53e6b} + {d375d9d2-cbe2-4350-9c25-c149839626f8} - {4c21540a-cce2-4cc8-9e82-af8e874144b6} + {0545efec-9767-44e9-a193-e341677778a7} - {00498017-da3a-4132-a1df-ae4b27391aab} + {e5e5cdf8-00e1-4986-9244-9374ccf12569} - {b694d7d7-3cf1-4849-8e06-377c6b993e9d} + {c75f3111-7850-428e-8d37-a7a30b5e3119} - {a8446b47-b0e7-4223-9dfc-b31f212e135a} + {a3823bea-9f7f-4c19-9b33-01cc13ff6b32} - {b443ae5e-33ba-4391-835c-53f56d310e4d} + {c2eab155-4ddb-4a81-824e-430e095c124e} - {c8134ef4-9c7d-4083-a0a6-d9fa61e26966} + {9c85c7a8-c010-4765-b6de-1936593c81e8} - {6364b804-e2fc-4ac2-8ddb-8632bd932918} + {dea52bda-a9c0-4196-a0b4-20f63f47f9c5} - {93d2c21f-6328-4bc4-af0e-c11286f996d9} + {cdda0806-5d54-4f57-8373-7719e14a3190} - {63c7731d-b309-430b-801f-c164815af94b} + {3364b2d6-8d9d-4b0a-bd42-555145527fb9} - {8ff84646-9e9b-404a-afe1-87555862655d} + {e2b82fb8-def5-4315-8331-e36f89b5e3f9} - {4b3b09f2-4d49-4dc9-a060-cf98fa92cba9} + {fa7c9218-2272-4849-96ae-dcf61a38314b} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj index 4497da30e..8ce1245a2 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters index 1e691fd03..1a4348c78 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,55 +2,55 @@ - {c5286a3c-6e7e-4dc3-96c1-2cc3b0b6a5bb} + {c186ebbf-fdde-4603-90c9-de5a9e6b329e} - {ac905c1a-f732-4d7b-b1b2-3e7fa329af9d} + {8c2e0c5e-8308-4222-bf77-2738b0472bd0} - {8c85391c-8a99-4755-b19d-07901f037f2e} + {483b84ed-d181-4cce-b805-140aed236dce} - {6398d93a-b8c6-4872-b9ba-8045bcbdd1b5} + {f3140030-e24f-435c-a2cf-32e130be102d} - {c75cac5a-977d-4860-a200-5a3af110a242} + {ba0e006a-0ef4-43f6-b102-95dc7ab97801} - {04727125-9535-4a8f-a2f7-cae3b7b29710} + {ef76edac-e2e8-4297-a7ca-e9239c9c6f02} - {0ec5d9f8-eba5-492e-9bd7-4eadd6d2b8e0} + {d9f4a958-23a8-4777-b389-057ef05229d5} - {f4771496-a10f-41b9-81f6-4103e5c3db7b} + {5445d616-a8a4-4626-acb5-e6d74108f766} - {66b34a7c-0cfe-4aa2-a73b-376ff5fe6138} + {03415f03-3d5e-42ff-aade-39164a870e11} - {045cb774-29f5-4dc4-838d-e30ca6e6a2e9} + {01e3c778-55d7-4676-bbcc-d63d9afb1d55} - {a58c6d3d-c989-4223-bbb7-ed3a524bcef9} + {5255794b-be03-4ee6-9bad-59a65cf291b2} - {29ecffc5-c4c4-4bfc-9143-f6815d667fdb} + {2f61784e-2d57-45f2-a38d-42cd7c574f02} - {015c7b3c-5809-4095-a99e-d74bf0fb10e1} + {6e9b4c50-54ea-4d16-914a-1e1b7b7d9e98} - {68fe61be-b2fb-4cf8-9c0a-cdc07241c9a3} + {e8d41fa6-d293-425b-b01f-ad1a8410f7f9} - {c3eaa8c9-cd55-470f-9b7c-e77f2c0fa08d} + {99c01b5e-fe32-46d8-8dcc-743279cff0b8} - {6fb72c7b-758c-44b1-956b-8f376bde3832} + {b128c847-6b2a-44f0-b137-ac1fa161b51e} - {ca1aa84c-c91e-4315-b026-0d42231e0c52} + {9eae8cf6-5813-4b3e-a273-ef0fef9c8b15} diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj index 091ef03e3..72b2be7c5 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,7 +142,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -173,7 +173,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -202,7 +202,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -233,7 +233,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -262,7 +262,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -293,7 +293,7 @@ Default - ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters index 4ff8ea804..659477431 100644 --- a/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/NetSSL_Win/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,55 +2,55 @@ - {547ee0b3-619b-41ea-86b0-e90a71bf9126} + {846d3bbe-6d39-43d2-91c4-c0846e2b6724} - {e0571cd7-e12c-40d7-b21b-ecca3da81d4b} + {35e16dfe-93ac-4779-ac8d-8e2a8823cea2} - {34d1c4b2-d0b8-49fc-a7af-09acfdc9a0b7} + {c2505cda-2201-4d21-8ab1-55b3949f8e7f} - {48a1cba4-5264-4e36-8ac4-b00457a32e50} + {7c898ae6-e851-484c-85e2-d13f804b87b0} - {f000a6bf-4414-4bbf-9f07-989c957a12f7} + {9300c96a-69a4-4c73-9df1-ad3854f79ced} - {58b8387d-c112-4bc9-92c4-ba71577f0c3c} + {c67d5253-97bf-4982-ad85-079d62d41307} - {6a3c90e9-3f53-4dc3-9913-3539679aa33d} + {9629ea15-5364-4d06-823f-af20350173da} - {690d4b2a-2fd7-4bcc-8483-0e5e7bfa58a5} + {158b624a-fb70-4483-ada3-9e4e760db930} - {73a5abd6-2cc7-474e-b14a-26dd233a2f32} + {b64deb6c-bc0f-4089-948f-5e8052d9c1eb} - {078ec701-0d2f-4234-aead-1fac5805fe9f} + {e16fdb57-f840-4fdf-9e32-e62337c6be32} - {257ea44b-973d-494d-a55b-369eb90105bb} + {e20c9fbe-7a7d-4d43-b38d-159b54e8d9dd} - {b144c0ab-5e66-4410-b9b2-c3cf56bca38c} + {1bb718c5-c50a-4e76-9a67-6b75a77a269a} - {4005802b-5d3e-446b-8b33-fafac9597033} + {9c5439f1-e584-445d-b976-c836fc3fe9b6} - {44d156a9-85a3-4198-8c78-0c90e8189620} + {7f3fa20a-5188-450b-93e0-3eba0f5c3c9f} - {fce53c44-c7fd-4eb7-a0ee-f1c86abf5c47} + {47ff3187-9c8b-4b96-93e5-739c3442cf1f} - {1851043a-9e7e-4135-941d-5d4f13b6200a} + {b4841a9c-a2be-48cf-b597-73f7155a6a3f} - {e9808e11-6356-40ac-9605-68164e4699bf} + {f9ffa134-2124-458f-bef2-1a5417360eec} diff --git a/PDF/PDF_vs100.vcxproj b/PDF/PDF_vs100.vcxproj index 3fb7688af..bf75183cb 100644 --- a/PDF/PDF_vs100.vcxproj +++ b/PDF/PDF_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\PDF\$(Configuration)\ PocoPDFd - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoPDFmtd.lib + %(AdditionalDependencies) + ..\lib\PocoPDFMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoPDFmt.lib + %(AdditionalDependencies) + ..\lib\PocoPDFMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoPDFmdd.pdb + ..\lib\PocoPDFMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoPDFmdd.lib + %(AdditionalDependencies) + ..\lib\PocoPDFMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoPDFmd.lib + ..\lib\PocoPDFMD.lib diff --git a/PDF/PDF_vs100.vcxproj.filters b/PDF/PDF_vs100.vcxproj.filters index 85014d879..dd532ab2a 100644 --- a/PDF/PDF_vs100.vcxproj.filters +++ b/PDF/PDF_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {7e8410fd-a04f-43ad-b50c-201473523342} + {ded78258-dc45-43e0-b3c6-f47b1379268c} - {b591dbe3-097b-4093-bacd-d693013251d8} + {0d44a486-2ec2-4478-9fe9-4abb158363f3} - {2db23698-61fb-456d-b5a4-92f451b67955} + {4128caab-2fbe-479b-bc15-dcba0e749cee} - {d63e732a-4d21-4541-a262-0d674e355eff} + {6fb229a9-af03-4aed-aaca-93c8cecd16db} - {2b47647d-2d6b-4f97-b43f-fd715668286f} + {0c21f2e3-13d3-4ae2-ac00-01df086d035c} - {6fa43945-15d0-4587-97cc-4e878d89d564} + {a469b147-61cf-4753-8ca7-f164f1d38225} - {98d8cb4c-7587-4e1d-940d-178339f59f72} + {1dc1b801-43cc-4236-9870-db44d31e9bc6} - {48bb4826-f63d-4973-b146-0e01d4af848a} + {72f9dd29-a4cb-4b09-824b-5d94f11f0368} - {cbb34de7-880d-4f81-90e8-569c4ed46db5} + {a23ff6a0-d3fb-44a0-a545-546f51b86b9c} - {1e3934ea-f28a-4500-aec3-5ed4b1e41e7c} + {f6327843-3890-4c9b-a645-640125071c42} - {9912853f-2274-4381-8af4-22f1b482124d} + {dd78ddb2-9a80-43cf-bfd4-a3f2667f34d1} - {571ede50-dca2-4437-a868-24a61e4e88cd} + {5871dbc2-785d-4f5c-a55d-eff672caa036} diff --git a/PDF/PDF_vs110.vcxproj b/PDF/PDF_vs110.vcxproj index b2d757c2c..61f648837 100644 --- a/PDF/PDF_vs110.vcxproj +++ b/PDF/PDF_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoPDFd - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoPDFmtd.lib + ..\lib\PocoPDFMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoPDFmt.lib + ..\lib\PocoPDFMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoPDFmdd.pdb + ..\lib\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoPDFmdd.lib + ..\lib\PocoPDFMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoPDFmd.lib + ..\lib\PocoPDFMD.lib diff --git a/PDF/PDF_vs110.vcxproj.filters b/PDF/PDF_vs110.vcxproj.filters index 5d2a328ad..95df46b8c 100644 --- a/PDF/PDF_vs110.vcxproj.filters +++ b/PDF/PDF_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {5882ae88-1291-4f38-aac6-778641eec44a} + {96fb42bf-0408-4221-93cb-36db966b2d5f} - {95d1cd9d-9511-4833-8cb1-373b4b99ef37} + {9e513ec6-2bda-4083-8121-e8cfb8282098} - {b20f59ec-84ca-4135-8832-1aa56bc43bb2} + {3e25ffe3-b81b-4b76-a050-2cef076e5643} - {87e71ae2-6bcb-44c1-a5d2-44b87d9ba8fe} + {527b480f-af2e-48ac-be4d-293d2ad5ca92} - {f77d544a-210b-4030-bf0f-30937a662dcd} + {3b87c66d-78c8-48a0-a573-7d2b97eae22d} - {d3c86e66-4c21-4345-9b31-b6f631bc4e37} + {f3587a4b-58c8-4407-a0de-dc2548c5ee22} - {26a1aa3d-c8fb-460a-b9b6-4ea59abb4739} + {bbcf54a1-0ec3-4afb-9bb9-071476566a9a} - {fe12c2f9-61cb-498a-b8a3-f3dde724c379} + {22146537-b05d-4b5a-a6fc-bbccc5f41dfc} - {be9e43c2-691a-41a2-b381-3c0c2777a029} + {921e3aab-2bfd-4d84-8485-ad6891cbdced} - {d7bf5a89-f6fb-4c42-b596-7aae33c6fc7e} + {e567e64c-95f3-44ee-918a-b2855a788bbd} - {3c15c8d6-14e1-4d30-8b1e-f11c04be45e3} + {db158846-b08e-40a0-a7c8-5420a3ef2c41} - {9f4bbda1-e915-409f-9cc9-2c20d5e2db7b} + {c6b31410-7860-4178-8708-7bf8f40cd36e} diff --git a/PDF/PDF_vs120.vcxproj b/PDF/PDF_vs120.vcxproj index 67db29054..2005db31c 100644 --- a/PDF/PDF_vs120.vcxproj +++ b/PDF/PDF_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoPDFd - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoPDFmtd.lib + ..\lib\PocoPDFMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoPDFmt.lib + ..\lib\PocoPDFMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoPDFmdd.pdb + ..\lib\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoPDFmdd.lib + ..\lib\PocoPDFMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoPDFmd.lib + ..\lib\PocoPDFMD.lib diff --git a/PDF/PDF_vs120.vcxproj.filters b/PDF/PDF_vs120.vcxproj.filters index 96a990689..f86ff64ad 100644 --- a/PDF/PDF_vs120.vcxproj.filters +++ b/PDF/PDF_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {0107f519-9abe-4e8e-bc7d-34b46cef05d8} + {cc02ef3a-7a40-48b1-a416-6d5f27fefa0f} - {f2a14b2d-9c3f-41de-889a-6e1f9a669be1} + {306c534d-2954-47d0-9904-075517b971d1} - {e048c51c-14e6-4e6f-a753-a4b76255b2c1} + {89110bb6-3345-47dd-bb7f-d44202cd3895} - {45ba50a0-5128-4305-bfb3-2e3a196adc0e} + {add7f584-a3b0-4457-b550-c4b46827fecb} - {e8ab54b9-57cc-4aa6-a935-650f5603a357} + {413e5df5-b86c-462e-8ac0-d3d84f015c87} - {d5de156e-28af-450b-aa0a-7b38581edf82} + {be3c9361-b614-4d94-ad6f-22ca511c9b02} - {e7cf64ab-4eef-45aa-a535-7d7f0e2b156f} + {d7d04a45-343b-4de5-a3c1-cb95757cb09b} - {1a65febe-d798-45c2-9a97-ee09b0f675a6} + {6b9f8321-0a0f-451c-80fc-b23d359e1814} - {d3860fe5-7681-4e9b-b986-df70629f770c} + {2868e383-e671-489b-ba05-17313d1b76f7} - {33323087-35ae-49ab-8ce3-de366e353ae2} + {5e12b9aa-5aa6-4e17-b022-4a3577834452} - {82f742b0-059b-4751-811c-e2e10b9fe57c} + {970f0d38-fc4f-4061-889d-f82e97d70058} - {7c1ffcf8-58a2-4e02-8364-ae5a5af24359} + {6e4ab32c-c95f-491f-95f1-e9ba3f57f823} diff --git a/PDF/PDF_vs140.vcxproj b/PDF/PDF_vs140.vcxproj index 593d1c499..b505f6aaf 100644 --- a/PDF/PDF_vs140.vcxproj +++ b/PDF/PDF_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoPDFd - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoPDFmtd.lib + ..\lib\PocoPDFMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoPDFmt.lib + ..\lib\PocoPDFMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoPDFmdd.pdb + ..\lib\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoPDFmdd.lib + ..\lib\PocoPDFMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoPDFmd.lib + ..\lib\PocoPDFMD.lib diff --git a/PDF/PDF_vs140.vcxproj.filters b/PDF/PDF_vs140.vcxproj.filters index 46b7c765f..94a8bfd9f 100644 --- a/PDF/PDF_vs140.vcxproj.filters +++ b/PDF/PDF_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {12ea3f16-ea38-4e06-9540-210f5bd21f28} + {36802730-8f38-4344-bd9f-59e9a9cdc4d1} - {4cc57f50-db4f-40c9-bb88-d0d1216fb502} + {3f05a2d0-7b44-4ec1-88ad-e78ce14922c6} - {d5979ab5-f933-45e7-8fcd-accfca63f7e8} + {f108149f-7b43-40b4-abdb-432da0ff66d0} - {6badd15e-923d-448a-abb0-b93e3da1d15d} + {d4cdf224-ec26-4c00-b99d-0c2e9cb9e128} - {601c8548-fa0f-41dd-b6f9-11a7ae8e0291} + {19ab7c7c-39d3-44f4-bcb4-6f14c25fb998} - {0422c12f-20e2-4175-8f4a-6391d67db7a9} + {b85d0faf-7a30-4d64-aa2b-7397774bedba} - {ae16ea28-a3d4-463c-ad80-88fea0f3aeb8} + {a56f2a1f-3b99-48d6-9aa1-ed5cabd339ef} - {129c3a89-449e-4a6f-85d4-a2f5b7ac0685} + {95ed42fd-9a51-42be-8f1a-13cacde609f3} - {6540929a-da09-4118-9a53-b031b1bf89c6} + {e82d3fd4-b190-4cb0-825f-8640e3a60dc7} - {b01a68c7-80b6-4766-a9de-8549054f61fc} + {93977a65-dce9-4932-a018-3534b5b09b85} - {a61824b9-830f-4f35-a8d6-e8f16d18de41} + {48b55b6f-cbe5-4115-86fe-4f5ec2ea0da8} - {ca64d446-1355-442d-8939-a3f2de0a3671} + {96a9204c-f8b9-4f1c-bb3a-8161ef136e54} diff --git a/PDF/PDF_vs150.vcxproj b/PDF/PDF_vs150.vcxproj index 67203833a..9c9841095 100644 --- a/PDF/PDF_vs150.vcxproj +++ b/PDF/PDF_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoPDFd - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoPDFmtd.lib + ..\lib\PocoPDFMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoPDFmt.lib + ..\lib\PocoPDFMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoPDFmdd.pdb + ..\lib\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoPDFmdd.lib + ..\lib\PocoPDFMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoPDFmd.lib + ..\lib\PocoPDFMD.lib diff --git a/PDF/PDF_vs150.vcxproj.filters b/PDF/PDF_vs150.vcxproj.filters index d1e644784..c8907a725 100644 --- a/PDF/PDF_vs150.vcxproj.filters +++ b/PDF/PDF_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {fe436334-a329-4b98-9995-3c04e1a70539} + {9f2fb314-c4b1-4fd9-8022-54d64e4eb6a0} - {4fd39783-8b65-457e-bae1-34158f581f2e} + {b5b43303-0268-46c8-aa96-2cbe1a553146} - {097aa04b-a9b1-48bc-b344-458c8dbf8155} + {4fdbe7d6-754f-419b-a39d-3ecb5f691acc} - {1fec6760-f5b1-42e8-b748-8f6d15276d0f} + {95a0d64a-e9c9-4b91-bdc0-e7eb97253e09} - {87a36c3c-1e22-47d2-a956-9fcbfa466c54} + {875ed3e2-a7b8-4a94-9164-789059f207b3} - {18182097-8ff1-4c74-8071-affbe0efb76d} + {064916a9-4815-45ba-905e-a386ce56576a} - {cee456ef-ba0f-4f63-a5bc-8096d3fae06a} + {bfa899de-0a58-44b3-a49d-42226a9b9218} - {69c12041-0c3b-4df7-b16a-ab4f25845520} + {fa629946-e650-4842-b0c8-4080178e5084} - {c8ac937a-c184-4e83-8eeb-943057cc571e} + {f46f84b2-a62b-4688-b20d-a86b496f3dd1} - {62067444-b8d2-44f5-86d5-e4f267036fa8} + {2ae80cb2-4e5e-4b60-9aa8-10bcc491b141} - {b79c3054-53e6-4d95-b675-d98a4db53a6e} + {eaec4497-98f5-415f-9971-e0fe4086eebf} - {2ec2bcc8-8305-4b20-bee9-fe23ee522286} + {d3b3d50d-f25f-4e1d-9e4f-b0163162e934} diff --git a/PDF/PDF_vs90.vcproj b/PDF/PDF_vs90.vcproj index e07fd3ff0..30a7028fa 100644 --- a/PDF/PDF_vs90.vcproj +++ b/PDF/PDF_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoPDFMTd.lib"/> + OutputFile="..\lib\PocoPDFMT.lib"/> + OutputFile="..\lib\PocoPDFMDd.lib"/> + OutputFile="..\lib\PocoPDFMD.lib"/> ..\lib64\ obj64\PDF\$(Configuration)\ PocoPDF64d - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF64 - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoPDFmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoPDFMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoPDFmt.lib + %(AdditionalDependencies) + ..\lib64\PocoPDFMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoPDFmdd.pdb + ..\lib64\PocoPDFMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoPDFmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoPDFMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoPDFmd.lib + %(AdditionalDependencies) + ..\lib64\PocoPDFMD.lib + MachineX64 diff --git a/PDF/PDF_x64_vs100.vcxproj.filters b/PDF/PDF_x64_vs100.vcxproj.filters index 77ec596dd..575d98090 100644 --- a/PDF/PDF_x64_vs100.vcxproj.filters +++ b/PDF/PDF_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {5be28c8b-8363-428c-810c-187ec544b2b7} + {cedc3bb5-b89b-4d2c-9050-924d7f2d70aa} - {87686e8e-3861-4fe9-bcae-92399b11c5b2} + {0f78fa20-9ba9-4cfe-a67d-fadeb7061830} - {65402e92-e177-4497-a822-35c8463b0e31} + {cc12d731-023b-4038-9803-6b39bcaf1d8f} - {9a550a23-6bb5-46b5-af7f-fa51bd3bae54} + {4e61147b-7f70-4e6e-b6c2-ea59b7178457} - {32cde1d5-6c62-426c-8df9-2080da4c3106} + {352e2bea-fa4e-419e-a470-310f0f65945d} - {68b79b9c-281e-4925-ae31-eeb388e6529c} + {dd26d4e7-f611-4529-808f-9c5cb7b75dc0} - {f48c1582-64e4-4a79-89cd-32227d144610} + {f3c47ddc-1235-436e-a97c-d674b10c811d} - {37a2f8c7-675f-4227-b304-6a46208a3f88} + {2d626d5f-6386-4c41-8491-dec228e0311f} - {e6bb9955-796d-4b52-9729-873058e30dea} + {98de6e39-6aa2-434e-a15f-42935f233432} - {e4ff5321-4ef2-4e77-99e9-da9f0335e873} + {d394396a-f978-4ab5-b735-c88954ea8931} - {58aa62c3-8545-44b4-b015-8985b4bd7583} + {454ddd09-86a8-4b9e-9a98-1867d4774d38} - {4ffbb673-5476-41b0-b60d-509542df609f} + {125d2ece-63fd-4be0-a368-86f2c2953455} diff --git a/PDF/PDF_x64_vs110.vcxproj b/PDF/PDF_x64_vs110.vcxproj index 6011cd2ab..65f92eb29 100644 --- a/PDF/PDF_x64_vs110.vcxproj +++ b/PDF/PDF_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoPDF64d - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF64 - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoPDFmtd.lib + ..\lib64\PocoPDFMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoPDFmt.lib + ..\lib64\PocoPDFMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoPDFmdd.pdb + ..\lib64\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoPDFmdd.lib + ..\lib64\PocoPDFMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoPDFmd.lib + ..\lib64\PocoPDFMD.lib + MachineX64 diff --git a/PDF/PDF_x64_vs110.vcxproj.filters b/PDF/PDF_x64_vs110.vcxproj.filters index 694842821..0d90df09a 100644 --- a/PDF/PDF_x64_vs110.vcxproj.filters +++ b/PDF/PDF_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {c48064dc-b0d6-478f-8e5e-b6c649fc64b5} + {d47cc7c1-7318-41c2-98f7-77f8c57cf7bf} - {e63a271d-713b-48c1-bc7f-132784929ffe} + {b614b56c-7d47-4bd4-ba95-fede2e0a6960} - {ba2862e1-f2cb-4b76-8a77-373916b48450} + {41c63ac1-443e-49fe-bee7-c410e7f733f1} - {987f0e0a-2089-4b3f-b2d4-163b344c4ecc} + {5f9fa76e-376a-4db2-9f98-91dda5a6d663} - {4a6ea6ad-775d-4b60-8a1f-cc05b2f68ba9} + {3c714492-eaa0-435e-8b46-c6bbd35e6d12} - {9669a3f0-0606-4422-b463-9f45cc125a9c} + {07b5aca6-9a07-4590-afc4-9a3b94544db2} - {f4292e0b-7333-4930-a9c7-bdb79d9cb55d} + {670aeb18-eab3-48b0-bef7-9d715ef46ee0} - {7a90c4eb-7444-4a16-ade8-dafe0dc2c89c} + {da9bd669-1581-482b-b17e-3d60a7e842ae} - {5dd0d3b4-6288-4621-a338-7f3c22512016} + {f0625455-cec2-43a8-a386-403f3de21bc0} - {a9846458-a45a-4793-b4b7-5eda88f2949b} + {4fde2d48-7918-45f2-b77d-d3f845db6fdc} - {97c6e062-db4a-441a-b34b-eed5d6998a48} + {599158b0-7db7-4652-bbe5-a767ddf0b782} - {a386404f-e26a-4b89-a75f-c50592e5db67} + {d776d3ee-1eca-4e62-829a-87c52722e0cd} diff --git a/PDF/PDF_x64_vs120.vcxproj b/PDF/PDF_x64_vs120.vcxproj index 65e86c8a8..271bf1714 100644 --- a/PDF/PDF_x64_vs120.vcxproj +++ b/PDF/PDF_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoPDF64d - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF64 - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoPDFmtd.lib + ..\lib64\PocoPDFMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoPDFmt.lib + ..\lib64\PocoPDFMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoPDFmdd.pdb + ..\lib64\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoPDFmdd.lib + ..\lib64\PocoPDFMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoPDFmd.lib + ..\lib64\PocoPDFMD.lib + MachineX64 diff --git a/PDF/PDF_x64_vs120.vcxproj.filters b/PDF/PDF_x64_vs120.vcxproj.filters index 7ea48707b..fccc061ce 100644 --- a/PDF/PDF_x64_vs120.vcxproj.filters +++ b/PDF/PDF_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {d4cdcd15-c9bb-48d9-b30b-87e77c357229} + {468361f8-efdb-4690-9956-29aaaba42c8f} - {05800818-cb03-47c1-a315-b42f1fe611b6} + {4e550fe0-cb12-45ce-bb6f-680b3cc017c8} - {3a7a71e2-1712-426b-8a14-eb7651189785} + {8b2ae756-bfa4-4311-9f49-b1c74e50f514} - {471846b6-517f-45af-a952-9c7e25433171} + {48d8979f-d443-4494-af2a-cf3e953204f3} - {d401f890-a1ff-4bee-b9b2-3580cdb5bff8} + {e09101cc-2eff-43d4-a1b7-d8613f1344e6} - {db9e1711-acb5-4517-bdc8-1d5d779f59e3} + {39970082-982f-4487-ab25-964027a144f3} - {4bf7a8bb-34b8-4af9-a1dc-7e4c9910b3e7} + {a15b2fa8-8615-4f25-b498-41879266359d} - {07315d10-a5b6-448f-b108-f6774bbaefe0} + {a1867f83-327c-4bd6-9a43-0829c1958015} - {42e8e38e-b5db-41e6-ae2b-19073763c155} + {158d8a7c-6f16-420f-acae-c6800ac66a43} - {eb7e62ea-a443-40f7-8e86-b0b6336a4e20} + {70aa93e1-7ba7-45c3-abfd-8c0adc619580} - {bce04ff6-3a5c-4657-85ec-da34c0ac7659} + {5a60a856-2477-42df-8384-5773784a83c1} - {b18de6dd-df64-43f4-84f0-cf6f309776b0} + {e3f71513-8992-495b-974d-e8fcf5a4f227} diff --git a/PDF/PDF_x64_vs140.vcxproj b/PDF/PDF_x64_vs140.vcxproj index 768573626..f0c6a7642 100644 --- a/PDF/PDF_x64_vs140.vcxproj +++ b/PDF/PDF_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoPDF64d - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF64 - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoPDFmtd.lib + ..\lib64\PocoPDFMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoPDFmt.lib + ..\lib64\PocoPDFMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoPDFmdd.pdb + ..\lib64\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoPDFmdd.lib + ..\lib64\PocoPDFMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoPDFmd.lib + ..\lib64\PocoPDFMD.lib + MachineX64 diff --git a/PDF/PDF_x64_vs140.vcxproj.filters b/PDF/PDF_x64_vs140.vcxproj.filters index a4aae1428..44aa83125 100644 --- a/PDF/PDF_x64_vs140.vcxproj.filters +++ b/PDF/PDF_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {bccdfffa-3af7-4ec3-a1b2-31d304c94bb7} + {cce9e4ae-c747-4200-84f1-d2a0f2c27e19} - {1eb134eb-bc99-4776-9679-8260dcd3b1c8} + {fa74066f-74d9-4e1e-82b3-ae62291381ee} - {96639199-df08-4ce0-b57b-5e46347b7127} + {4f28ce85-0796-42d3-ac34-a798fdd8734f} - {fb7643e9-a8b1-48c5-9696-e7fb17f9b610} + {9743ed0d-9639-49fe-9a9a-c7f74bda4fe5} - {70efc76c-2197-4ef8-9db1-b9057707b5c2} + {4f0e404a-0a9a-470b-9a84-1108def4713b} - {1ab3c33b-dd42-403d-98a7-36deffc471f1} + {a6fba12b-3018-4ea4-b12c-1e83b6c9d908} - {c0ae236b-43b6-44a5-ad9b-99530e35fa63} + {8a4ebd31-57a0-4f21-a16a-68e4d2e411aa} - {194cb8ca-bb7a-4f86-b472-b5e049c15121} + {1e7976dc-8bbc-4a5b-8c6e-3cb621c591b1} - {7987766a-fcfc-4efd-bc77-e7095ba135a4} + {4441268e-8428-4a2e-8db1-23307d3eab56} - {22fb4da4-448b-427f-8940-efe071575a00} + {09a09d14-f46a-4a86-a101-113219171e41} - {ff88b3db-7265-43b4-9b7a-c9f9af9858cc} + {72e31f00-c98f-41bf-9999-7405279e163f} - {03d499d7-66a6-45ba-9a1d-d342e2de445b} + {b5886c3c-3f67-4c54-bd94-423d606aa642} diff --git a/PDF/PDF_x64_vs150.vcxproj b/PDF/PDF_x64_vs150.vcxproj index 7757ac9cd..46dd69149 100644 --- a/PDF/PDF_x64_vs150.vcxproj +++ b/PDF/PDF_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoPDF64d - PocoPDFmdd - PocoPDFmtd + PocoPDFMDd + PocoPDFMTd PocoPDF64 - PocoPDFmd - PocoPDFmt + PocoPDFMD + PocoPDFMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoPDFmtd.lib + ..\lib64\PocoPDFMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoPDFmt.lib + ..\lib64\PocoPDFMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoPDFmdd.pdb + ..\lib64\PocoPDFMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoPDFmdd.lib + ..\lib64\PocoPDFMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoPDFmd.lib + ..\lib64\PocoPDFMD.lib + MachineX64 diff --git a/PDF/PDF_x64_vs150.vcxproj.filters b/PDF/PDF_x64_vs150.vcxproj.filters index 28f4d0aa4..ac8126708 100644 --- a/PDF/PDF_x64_vs150.vcxproj.filters +++ b/PDF/PDF_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {bfabfa01-1db2-41ee-b006-df902789f8c9} + {9f357c53-b979-4dc3-a573-d04611559d62} - {13148f7d-40ee-448d-a48e-5ec236685472} + {b4a9725a-9c6b-4cb5-a1fa-3949e33e5353} - {97353a5b-3cab-4ad3-9696-7f98636dd0e5} + {c4b8d8fe-4912-4ba7-95ee-0b8a341dddc5} - {f850433c-1b02-42bc-8f75-fa0277a50562} + {6a922617-df6c-4d90-86bb-f9311a754ee3} - {ba5fe8d1-4c37-45d9-a7fb-70dba29ff539} + {69389a55-7f71-40bc-bc82-c5d68242d241} - {4d0589f4-0b94-4327-9f6e-466d99237011} + {5948db26-7838-4565-91d1-86df14b7eda7} - {3aabb6d0-8d4a-4104-b3d7-dfef21515128} + {627f2d15-06a3-4ea1-9d3a-bf5245b79472} - {fe7f6ab5-21ed-42a5-a25f-63d324253569} + {1e5330a2-05e3-4cda-99ec-6b4281c45a36} - {4b4038d0-e4c0-4539-bc27-86638d2a8d40} + {e8e3eced-7173-4dc5-b086-4e2b4ac7551f} - {f2c6d7c4-2abf-4c82-9fe9-7d28b6c29a89} + {523240f5-1f1a-4ed4-aa3a-36c188cb2fda} - {68edfbd3-0a63-4361-81e9-4b3da7623594} + {b28d8e14-745e-478f-b85c-4402cef8fc65} - {7d5c87a8-a747-405e-87bd-c7084759063d} + {bfeb410d-1e8f-4226-aaf6-9a628dac3320} diff --git a/PDF/PDF_x64_vs90.vcproj b/PDF/PDF_x64_vs90.vcproj index d00ad03c0..1491a74bb 100644 --- a/PDF/PDF_x64_vs90.vcproj +++ b/PDF/PDF_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoPDFmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoPDFMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/PDF/testsuite/TestSuite.progen b/PDF/testsuite/TestSuite.progen index d423f4325..6b52ba0a3 100644 --- a/PDF/testsuite/TestSuite.progen +++ b/PDF/testsuite/TestSuite.progen @@ -7,3 +7,4 @@ vc.project.platforms = Win32, x64 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\Util\\include +vc.project.linker.dependencies = iphlpapi.lib diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj b/PDF/testsuite/TestSuite_vs100.vcxproj index 9c7bc0a38..fe11c8e9d 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj +++ b/PDF/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_vs100.vcxproj.filters index 958a032b6..0b044bf93 100644 --- a/PDF/testsuite/TestSuite_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {1714e2ce-0a32-45f1-a162-839e4b7a07ae} + {1294df3a-7d3f-4532-a436-4f8f0ac3a666} - {4f778548-f1cb-4286-9dca-4c02bb6c90ac} + {f38010a0-59c6-4f27-87a0-57d24902fb13} - {6fbd3312-51db-43b8-8424-3110529c36d8} + {d51a8c1c-3446-479d-86ca-34b1edcbf44c} - {919316d8-5ef8-4f43-8882-1d7681c33468} + {bc8aec72-a596-45d5-84f3-99c14ddb58f8} - {26cf3275-46ce-4c24-9fb8-27ed3b46d621} + {85693cd1-7301-4c97-aa34-59771dcdbe83} - {d2c5ad1f-9730-4c6a-8055-5e5746995a6b} + {95299035-8026-47fa-b23a-e1f718c3241a} - {e9363089-5742-4cb4-ae48-012ab357265a} + {5a7b955d-fc13-4f97-ab4b-aedab760b4f8} - {dccbae3d-6615-4ec1-83c2-d56eeeb7655f} + {e89b6f78-3ae9-4d41-a7fa-06516ab1ed1c} diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj b/PDF/testsuite/TestSuite_vs110.vcxproj index 92811737d..01b4cc0e0 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_vs110.vcxproj.filters index 89c3ca96d..e9cf7e7cc 100644 --- a/PDF/testsuite/TestSuite_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {e8768912-6ce1-4909-81cc-af707cf23b8f} + {1fb8c78c-26c1-4b2c-857a-a0dc2db2d5f9} - {c10a2aa3-b7f5-4744-be72-fa11cd7a9c1c} + {8e021ccf-39ff-46d8-99db-a1ad84a175a1} - {df561f84-5dc7-4ae5-beab-22e48efa6062} + {d876fe06-c5b8-4556-856b-f6742217aac9} - {ad28a23c-e477-47ea-a494-556310294a55} + {668d95a8-9d6c-48e4-af7a-f52af6c205b4} - {2f5050e3-fafb-457a-9f24-ee59032cf0c8} + {aab02609-8980-4d75-a461-a20e008bbf32} - {f5c1e17b-c6fa-4e8b-a42a-2898df63bc6c} + {ce6d450f-f409-448f-a5d2-33167e98081a} - {07d245f1-24cc-4fed-8d86-80e58d042080} + {20f3f9b3-2661-424e-8c98-ca831a0221a0} - {cccb3ce1-f27a-4a39-9043-6c45da5958bb} + {ef1eb621-053a-462c-babb-b7be8c69d41d} diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj b/PDF/testsuite/TestSuite_vs120.vcxproj index 00a668d6f..8ca127873 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_vs120.vcxproj.filters index d72304dc6..ae0180a12 100644 --- a/PDF/testsuite/TestSuite_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {13d9ccda-d0d6-4762-9b33-48054644dc1a} + {bc3c7860-f259-4e18-a65b-240a46057165} - {93f6c1a4-2730-48b6-b597-3e0b025db117} + {255f9628-2848-484d-aa74-4e3e702ee539} - {de999fdb-9df8-4494-be33-e2bb7a39b080} + {030e8b2c-89af-49c5-95a6-09b8dda26ce0} - {c56e68cf-db52-4fe4-baf9-2bc34e8baaa3} + {9b180b13-a449-4ec6-ab50-9b2af7a1456f} - {5cf79902-9cb8-41fe-9ac0-fbba0f8b0037} + {80620750-5d53-40f7-901b-c9f35bf8ea7b} - {9d127008-d0d5-4f3b-b9a6-bada3d478f1b} + {bef07151-60ad-40d7-b516-b244a9cc830b} - {edafff50-78af-4cab-a05b-25afc05a2d14} + {3b081921-422c-4c07-821d-3385a1985cdb} - {1fe92f98-70e0-4674-b62c-93dd5deaf1de} + {a0d506f4-3b40-4228-95e9-bc6a51f155c7} diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj b/PDF/testsuite/TestSuite_vs140.vcxproj index 7488962bf..dd1d624fc 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_vs140.vcxproj.filters index 3f5b3e93d..01ad0bb16 100644 --- a/PDF/testsuite/TestSuite_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {3834f5c2-40f6-4395-a1ea-ed72a58f83af} + {4e91e88d-4cbb-40c0-8d8d-9049f276156e} - {57f00ead-fd28-4e52-8371-d0a499a263c8} + {c2f91ba2-24c5-4408-bf8a-e493a0db8e1e} - {696844d4-98da-458f-8b0f-46ba66bade27} + {814fd664-d0e2-499a-ae15-95de06df7774} - {90031bca-a81d-4c53-9fca-f6931d9db42f} + {213f534b-124c-4d9b-943d-6c82d395ce02} - {8d5da3eb-f0d7-4014-b461-ba3d5a22201e} + {d6c317d9-7233-4b8d-9ed7-0f5b63a77015} - {b7c0e865-b198-43f8-8915-52449277cb8e} + {1a8c1224-f814-48eb-a38a-0f1f3dae68ea} - {185e38aa-7b79-422b-b458-796ca3f180bf} + {93ad3cac-d93c-41f5-beb1-cd1284f9eb01} - {f7118981-8890-469a-9ebb-6c398a9cdbd1} + {e3c663c3-7049-438e-b955-ff77fd2b252c} diff --git a/PDF/testsuite/TestSuite_vs150.vcxproj b/PDF/testsuite/TestSuite_vs150.vcxproj index ae3dc6cc8..7e0639d90 100644 --- a/PDF/testsuite/TestSuite_vs150.vcxproj +++ b/PDF/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_vs150.vcxproj.filters b/PDF/testsuite/TestSuite_vs150.vcxproj.filters index 73000c178..9f55ed970 100644 --- a/PDF/testsuite/TestSuite_vs150.vcxproj.filters +++ b/PDF/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {81fd4d45-be4c-466a-b20c-8d18e777c5fe} + {45c51344-d7e3-4d37-a1e2-d34aa4faa775} - {04f269d9-4f55-453c-898a-2dafa10e438f} + {ef1e9cd9-40f1-4a98-ab3d-6b75f3b98974} - {5d9a5b3e-6108-4f8f-89c5-112c6eac6ec4} + {a7ef9aed-fcf5-4e21-bcbd-87ffbc59be21} - {e5aa8bf6-278b-49ee-a356-fb990c0b178a} + {a1228a3e-0861-4bba-8e3b-deafbd62c412} - {151616eb-378b-4cc7-820c-fc13cdeb1744} + {c1a824b1-4077-4bbb-abf9-c0326a473d71} - {b377b1c8-4f16-4391-87f1-5634a4c2b8de} + {26d641f0-44da-4896-9b3f-b892f8d40528} - {1c936b76-b446-4b3d-98e3-61cd274599fc} + {623d110b-25d7-40c0-a777-c88f72aa879b} - {e0ac558e-1cf6-4e26-a006-9410a6483ac4} + {42eddb5c-86da-4cdd-a285-401f47e0d3a0} diff --git a/PDF/testsuite/TestSuite_vs90.vcproj b/PDF/testsuite/TestSuite_vs90.vcproj index 8af4dd266..40adbe7b1 100644 --- a/PDF/testsuite/TestSuite_vs90.vcproj +++ b/PDF/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters index 2095b5274..18cc4b181 100644 --- a/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {0086e790-140b-4fbd-a600-358438949058} + {9b88ac84-4a0e-4006-b97f-65ed40e9a01e} - {6fc1087c-6e94-4775-b6c9-aa2087b3e5af} + {f1ddd49c-ae2e-4dee-a95c-7a8dee6876ea} - {c1085422-8011-49ab-9ed7-2be517290972} + {1265a341-c79c-4343-9b35-d8af081658a9} - {4d885f7b-6805-4cd0-ab2c-747ef6eb68f1} + {5925a9ac-3fb8-4991-9c6a-0ae2c65a5145} - {7951346a-4d81-4892-8e7d-86d432ab44b9} + {661f9b50-98a1-46c6-9204-4dd2bea04ef6} - {1aea0973-f9cd-47ab-bbad-694f595a97ca} + {2fefdaf7-2127-49ac-b156-50633687d8c8} - {67980e7b-2740-4b18-94d6-8dfe93bcd278} + {042cebf8-dba2-4bde-b635-5e52b1b01dde} - {39e7bbde-ecb5-49f3-94a4-7fce8449b69c} + {a9c08017-5363-4813-9239-379ff135ab04} diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj b/PDF/testsuite/TestSuite_x64_vs110.vcxproj index cbb62bf24..a6c3ed71f 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters index cbfc7a632..824ffb073 100644 --- a/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {807c7344-68e3-4951-81f0-3e95195c6524} + {40285e39-c413-48f5-9a10-fb4fe0806daf} - {0a49fb2c-9a15-44ab-834c-7b486aa3caf9} + {67c0ea63-9807-4e68-bac4-037d198b1872} - {35bc47e8-3b19-4fd5-86a1-d3f62849cab5} + {c2fb2f5d-4797-4969-919b-59f99e347eae} - {6ea6fe95-c4bf-454b-a9a2-623939dbda34} + {3796910b-50af-430d-8398-5798ad356e8e} - {b3e898aa-e880-410f-bba2-845b006df374} + {4d9cfbb2-5296-4577-9c77-7135abe250d5} - {a4fe6243-0dbe-4e6a-9467-c22200865bb6} + {c36fea36-1bda-43f4-b1a8-bb84c8b573b5} - {51448f56-7c49-48fb-9483-a8850fef48d3} + {5dd8b1a2-d39e-41de-a4f0-2ba95168bb72} - {c0a43ee5-3376-4484-8e28-c6aaf5cc2b0f} + {83c14739-af7e-45e5-a47c-fa7eb89a87f4} diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj b/PDF/testsuite/TestSuite_x64_vs120.vcxproj index d2c17b2df..2893966c0 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters index eb390315e..db6c9e9b0 100644 --- a/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {2ef6ca5a-16ff-46ed-893d-031565c4d9af} + {19176f99-95ad-4d5b-a643-e50085d95ea2} - {d4253814-5c88-431b-89f7-1f29632ac9ae} + {3552ca14-ee45-4157-96c3-a43ac9ba1163} - {22814df4-e585-4a28-8289-59de2911e09e} + {7f42d042-eb21-47f8-83bd-0d9b28b9d798} - {e19baaf2-09b9-4361-a1d0-47c97d83402c} + {1abc1452-8644-4433-86db-89367cf69429} - {9928bd23-0887-403f-9033-33a2cc040b51} + {02edf184-f57e-4465-bb4a-ba544aea9b81} - {e62c96a5-d3d4-4314-af37-9543857dc782} + {cb20d77d-025c-47ce-a52e-1ad715ba2cac} - {ae45e162-a871-4532-99bb-37dd073561a5} + {a1a1a0fb-74e8-4332-8a00-c3a8a1b177e8} - {09aca6f9-4246-4cd5-a89f-b73ab5c6aaa5} + {cce698be-06d9-45bc-868c-5e7b0523a4e7} diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj b/PDF/testsuite/TestSuite_x64_vs140.vcxproj index 99c79517d..b7d5b4f6b 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters index 4de281c49..96ca88167 100644 --- a/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {34bf8e03-c9ff-42f9-9551-5390c9ecf367} + {cbedcc2b-e0a8-4493-ad1f-40bb03d7b389} - {92e61942-6ecd-4083-8251-09e2be28b345} + {2b762ae7-6835-4c20-ac2f-423be841b3e1} - {05d19e7f-c522-4bd4-ad7f-3cf1d5bf14ba} + {3fe2cf0e-b1d1-47d7-a99e-106ff6d59676} - {bcb4cae3-c1f3-49f1-8c61-7c072d63971d} + {f183d7c5-bd21-4394-b80b-f1b53c3312bc} - {bd6f6929-5776-4371-9e54-8587d46bd4b8} + {15eb76b9-345a-40e1-8bec-3d1c466372f5} - {3234b502-b882-45b4-9018-02b7cc45d0dc} + {9c2bca69-adfe-4ba9-80e8-b93bff12cb50} - {cfe91f88-3f14-4b1e-9158-4ffbd7f95cf9} + {3087564c-49a3-4e29-b562-6292624cb951} - {2b2bbf60-c338-46ff-afae-f294bc083529} + {96cf0e28-b368-4205-9297-c31fc09e4163} diff --git a/PDF/testsuite/TestSuite_x64_vs150.vcxproj b/PDF/testsuite/TestSuite_x64_vs150.vcxproj index 3a420bfcf..ef576bd83 100644 --- a/PDF/testsuite/TestSuite_x64_vs150.vcxproj +++ b/PDF/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters b/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters index 6de2b6fa4..594e055d2 100644 --- a/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/PDF/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {414fe879-5069-4a4e-b828-fa9756272f17} + {0a74ef26-3171-464d-b066-b7c29f283abe} - {757c8e54-0489-4834-b9e5-ffe77466cd7a} + {e3768257-b49d-4d8d-a3c6-34a98f445c15} - {5bd61cbf-01b5-4c1d-aaa9-de1f895d8801} + {0415e55b-3e33-480a-acf0-44ecfe6ca150} - {b208a8e1-639e-4617-b94e-d5681c19af4c} + {ce98b73e-827a-4add-84a5-e8418f689945} - {73a5cf64-330c-4d17-9c5a-01e69160589a} + {2d4adf4b-40b5-4b76-998c-30aded4e5a17} - {9c004226-f671-4ee3-8954-d0b3db48c0d6} + {c293bb0d-a019-43f9-a1f4-68e8a7952462} - {285d2519-4b70-49a2-a0c6-e9e010b4e2ce} + {a41c8af5-b29b-4fd6-a07c-50e2b016ae45} - {38d234e1-7904-4160-9df6-eaffd252aeb8} + {c6971e6c-9c54-4b67-9cdb-12e8ec09e30a} diff --git a/PDF/testsuite/TestSuite_x64_vs90.vcproj b/PDF/testsuite/TestSuite_x64_vs90.vcproj index 5ea7a1267..440770119 100644 --- a/PDF/testsuite/TestSuite_x64_vs90.vcproj +++ b/PDF/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> - {1708936d-d21b-4e44-a586-438470f2a138} + {9e6917d9-3250-46ec-aa13-67dfb41ae1c5} - {c5506747-ade5-44ae-89c5-643957304eea} + {dd401f96-fc2f-4535-a1b0-60af613833f3} diff --git a/PageCompiler/File2Page/File2Page_vs110.vcxproj b/PageCompiler/File2Page/File2Page_vs110.vcxproj index 8418aec12..7348428a0 100644 --- a/PageCompiler/File2Page/File2Page_vs110.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters index 276f1b967..f8f82a6c7 100644 --- a/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {51901951-f9ab-433b-a825-742eb8b331ec} + {99d81e4d-b925-47d2-b9de-b70699560e67} - {76512029-a28d-4690-a6a4-cec615112683} + {2b11a4f7-0ab1-4fdd-81f7-a0bdf09d9a95} diff --git a/PageCompiler/File2Page/File2Page_vs120.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs120.vcxproj.filters index 5a0fdb692..1327ae477 100644 --- a/PageCompiler/File2Page/File2Page_vs120.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {c847efbb-b070-4c91-aa28-1e584ec3f155} + {28d45a81-f5b6-49ce-8873-7acc6c749445} - {2e46bec5-6f45-45e8-8eb4-dcab0d7d5a50} + {db5d773d-11b0-441c-a47d-b4f7c5a2b979} diff --git a/PageCompiler/File2Page/File2Page_vs140.vcxproj b/PageCompiler/File2Page/File2Page_vs140.vcxproj index 70db299ba..608057692 100644 --- a/PageCompiler/File2Page/File2Page_vs140.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_vs140.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs140.vcxproj.filters index 05e3dfb89..eb3a84da1 100644 --- a/PageCompiler/File2Page/File2Page_vs140.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {aeb910bb-a5e1-4ffe-9237-d1c9d3887cf7} + {3f91a736-0c07-40d5-843b-10861b7b39a0} - {38552bc1-f058-4380-a495-700573ac8f85} + {c07c1870-c690-4f23-9d6b-f0ac4db7de66} diff --git a/PageCompiler/File2Page/File2Page_vs150.vcxproj b/PageCompiler/File2Page/File2Page_vs150.vcxproj index 973a3e430..5dfc45358 100644 --- a/PageCompiler/File2Page/File2Page_vs150.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_vs150.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs150.vcxproj.filters index 05e3dfb89..6c3ce93e1 100644 --- a/PageCompiler/File2Page/File2Page_vs150.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {aeb910bb-a5e1-4ffe-9237-d1c9d3887cf7} + {81651f6f-3531-4394-bb00-6bebacdc90e1} - {38552bc1-f058-4380-a495-700573ac8f85} + {f02e9e43-7e94-44ea-ae54-b9fd44b11165} diff --git a/PageCompiler/File2Page/File2Page_x64_vs100.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs100.vcxproj.filters index b7a20e532..dfeb22a7d 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs100.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {d27548fa-17aa-4c0d-8cab-f76767e9ef24} + {d4d9b0c7-560e-4175-a366-364eaba53f9f} - {f192bd61-a4fa-423c-b8ec-c0ec1d35761f} + {17386e66-2473-4031-979a-3cdaa6e777ee} diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj index 2d688b369..9071551f0 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj +++ b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters index c69391355..85ba1d139 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {0c97d49c-5a91-4dc8-893f-7ab609fad5bb} + {455f41c4-4fba-4f85-9276-41ad63822dac} - {1408e00a-807f-4443-8ef8-6f8e7d4b4fb4} + {5c34c174-6bb4-4376-a9d9-e8f905ef3e66} diff --git a/PageCompiler/File2Page/File2Page_x64_vs120.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs120.vcxproj.filters index 9d41c5db1..9d47b1bd7 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs120.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {d3baccb0-62d0-49ed-8d2f-03ada554e00e} + {4fdc969c-47af-4a06-8212-97e4344a9e4f} - {fd9cba26-aa0a-4d3c-8488-6ef936d81ec8} + {c438f86b-c973-4f5d-b61e-43afcb6adfe4} diff --git a/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj b/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj index 677bbb6c0..3068bd7fe 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj +++ b/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj.filters index 101fa858a..291395f1a 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {31c5720e-d7db-40e4-baa5-e272e0b76724} + {eeaa52de-397c-4830-8ab6-cb00dbdaf089} - {11b74930-23c6-4223-891a-90eb464b480d} + {d92e6cd3-1331-4aef-9173-8a6c7280cdc1} diff --git a/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj b/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj index 3889fe6e0..9ecf8ca7b 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj +++ b/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj.filters b/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj.filters index 101fa858a..1d7a49c82 100644 --- a/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {31c5720e-d7db-40e4-baa5-e272e0b76724} + {b25d2ab4-e5ff-4f4b-be2c-9b969da9353a} - {11b74930-23c6-4223-891a-90eb464b480d} + {fdc296c5-ddf5-449d-a8c9-abfdb362db67} diff --git a/PageCompiler/PageCompiler_vs100.vcxproj.filters b/PageCompiler/PageCompiler_vs100.vcxproj.filters index ab2421d81..624676c67 100644 --- a/PageCompiler/PageCompiler_vs100.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {d51c3212-c51a-4e8c-b8aa-ba9dd0784422} + {bf0dc50e-4fc7-44e3-b1ae-f6e4826d5fcb} - {dee9cf12-b12b-4994-9023-1c8c7870bc3a} + {67b4938d-d3c8-4187-864f-ce2a6966af25} - {38178932-3f0b-474f-bf0c-d0124d4ffe2d} + {75c2228c-1687-4f8f-98d3-c22c51c89c97} diff --git a/PageCompiler/PageCompiler_vs110.vcxproj b/PageCompiler/PageCompiler_vs110.vcxproj index 4f737c971..b67ba4028 100644 --- a/PageCompiler/PageCompiler_vs110.vcxproj +++ b/PageCompiler/PageCompiler_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_vs110.vcxproj.filters b/PageCompiler/PageCompiler_vs110.vcxproj.filters index 5e8c0cc38..59b23e2d4 100644 --- a/PageCompiler/PageCompiler_vs110.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {d211bc9c-51d0-4c83-8f87-4c74eac791df} + {036b2e09-8610-48bc-9d2d-1dca4e8b7ab1} - {64ea0e62-6a82-44c3-a455-a474613c44ea} + {18e579f7-c14c-45aa-ac6f-2ff76a1976b1} - {bba63a1e-3416-4f02-878d-801fdc4d0967} + {9a374f92-97ae-4e63-8a5e-02c1ead107ec} diff --git a/PageCompiler/PageCompiler_vs120.vcxproj.filters b/PageCompiler/PageCompiler_vs120.vcxproj.filters index f79f2230f..191f66a33 100644 --- a/PageCompiler/PageCompiler_vs120.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {0984193c-00f6-46db-a21f-d141c2d72ee4} + {fb5cbab4-1bec-4361-9cb5-dedaa91d68db} - {bca3dce8-4a11-4686-8ba3-b709fe3cafc3} + {06802868-01a8-429a-ab7a-6cd64c751ec4} - {73dea722-80e3-4c41-83a1-167c8da2cf7c} + {06851959-bd56-4c9c-9eca-80df97e944ae} diff --git a/PageCompiler/PageCompiler_vs140.vcxproj b/PageCompiler/PageCompiler_vs140.vcxproj index 901b73dc6..b0a6516ef 100644 --- a/PageCompiler/PageCompiler_vs140.vcxproj +++ b/PageCompiler/PageCompiler_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_vs140.vcxproj.filters b/PageCompiler/PageCompiler_vs140.vcxproj.filters index d6c824da3..daa0f363d 100644 --- a/PageCompiler/PageCompiler_vs140.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {6ca5a588-bec7-47f1-be7e-bb688eee17bc} + {12a0ca80-a929-4923-b167-f56b6fc47e26} - {99e34dba-12eb-4193-af41-d3e5fef2d304} + {aa3ddd64-434c-4004-b09f-db55521e8553} - {0dccd80b-a299-450d-a7b0-9c139e6ceb82} + {53720c0f-9b6f-4c03-95a4-cd1112e8d244} diff --git a/PageCompiler/PageCompiler_vs150.vcxproj b/PageCompiler/PageCompiler_vs150.vcxproj index 8590afaa3..6e60aac17 100644 --- a/PageCompiler/PageCompiler_vs150.vcxproj +++ b/PageCompiler/PageCompiler_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_vs150.vcxproj.filters b/PageCompiler/PageCompiler_vs150.vcxproj.filters index d6c824da3..bebdbb2a8 100644 --- a/PageCompiler/PageCompiler_vs150.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {6ca5a588-bec7-47f1-be7e-bb688eee17bc} + {fc4c9c26-1015-4ca7-a2c1-aeec38d3707c} - {99e34dba-12eb-4193-af41-d3e5fef2d304} + {9eaec133-c7f4-4efe-a828-988f541bf678} - {0dccd80b-a299-450d-a7b0-9c139e6ceb82} + {e6909267-b69c-4107-aa0b-d700ebe17cc5} diff --git a/PageCompiler/PageCompiler_x64_vs100.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs100.vcxproj.filters index c34f22126..e10e8847c 100644 --- a/PageCompiler/PageCompiler_x64_vs100.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {c9f09189-5655-4c22-b59d-b3d52e2d1c01} + {d7074c50-62af-4530-b693-aad5cf429433} - {016e12d7-989a-4936-b489-8cf0e2df024b} + {fe1c1c2f-64fc-4d92-8005-2bdb6fac27be} - {09b6b60b-bf73-4f10-b4de-889b1e8973eb} + {1d6a0e3b-38dc-450c-97d3-a3f2e53725ad} diff --git a/PageCompiler/PageCompiler_x64_vs110.vcxproj b/PageCompiler/PageCompiler_x64_vs110.vcxproj index e4641e81e..c38480ea4 100644 --- a/PageCompiler/PageCompiler_x64_vs110.vcxproj +++ b/PageCompiler/PageCompiler_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters index 626d45602..e2c7d64aa 100644 --- a/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {e3c856b3-3eec-42e8-89ce-dc1d55905017} + {53855eb3-d121-4201-9b51-5d0076fb182e} - {a3327de9-7d67-4619-9dfc-eb42d0362b88} + {ca0604ea-68e7-447a-9db1-cd9de3882d2b} - {2a5c2593-32d9-4a4d-b9bc-4e1dcee6d402} + {5a4c0b14-cb31-4c04-a49e-19e24bcc538d} diff --git a/PageCompiler/PageCompiler_x64_vs120.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs120.vcxproj.filters index 85d5b65e9..e13ca258a 100644 --- a/PageCompiler/PageCompiler_x64_vs120.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {68a88986-26cb-4b7f-b1ff-d05d223d12cd} + {a471c833-fea4-493b-880c-690b8e551bf6} - {4a3e5e03-9271-47b7-a54e-d35fe46e5eaf} + {60a6ceb2-7bc0-4891-919f-875f8e96b07c} - {544c8e90-39a6-4504-bc99-2fdd505f2e44} + {69ba1ebf-c858-4836-9c82-5bd9a3c63c13} diff --git a/PageCompiler/PageCompiler_x64_vs140.vcxproj b/PageCompiler/PageCompiler_x64_vs140.vcxproj index 0f3c92d37..2a9c106f4 100644 --- a/PageCompiler/PageCompiler_x64_vs140.vcxproj +++ b/PageCompiler/PageCompiler_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_x64_vs140.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs140.vcxproj.filters index 4e17413aa..585ddbc9e 100644 --- a/PageCompiler/PageCompiler_x64_vs140.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {7a48d367-cd96-4fb3-b8cc-5cb496fc6ce9} + {97117c49-3127-492b-8a6b-9854d742cf8e} - {8c1f6344-d33f-4441-ab77-d8e4d9182542} + {87f20fdf-f211-4ad5-b068-1a2beb3014e1} - {24cc735d-3a48-4560-acdf-92121f07245f} + {55ee5767-6b8f-4998-8ca6-6d78e9d398cf} diff --git a/PageCompiler/PageCompiler_x64_vs150.vcxproj b/PageCompiler/PageCompiler_x64_vs150.vcxproj index 3e2b450bd..cef44b2f8 100644 --- a/PageCompiler/PageCompiler_x64_vs150.vcxproj +++ b/PageCompiler/PageCompiler_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_x64_vs150.vcxproj.filters b/PageCompiler/PageCompiler_x64_vs150.vcxproj.filters index 4e17413aa..138413d5c 100644 --- a/PageCompiler/PageCompiler_x64_vs150.vcxproj.filters +++ b/PageCompiler/PageCompiler_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {7a48d367-cd96-4fb3-b8cc-5cb496fc6ce9} + {6d22228a-2cdd-4b37-95f3-5d9bcd956e96} - {8c1f6344-d33f-4441-ab77-d8e4d9182542} + {994777fe-0963-4420-8aae-6171b2bf3c6c} - {24cc735d-3a48-4560-acdf-92121f07245f} + {68a52669-ccd9-4d13-8131-f039795e2c3b} diff --git a/ProGen/ProGen_vs100.vcxproj.filters b/ProGen/ProGen_vs100.vcxproj.filters index 530acc10a..5738cf513 100644 --- a/ProGen/ProGen_vs100.vcxproj.filters +++ b/ProGen/ProGen_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {f5383a53-bd5c-482e-9e30-a10ccb2d24ba} + {ccaf09e1-fb22-4f06-addb-d65614054f5f} - {4759b478-9be2-49d1-ad34-f5091ee7f638} + {da096d1d-78d8-4f4c-a45f-ddeb2981b7f5} - {8d41f938-126f-4971-a446-c0f5f1e8b892} + {d41f2a8d-a4fd-49e6-af63-5e375f2e22f8} diff --git a/ProGen/ProGen_vs110.vcxproj b/ProGen/ProGen_vs110.vcxproj index 489395aad..cbc0311ac 100644 --- a/ProGen/ProGen_vs110.vcxproj +++ b/ProGen/ProGen_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 progend progend progend diff --git a/ProGen/ProGen_vs110.vcxproj.filters b/ProGen/ProGen_vs110.vcxproj.filters index 2d0912c1c..d8cc7d897 100644 --- a/ProGen/ProGen_vs110.vcxproj.filters +++ b/ProGen/ProGen_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {d520fc46-7912-492b-9338-71e8d26879de} + {4c0dcb02-950a-4699-a58c-b6813b005985} - {a3a7e4cf-1b94-43c8-a19f-f7d09d47cdca} + {60b026c4-5536-4019-b3e9-b703fbf36096} - {3fa5b219-f59a-45bc-8c6b-c78c28703c75} + {9352590f-5092-432d-bedc-c3325d692d2a} diff --git a/ProGen/ProGen_vs120.vcxproj.filters b/ProGen/ProGen_vs120.vcxproj.filters index 36f9c080b..8c89b7c40 100644 --- a/ProGen/ProGen_vs120.vcxproj.filters +++ b/ProGen/ProGen_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {8940cedd-4d11-402f-ae06-a659f8e91b8b} + {1f4b28c3-a1ea-4c43-b841-cfdd0c3cfa66} - {e76a2308-a184-4446-9745-c7c62b5b58ea} + {a2695bad-4d0b-4bf7-b5e0-72cb3ee4ee90} - {2863c7ac-83bf-4118-9d65-37bb887a3d82} + {7c6a60e3-dddb-4bbe-bf64-65be5f447195} diff --git a/ProGen/ProGen_vs140.vcxproj b/ProGen/ProGen_vs140.vcxproj index ec88fccad..53404ed45 100644 --- a/ProGen/ProGen_vs140.vcxproj +++ b/ProGen/ProGen_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 progend progend progend diff --git a/ProGen/ProGen_vs140.vcxproj.filters b/ProGen/ProGen_vs140.vcxproj.filters index d852e37ee..3b7a46ee8 100644 --- a/ProGen/ProGen_vs140.vcxproj.filters +++ b/ProGen/ProGen_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {f100c38e-0207-4d38-b69f-43c46eb34ae3} + {811baa8c-16de-430a-8b62-b8e3c14f6363} - {6e9bb05e-7366-42b2-a99d-f00725fb45f9} + {3df8db7e-6e28-4bbf-8cad-1ff3b7eda1da} - {421a9a9f-e2b0-4954-9f2c-aab25ce9f399} + {a05d846b-8709-464c-a14d-22b2669c33ff} diff --git a/ProGen/ProGen_vs150.vcxproj b/ProGen/ProGen_vs150.vcxproj index 0749c8cc3..f3f4192c6 100644 --- a/ProGen/ProGen_vs150.vcxproj +++ b/ProGen/ProGen_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 progend progend progend diff --git a/ProGen/ProGen_vs150.vcxproj.filters b/ProGen/ProGen_vs150.vcxproj.filters index d852e37ee..08fc1b1da 100644 --- a/ProGen/ProGen_vs150.vcxproj.filters +++ b/ProGen/ProGen_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {f100c38e-0207-4d38-b69f-43c46eb34ae3} + {edf27716-cd4a-41e1-a2ac-9a562cba24b2} - {6e9bb05e-7366-42b2-a99d-f00725fb45f9} + {a9d18f27-c125-4c49-b464-fda0b5d7620c} - {421a9a9f-e2b0-4954-9f2c-aab25ce9f399} + {ea1ffd26-fc5f-41d9-8b66-21ef1c952903} diff --git a/ProGen/ProGen_x64_vs100.vcxproj.filters b/ProGen/ProGen_x64_vs100.vcxproj.filters index 704135ab6..a016cf0a4 100644 --- a/ProGen/ProGen_x64_vs100.vcxproj.filters +++ b/ProGen/ProGen_x64_vs100.vcxproj.filters @@ -2,13 +2,13 @@ - {f41b90f5-bea7-458c-81a3-b0e894416872} + {4c75ae41-2894-4969-a1a9-87bc436d2e47} - {fc992f09-7e98-4aa2-a579-46dea300ab63} + {3ab92635-1957-49f0-a6eb-73fda307775c} - {c71c12c6-bc5a-46a5-8eff-2ec1b21c0a77} + {a84df80b-db4e-462d-8b6e-9726f7b5f38b} diff --git a/ProGen/ProGen_x64_vs110.vcxproj b/ProGen/ProGen_x64_vs110.vcxproj index e8df1350f..a4c991418 100644 --- a/ProGen/ProGen_x64_vs110.vcxproj +++ b/ProGen/ProGen_x64_vs110.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>11.0.61030.0 + <_ProjectFileVersion>11.0.50727.1 progend progend progend diff --git a/ProGen/ProGen_x64_vs110.vcxproj.filters b/ProGen/ProGen_x64_vs110.vcxproj.filters index 24a698f61..72f0a5211 100644 --- a/ProGen/ProGen_x64_vs110.vcxproj.filters +++ b/ProGen/ProGen_x64_vs110.vcxproj.filters @@ -2,13 +2,13 @@ - {0f52b9bd-5359-4801-903d-19f3bbf665d8} + {d67b4bf9-fa73-464b-9724-3b3ad1c73b5c} - {33d955e3-da4f-4861-b0c4-ad1200077817} + {c4f63efe-2ad7-48ca-bb5e-58acb6d4fa67} - {6b3bde62-1e36-43f8-9433-278b91638652} + {079bb2e0-348e-4652-bfd1-f292299b75c4} diff --git a/ProGen/ProGen_x64_vs120.vcxproj.filters b/ProGen/ProGen_x64_vs120.vcxproj.filters index 332fe4ed6..c18fc9ec6 100644 --- a/ProGen/ProGen_x64_vs120.vcxproj.filters +++ b/ProGen/ProGen_x64_vs120.vcxproj.filters @@ -2,13 +2,13 @@ - {87f35ff9-bd0a-4e46-a2d5-d773832a2c73} + {71a4a4a1-cbaf-42a6-8590-edf89960a9ac} - {742c96d7-ac3d-41f3-8b88-7564849d5365} + {0af41245-d086-4b66-be5b-bf262f256ee5} - {29e8a7f9-8820-4727-9d5b-b0b66150a0b9} + {2661ae4f-779a-45d2-977e-e918ebfca68f} diff --git a/ProGen/ProGen_x64_vs140.vcxproj b/ProGen/ProGen_x64_vs140.vcxproj index 0127d71ce..24de987a3 100644 --- a/ProGen/ProGen_x64_vs140.vcxproj +++ b/ProGen/ProGen_x64_vs140.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>14.0.25431.1 progend progend progend diff --git a/ProGen/ProGen_x64_vs140.vcxproj.filters b/ProGen/ProGen_x64_vs140.vcxproj.filters index 734da3d97..03ca1b2f1 100644 --- a/ProGen/ProGen_x64_vs140.vcxproj.filters +++ b/ProGen/ProGen_x64_vs140.vcxproj.filters @@ -2,13 +2,13 @@ - {581030e3-71ac-4655-a01a-d8167d62d472} + {cf7cbd59-50b7-4c29-9304-0f477c9fbb68} - {e753813e-2b46-4dd1-86d4-b77fe01a97ea} + {f45129ba-5ef9-475e-9a03-8f804b87f46f} - {7d7bb072-3dc2-4c04-902b-23e804022744} + {2a9730b9-b953-41df-9c76-1f5554eb343d} diff --git a/ProGen/ProGen_x64_vs150.vcxproj b/ProGen/ProGen_x64_vs150.vcxproj index 69d5047e1..aa117f011 100644 --- a/ProGen/ProGen_x64_vs150.vcxproj +++ b/ProGen/ProGen_x64_vs150.vcxproj @@ -85,7 +85,7 @@ - <_ProjectFileVersion>14.0.23107.0 + <_ProjectFileVersion>15.0.27625.0 progend progend progend diff --git a/ProGen/ProGen_x64_vs150.vcxproj.filters b/ProGen/ProGen_x64_vs150.vcxproj.filters index 734da3d97..fbba47642 100644 --- a/ProGen/ProGen_x64_vs150.vcxproj.filters +++ b/ProGen/ProGen_x64_vs150.vcxproj.filters @@ -2,13 +2,13 @@ - {581030e3-71ac-4655-a01a-d8167d62d472} + {0366f204-394a-4ffb-be51-593816bb3508} - {e753813e-2b46-4dd1-86d4-b77fe01a97ea} + {cccf8136-d97f-489b-9161-281cb717c098} - {7d7bb072-3dc2-4c04-902b-23e804022744} + {32946061-cae5-4136-a684-3734f678f33f} diff --git a/ProGen/progen.bat b/ProGen/progen.bat index d3b02c65c..e51934879 100644 --- a/ProGen/progen.bat +++ b/ProGen/progen.bat @@ -1,45 +1,55 @@ -ProGen\bin\static_md\progen.exe CppUnit\CppUnit.progen -ProGen\bin\static_md\progen.exe Foundation\Foundation.progen -ProGen\bin\static_md\progen.exe Encodings\Encodings.progen -ProGen\bin\static_md\progen.exe XML\XML.progen -ProGen\bin\static_md\progen.exe JSON\JSON.progen -ProGen\bin\static_md\progen.exe Util\Util.progen -ProGen\bin\static_md\progen.exe Net\Net.progen -ProGen\bin\static_md\progen.exe Crypto\Crypto.progen -ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\NetSSL_OpenSSL.progen -ProGen\bin\static_md\progen.exe NetSSL_Win\NetSSL_Win.progen -ProGen\bin\static_md\progen.exe Data\Data.progen -ProGen\bin\static_md\progen.exe Data\SQLite\SQLite.progen -ProGen\bin\static_md\progen.exe Data\ODBC\ODBC.progen -ProGen\bin\static_md\progen.exe Data\MySQL\MySQL.progen -ProGen\bin\static_md\progen.exe Data\PostgreSQL\PostgreSQL.progen -ProGen\bin\static_md\progen.exe Zip\Zip.progen -ProGen\bin\static_md\progen.exe PageCompiler\PageCompiler.progen -ProGen\bin\static_md\progen.exe PageCompiler\File2Page\File2Page.progen -ProGen\bin\static_md\progen.exe PDF\PDF.progen -ProGen\bin\static_md\progen.exe CppParser\CppParser.progen -ProGen\bin\static_md\progen.exe MongoDB\MongoDB.progen -ProGen\bin\static_md\progen.exe Redis\Redis.progen -ProGen\bin\static_md\progen.exe ProGen\ProGen.progen +@echo off +setlocal EnableDelayedExpansion EnableExtensions +if "%POCO_BASE%"=="" ( + echo POCO_BASE not set + goto :exit +) +pushd %POCO_BASE% +ProGen\bin\static_md\progen.exe /platform=%1 CppUnit\CppUnit.progen +ProGen\bin\static_md\progen.exe /platform=%1 Foundation\Foundation.progen +ProGen\bin\static_md\progen.exe /platform=%1 Encodings\Encodings.progen +ProGen\bin\static_md\progen.exe /platform=%1 XML\XML.progen +ProGen\bin\static_md\progen.exe /platform=%1 JSON\JSON.progen +ProGen\bin\static_md\progen.exe /platform=%1 Util\Util.progen +ProGen\bin\static_md\progen.exe /platform=%1 Net\Net.progen +ProGen\bin\static_md\progen.exe /platform=%1 Crypto\Crypto.progen +ProGen\bin\static_md\progen.exe /platform=%1 NetSSL_OpenSSL\NetSSL_OpenSSL.progen +ProGen\bin\static_md\progen.exe /platform=%1 NetSSL_Win\NetSSL_Win.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\Data.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\SQLite\SQLite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\ODBC\ODBC.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\MySQL\MySQL.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\PostgreSQL\PostgreSQL.progen +ProGen\bin\static_md\progen.exe /platform=%1 Zip\Zip.progen +ProGen\bin\static_md\progen.exe /platform=%1 PageCompiler\PageCompiler.progen +ProGen\bin\static_md\progen.exe /platform=%1 PageCompiler\File2Page\File2Page.progen +ProGen\bin\static_md\progen.exe /platform=%1 PDF\PDF.progen +ProGen\bin\static_md\progen.exe /platform=%1 CppParser\CppParser.progen +ProGen\bin\static_md\progen.exe /platform=%1 MongoDB\MongoDB.progen +ProGen\bin\static_md\progen.exe /platform=%1 Redis\Redis.progen +ProGen\bin\static_md\progen.exe /platform=%1 ProGen\ProGen.progen -ProGen\bin\static_md\progen.exe Foundation\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Encodings\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe XML\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe JSON\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Util\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Net\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Crypto\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe NetSSL_OpenSSL\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe NetSSL_Win\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Data\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Data\SQLite\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Data\ODBC\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Data\MySQL\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Data\PostgreSQL\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Zip\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe PageCompiler\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe PDF\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe CppParser\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe MongoDB\testsuite\TestSuite.progen -ProGen\bin\static_md\progen.exe Redis\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Foundation\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Encodings\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 XML\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 JSON\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Util\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Net\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Crypto\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 NetSSL_OpenSSL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 NetSSL_Win\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\SQLite\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\ODBC\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\MySQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Data\PostgreSQL\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Zip\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 PageCompiler\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 PDF\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 CppParser\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 MongoDB\testsuite\TestSuite.progen +ProGen\bin\static_md\progen.exe /platform=%1 Redis\testsuite\TestSuite.progen +popd +:exit +endlocal diff --git a/ProGen/progen.properties b/ProGen/progen.properties index f57d0999e..bdce09650 100644 --- a/ProGen/progen.properties +++ b/ProGen/progen.properties @@ -1,10 +1,10 @@ progen.templatePath = ${application.configDir}templates progen.libsuffix.debug_shared = d.lib -progen.libsuffix.debug_static_md = mdd.lib -progen.libsuffix.debug_static_mt = mtd.lib +progen.libsuffix.debug_static_md = MDd.lib +progen.libsuffix.debug_static_mt = MTd.lib progen.libsuffix.release_shared = .lib -progen.libsuffix.release_static_md = md.lib -progen.libsuffix.release_static_mt = mt.lib +progen.libsuffix.release_static_md = MD.lib +progen.libsuffix.release_static_mt = MT.lib progen.project.guidFromName.namespaceUUID = F4193868-E4EB-4090-9A01-344E7233004B progen.postprocess.upgrade2008to2010.tool = ${system.env.VS100COMNTOOLS}\\..\\IDE\\DevEnv.exe diff --git a/ProGen/rebuildall32.bat b/ProGen/rebuildall32.bat index e59a4fa02..8efd9d630 100644 --- a/ProGen/rebuildall32.bat +++ b/ProGen/rebuildall32.bat @@ -1,8 +1,19 @@ +@echo off setlocal EnableDelayedExpansion EnableExtensions -rd /q /s ..\lib ..\bin & call ..\buildwin 90 rebuild all both Win32 samples tests devenv > log\90.x32.log 2>&1 -rd /q /s ..\lib ..\bin & call ..\buildwin 100 rebuild all both Win32 samples tests msbuild > log\100.x32.log 2>&1 -rd /q /s ..\lib ..\bin & call ..\buildwin 110 rebuild all both Win32 samples tests msbuild > log\110.x32.log 2>&1 -rd /q /s ..\lib ..\bin & call ..\buildwin 120 rebuild all both Win32 samples tests msbuild > log\120.x32.log 2>&1 -rd /q /s ..\lib ..\bin & call ..\buildwin 140 rebuild all both Win32 samples tests msbuild > log\140.x32.log 2>&1 -rd /q /s ..\lib ..\bin & call ..\buildwin 150 rebuild all both Win32 samples tests msbuild > log\150.x32.log 2>&1 +if "%POCO_BASE%"=="" ( + echo POCO_BASE not set + goto :exit +) +pushd %POCO_BASE% +mkdir ProGen\log + +call ProGen\progen.bat Win32 >ProGen\log\progen32.log 2>&1 +rd /q /s lib bin & call buildwin 90 rebuild all both Win32 samples tests devenv > ProGen\log\90.x32.log 2>&1 +rd /q /s lib bin & call buildwin 100 rebuild all both Win32 samples tests msbuild > ProGen\log\100.x32.log 2>&1 +rd /q /s lib bin & call buildwin 110 rebuild all both Win32 samples tests msbuild > ProGen\log\110.x32.log 2>&1 +rd /q /s lib bin & call buildwin 120 rebuild all both Win32 samples tests msbuild > ProGen\log\120.x32.log 2>&1 +rd /q /s lib bin & call buildwin 140 rebuild all both Win32 samples tests msbuild > ProGen\log\140.x32.log 2>&1 +rd /q /s lib bin & call buildwin 150 rebuild all both Win32 samples tests msbuild > ProGen\log\150.x32.log 2>&1 +popd +:exit endlocal diff --git a/ProGen/rebuildall64.bat b/ProGen/rebuildall64.bat index fe7aa1a83..97296a3ab 100644 --- a/ProGen/rebuildall64.bat +++ b/ProGen/rebuildall64.bat @@ -1,8 +1,19 @@ +@echo off setlocal EnableExtensions EnableDelayedExpansion -rd /q /s ..\lib64 ..\bin64 & call buildwin 90 ..\rebuild all bot..\h x64 samples tests devenv > log\9..\0.x64.log 2>&1 -rd /q /s ..\lib64 ..\bin64 & call buildwin 100 ..\rebuild all bot..\h x64 samples tests msbuild > log\10..\0.x64.log 2>&1 -rd /q /s ..\lib64 ..\bin64 & call buildwin 110 ..\rebuild all bot..\h x64 samples tests msbuild > log\11..\0.x64.log 2>&1 -rd /q /s ..\lib64 ..\bin64 & call buildwin 120 ..\rebuild all bot..\h x64 samples tests msbuild > log\12..\0.x64.log 2>&1 -rd /q /s ..\lib64 ..\bin64 & call buildwin 140 ..\rebuild all bot..\h x64 samples tests msbuild > log\14..\0.x64.log 2>&1 -rd /q /s ..\lib64 ..\bin64 & call buildwin 150 ..\rebuild all bot..\h x64 samples tests msbuild > log\15..\0.x64.log 2>&1 +if "%POCO_BASE%"=="" ( + echo POCO_BASE not set + goto :exit +) +pushd %POCO_BASE% +mkdir ProGen\log + +call ProGen\progen x64 >ProGen\log\progen64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 90 rebuild all both x64 samples tests devenv > ProGen\log\90.x64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 100 rebuild all both x64 samples tests msbuild > ProGen\log\100.x64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 110 rebuild all both x64 samples tests msbuild > ProGen\log\110.x64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 120 rebuild all both x64 samples tests msbuild > ProGen\log\120.x64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 140 rebuild all both x64 samples tests msbuild > ProGen\log\140.x64.log 2>&1 +rd /q /s lib64 bin64 & call buildwin 150 rebuild all both x64 samples tests msbuild > ProGen\log\150.x64.log 2>&1 +popd +:exit endlocal diff --git a/ProGen/templates/vs100/Win32/library/debug_static_md.template b/ProGen/templates/vs100/Win32/library/debug_static_md.template index 4ecfe38ce..d3f1e8789 100644 --- a/ProGen/templates/vs100/Win32/library/debug_static_md.template +++ b/ProGen/templates/vs100/Win32/library/debug_static_md.template @@ -34,7 +34,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="${project.outdir}\lib\${project.target}mdd.pdb" + ProgramDataBaseFileName="${project.outdir}\lib\${project.target}MDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -53,7 +53,8 @@ /> - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/debug_static_md.template b/ProGen/templates/vs90/Win32/executable/debug_static_md.template deleted file mode 100644 index 7174e9c53..000000000 --- a/ProGen/templates/vs90/Win32/executable/debug_static_md.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/debug_static_mt.template b/ProGen/templates/vs90/Win32/executable/debug_static_mt.template deleted file mode 100644 index 1c6765eb9..000000000 --- a/ProGen/templates/vs90/Win32/executable/debug_static_mt.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/project.properties b/ProGen/templates/vs90/Win32/executable/project.properties deleted file mode 100644 index de3dfc75a..000000000 --- a/ProGen/templates/vs90/Win32/executable/project.properties +++ /dev/null @@ -1 +0,0 @@ -project.suffix = _vs90.vcproj diff --git a/ProGen/templates/vs90/Win32/executable/project.template b/ProGen/templates/vs90/Win32/executable/project.template deleted file mode 100644 index 6c9d8b9cb..000000000 --- a/ProGen/templates/vs90/Win32/executable/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/release_shared.template b/ProGen/templates/vs90/Win32/executable/release_shared.template deleted file mode 100644 index 2f8a8b410..000000000 --- a/ProGen/templates/vs90/Win32/executable/release_shared.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/release_static_md.template b/ProGen/templates/vs90/Win32/executable/release_static_md.template deleted file mode 100644 index 3b70b4298..000000000 --- a/ProGen/templates/vs90/Win32/executable/release_static_md.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/executable/release_static_mt.template b/ProGen/templates/vs90/Win32/executable/release_static_mt.template deleted file mode 100644 index e5a6bc04c..000000000 --- a/ProGen/templates/vs90/Win32/executable/release_static_mt.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/debug_shared.template b/ProGen/templates/vs90/Win32/library/debug_shared.template deleted file mode 100644 index bed611641..000000000 --- a/ProGen/templates/vs90/Win32/library/debug_shared.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/debug_static_md.template b/ProGen/templates/vs90/Win32/library/debug_static_md.template deleted file mode 100644 index cbb0b1f5e..000000000 --- a/ProGen/templates/vs90/Win32/library/debug_static_md.template +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/debug_static_mt.template b/ProGen/templates/vs90/Win32/library/debug_static_mt.template deleted file mode 100644 index e54a11517..000000000 --- a/ProGen/templates/vs90/Win32/library/debug_static_mt.template +++ /dev/null @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/project.properties b/ProGen/templates/vs90/Win32/library/project.properties deleted file mode 100644 index de3dfc75a..000000000 --- a/ProGen/templates/vs90/Win32/library/project.properties +++ /dev/null @@ -1 +0,0 @@ -project.suffix = _vs90.vcproj diff --git a/ProGen/templates/vs90/Win32/library/project.template b/ProGen/templates/vs90/Win32/library/project.template deleted file mode 100644 index 6c9d8b9cb..000000000 --- a/ProGen/templates/vs90/Win32/library/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/release_shared.template b/ProGen/templates/vs90/Win32/library/release_shared.template deleted file mode 100644 index 41e8524d8..000000000 --- a/ProGen/templates/vs90/Win32/library/release_shared.template +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/release_static_md.template b/ProGen/templates/vs90/Win32/library/release_static_md.template deleted file mode 100644 index 0ebb9169e..000000000 --- a/ProGen/templates/vs90/Win32/library/release_static_md.template +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/library/release_static_mt.template b/ProGen/templates/vs90/Win32/library/release_static_mt.template deleted file mode 100644 index 78cf9acc5..000000000 --- a/ProGen/templates/vs90/Win32/library/release_static_mt.template +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/plugin/debug_shared.template b/ProGen/templates/vs90/Win32/plugin/debug_shared.template deleted file mode 100644 index 20956eea7..000000000 --- a/ProGen/templates/vs90/Win32/plugin/debug_shared.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/plugin/project.properties b/ProGen/templates/vs90/Win32/plugin/project.properties deleted file mode 100644 index de3dfc75a..000000000 --- a/ProGen/templates/vs90/Win32/plugin/project.properties +++ /dev/null @@ -1 +0,0 @@ -project.suffix = _vs90.vcproj diff --git a/ProGen/templates/vs90/Win32/plugin/project.template b/ProGen/templates/vs90/Win32/plugin/project.template deleted file mode 100644 index 6c9d8b9cb..000000000 --- a/ProGen/templates/vs90/Win32/plugin/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/plugin/release_shared.template b/ProGen/templates/vs90/Win32/plugin/release_shared.template deleted file mode 100644 index a0d7dc9c4..000000000 --- a/ProGen/templates/vs90/Win32/plugin/release_shared.template +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_shared.template b/ProGen/templates/vs90/Win32/testsuite/debug_shared.template deleted file mode 100644 index ae6b16d3e..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/debug_shared.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template deleted file mode 100644 index b8604b7a6..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/debug_static_md.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template deleted file mode 100644 index 002b50bbf..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/debug_static_mt.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/project.properties b/ProGen/templates/vs90/Win32/testsuite/project.properties deleted file mode 100644 index de3dfc75a..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/project.properties +++ /dev/null @@ -1 +0,0 @@ -project.suffix = _vs90.vcproj diff --git a/ProGen/templates/vs90/Win32/testsuite/project.template b/ProGen/templates/vs90/Win32/testsuite/project.template deleted file mode 100644 index 6c9d8b9cb..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/release_shared.template b/ProGen/templates/vs90/Win32/testsuite/release_shared.template deleted file mode 100644 index 6995cbb8d..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/release_shared.template +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_md.template b/ProGen/templates/vs90/Win32/testsuite/release_static_md.template deleted file mode 100644 index 829ec7ccd..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/release_static_md.template +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template b/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template deleted file mode 100644 index cdd93d79f..000000000 --- a/ProGen/templates/vs90/Win32/testsuite/release_static_mt.template +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/debug_shared.template b/ProGen/templates/vs90/WinCE/executable/debug_shared.template deleted file mode 100644 index 5bf116442..000000000 --- a/ProGen/templates/vs90/WinCE/executable/debug_shared.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/debug_static_md.template b/ProGen/templates/vs90/WinCE/executable/debug_static_md.template deleted file mode 100644 index c74b1f016..000000000 --- a/ProGen/templates/vs90/WinCE/executable/debug_static_md.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/debug_static_mt.template b/ProGen/templates/vs90/WinCE/executable/debug_static_mt.template deleted file mode 100644 index d05f33212..000000000 --- a/ProGen/templates/vs90/WinCE/executable/debug_static_mt.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/project.properties b/ProGen/templates/vs90/WinCE/executable/project.properties deleted file mode 100644 index dadcf3863..000000000 --- a/ProGen/templates/vs90/WinCE/executable/project.properties +++ /dev/null @@ -1,4 +0,0 @@ -project.suffix = _CE_vs90.vcproj -project.platform = Digi JumpStart (ARMV4I) -project.targetArchitecture = ARMV4I -project.targetPlatform = WINDOWS_CE diff --git a/ProGen/templates/vs90/WinCE/executable/project.template b/ProGen/templates/vs90/WinCE/executable/project.template deleted file mode 100644 index 6ec57f590..000000000 --- a/ProGen/templates/vs90/WinCE/executable/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/release_shared.template b/ProGen/templates/vs90/WinCE/executable/release_shared.template deleted file mode 100644 index 1d5cf6e05..000000000 --- a/ProGen/templates/vs90/WinCE/executable/release_shared.template +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/release_static_md.template b/ProGen/templates/vs90/WinCE/executable/release_static_md.template deleted file mode 100644 index 0cb5a2b5c..000000000 --- a/ProGen/templates/vs90/WinCE/executable/release_static_md.template +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/executable/release_static_mt.template b/ProGen/templates/vs90/WinCE/executable/release_static_mt.template deleted file mode 100644 index 44b0910fd..000000000 --- a/ProGen/templates/vs90/WinCE/executable/release_static_mt.template +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/debug_shared.template b/ProGen/templates/vs90/WinCE/library/debug_shared.template deleted file mode 100644 index 20ab74e77..000000000 --- a/ProGen/templates/vs90/WinCE/library/debug_shared.template +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/debug_static_md.template b/ProGen/templates/vs90/WinCE/library/debug_static_md.template deleted file mode 100644 index 2a74c9d51..000000000 --- a/ProGen/templates/vs90/WinCE/library/debug_static_md.template +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/debug_static_mt.template b/ProGen/templates/vs90/WinCE/library/debug_static_mt.template deleted file mode 100644 index a4c5ac8af..000000000 --- a/ProGen/templates/vs90/WinCE/library/debug_static_mt.template +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/project.properties b/ProGen/templates/vs90/WinCE/library/project.properties deleted file mode 100644 index dadcf3863..000000000 --- a/ProGen/templates/vs90/WinCE/library/project.properties +++ /dev/null @@ -1,4 +0,0 @@ -project.suffix = _CE_vs90.vcproj -project.platform = Digi JumpStart (ARMV4I) -project.targetArchitecture = ARMV4I -project.targetPlatform = WINDOWS_CE diff --git a/ProGen/templates/vs90/WinCE/library/project.template b/ProGen/templates/vs90/WinCE/library/project.template deleted file mode 100644 index 6ec57f590..000000000 --- a/ProGen/templates/vs90/WinCE/library/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/release_shared.template b/ProGen/templates/vs90/WinCE/library/release_shared.template deleted file mode 100644 index 2c2b5b1bc..000000000 --- a/ProGen/templates/vs90/WinCE/library/release_shared.template +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/release_static_md.template b/ProGen/templates/vs90/WinCE/library/release_static_md.template deleted file mode 100644 index ab66a51df..000000000 --- a/ProGen/templates/vs90/WinCE/library/release_static_md.template +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/library/release_static_mt.template b/ProGen/templates/vs90/WinCE/library/release_static_mt.template deleted file mode 100644 index edcb488af..000000000 --- a/ProGen/templates/vs90/WinCE/library/release_static_mt.template +++ /dev/null @@ -1,85 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/plugin/debug_shared.template b/ProGen/templates/vs90/WinCE/plugin/debug_shared.template deleted file mode 100644 index 379e136f9..000000000 --- a/ProGen/templates/vs90/WinCE/plugin/debug_shared.template +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/plugin/project.properties b/ProGen/templates/vs90/WinCE/plugin/project.properties deleted file mode 100644 index dadcf3863..000000000 --- a/ProGen/templates/vs90/WinCE/plugin/project.properties +++ /dev/null @@ -1,4 +0,0 @@ -project.suffix = _CE_vs90.vcproj -project.platform = Digi JumpStart (ARMV4I) -project.targetArchitecture = ARMV4I -project.targetPlatform = WINDOWS_CE diff --git a/ProGen/templates/vs90/WinCE/plugin/project.template b/ProGen/templates/vs90/WinCE/plugin/project.template deleted file mode 100644 index 6ec57f590..000000000 --- a/ProGen/templates/vs90/WinCE/plugin/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/plugin/release_shared.template b/ProGen/templates/vs90/WinCE/plugin/release_shared.template deleted file mode 100644 index 5c884748a..000000000 --- a/ProGen/templates/vs90/WinCE/plugin/release_shared.template +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template b/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template deleted file mode 100644 index 8c3093d15..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/debug_shared.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template b/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template deleted file mode 100644 index 9648d7967..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_md.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template b/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template deleted file mode 100644 index ee7fdd39e..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/debug_static_mt.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/project.properties b/ProGen/templates/vs90/WinCE/testsuite/project.properties deleted file mode 100644 index a132cb8b7..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/project.properties +++ /dev/null @@ -1,5 +0,0 @@ -project.suffix = _CE_vs90.vcproj -project.platform = Digi JumpStart (ARMV4I) -project.replaceSourceFiles = .\\src\\WinDriver.cpp > .\\src\\WinCEDriver.cpp -project.targetArchitecture = ARMV4I -project.targetPlatform = WINDOWS_CE diff --git a/ProGen/templates/vs90/WinCE/testsuite/project.template b/ProGen/templates/vs90/WinCE/testsuite/project.template deleted file mode 100644 index 6ec57f590..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_shared.template b/ProGen/templates/vs90/WinCE/testsuite/release_shared.template deleted file mode 100644 index 78c6f36da..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/release_shared.template +++ /dev/null @@ -1,93 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template b/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template deleted file mode 100644 index 45f05c051..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/release_static_md.template +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template b/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template deleted file mode 100644 index b1aea20db..000000000 --- a/ProGen/templates/vs90/WinCE/testsuite/release_static_mt.template +++ /dev/null @@ -1,96 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/debug_shared.template b/ProGen/templates/vs90/x64/executable/debug_shared.template deleted file mode 100644 index a314805f6..000000000 --- a/ProGen/templates/vs90/x64/executable/debug_shared.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/debug_static_md.template b/ProGen/templates/vs90/x64/executable/debug_static_md.template deleted file mode 100644 index a9367979f..000000000 --- a/ProGen/templates/vs90/x64/executable/debug_static_md.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/debug_static_mt.template b/ProGen/templates/vs90/x64/executable/debug_static_mt.template deleted file mode 100644 index 75e6f93ac..000000000 --- a/ProGen/templates/vs90/x64/executable/debug_static_mt.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/project.properties b/ProGen/templates/vs90/x64/executable/project.properties deleted file mode 100644 index 258d8de5c..000000000 --- a/ProGen/templates/vs90/x64/executable/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.suffix = _x64_vs90.vcproj -project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs90/x64/executable/project.template b/ProGen/templates/vs90/x64/executable/project.template deleted file mode 100644 index 65e92894c..000000000 --- a/ProGen/templates/vs90/x64/executable/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/release_shared.template b/ProGen/templates/vs90/x64/executable/release_shared.template deleted file mode 100644 index 71bde14f7..000000000 --- a/ProGen/templates/vs90/x64/executable/release_shared.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/release_static_md.template b/ProGen/templates/vs90/x64/executable/release_static_md.template deleted file mode 100644 index 517aa6813..000000000 --- a/ProGen/templates/vs90/x64/executable/release_static_md.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/executable/release_static_mt.template b/ProGen/templates/vs90/x64/executable/release_static_mt.template deleted file mode 100644 index d5dd75840..000000000 --- a/ProGen/templates/vs90/x64/executable/release_static_mt.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/debug_shared.template b/ProGen/templates/vs90/x64/library/debug_shared.template deleted file mode 100644 index 837363c0c..000000000 --- a/ProGen/templates/vs90/x64/library/debug_shared.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/debug_static_md.template b/ProGen/templates/vs90/x64/library/debug_static_md.template deleted file mode 100644 index f151057de..000000000 --- a/ProGen/templates/vs90/x64/library/debug_static_md.template +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/debug_static_mt.template b/ProGen/templates/vs90/x64/library/debug_static_mt.template deleted file mode 100644 index 70a97cf92..000000000 --- a/ProGen/templates/vs90/x64/library/debug_static_mt.template +++ /dev/null @@ -1,74 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/project.properties b/ProGen/templates/vs90/x64/library/project.properties deleted file mode 100644 index 258d8de5c..000000000 --- a/ProGen/templates/vs90/x64/library/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.suffix = _x64_vs90.vcproj -project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs90/x64/library/project.template b/ProGen/templates/vs90/x64/library/project.template deleted file mode 100644 index 65e92894c..000000000 --- a/ProGen/templates/vs90/x64/library/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/release_shared.template b/ProGen/templates/vs90/x64/library/release_shared.template deleted file mode 100644 index 76cfc405e..000000000 --- a/ProGen/templates/vs90/x64/library/release_shared.template +++ /dev/null @@ -1,92 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/release_static_md.template b/ProGen/templates/vs90/x64/library/release_static_md.template deleted file mode 100644 index b8a141463..000000000 --- a/ProGen/templates/vs90/x64/library/release_static_md.template +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/library/release_static_mt.template b/ProGen/templates/vs90/x64/library/release_static_mt.template deleted file mode 100644 index ad3cbdcb4..000000000 --- a/ProGen/templates/vs90/x64/library/release_static_mt.template +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/plugin/debug_shared.template b/ProGen/templates/vs90/x64/plugin/debug_shared.template deleted file mode 100644 index 919c79b66..000000000 --- a/ProGen/templates/vs90/x64/plugin/debug_shared.template +++ /dev/null @@ -1,87 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/plugin/project.properties b/ProGen/templates/vs90/x64/plugin/project.properties deleted file mode 100644 index 258d8de5c..000000000 --- a/ProGen/templates/vs90/x64/plugin/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.suffix = _x64_vs90.vcproj -project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs90/x64/plugin/project.template b/ProGen/templates/vs90/x64/plugin/project.template deleted file mode 100644 index 65e92894c..000000000 --- a/ProGen/templates/vs90/x64/plugin/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/plugin/release_shared.template b/ProGen/templates/vs90/x64/plugin/release_shared.template deleted file mode 100644 index 99495a89f..000000000 --- a/ProGen/templates/vs90/x64/plugin/release_shared.template +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/debug_shared.template b/ProGen/templates/vs90/x64/testsuite/debug_shared.template deleted file mode 100644 index 04afef05e..000000000 --- a/ProGen/templates/vs90/x64/testsuite/debug_shared.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template b/ProGen/templates/vs90/x64/testsuite/debug_static_md.template deleted file mode 100644 index 75bd2f609..000000000 --- a/ProGen/templates/vs90/x64/testsuite/debug_static_md.template +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template b/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template deleted file mode 100644 index b17d78c82..000000000 --- a/ProGen/templates/vs90/x64/testsuite/debug_static_mt.template +++ /dev/null @@ -1,89 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/project.properties b/ProGen/templates/vs90/x64/testsuite/project.properties deleted file mode 100644 index 258d8de5c..000000000 --- a/ProGen/templates/vs90/x64/testsuite/project.properties +++ /dev/null @@ -1,2 +0,0 @@ -project.suffix = _x64_vs90.vcproj -project.targetArchitecture = AMD64 diff --git a/ProGen/templates/vs90/x64/testsuite/project.template b/ProGen/templates/vs90/x64/testsuite/project.template deleted file mode 100644 index 65e92894c..000000000 --- a/ProGen/templates/vs90/x64/testsuite/project.template +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/release_shared.template b/ProGen/templates/vs90/x64/testsuite/release_shared.template deleted file mode 100644 index a09d6d7a6..000000000 --- a/ProGen/templates/vs90/x64/testsuite/release_shared.template +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_md.template b/ProGen/templates/vs90/x64/testsuite/release_static_md.template deleted file mode 100644 index 2b8bbefc5..000000000 --- a/ProGen/templates/vs90/x64/testsuite/release_static_md.template +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template b/ProGen/templates/vs90/x64/testsuite/release_static_mt.template deleted file mode 100644 index a2a5a718b..000000000 --- a/ProGen/templates/vs90/x64/testsuite/release_static_mt.template +++ /dev/null @@ -1,91 +0,0 @@ - - - - - - - - - - - - - - - - - - - diff --git a/Redis/Redis_vs100.vcxproj b/Redis/Redis_vs100.vcxproj index 72f09aad9..8d2d54925 100644 --- a/Redis/Redis_vs100.vcxproj +++ b/Redis/Redis_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Redis\$(Configuration)\ PocoRedisd - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoRedismtd.lib + %(AdditionalDependencies) + ..\lib\PocoRedisMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoRedismt.lib + %(AdditionalDependencies) + ..\lib\PocoRedisMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoRedismdd.pdb + ..\lib\PocoRedisMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoRedismdd.lib + %(AdditionalDependencies) + ..\lib\PocoRedisMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoRedismd.lib + ..\lib\PocoRedisMD.lib @@ -294,6 +297,7 @@ + diff --git a/Redis/Redis_vs100.vcxproj.filters b/Redis/Redis_vs100.vcxproj.filters index c875a8004..727391147 100644 --- a/Redis/Redis_vs100.vcxproj.filters +++ b/Redis/Redis_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {d6cf8d8f-b244-4337-b52e-c991b2697c1c} + {8d8bb44f-16fb-44d0-b847-4f156c72f3f9} - {9dde7f9c-d2c5-4f58-a31a-af4f04a23082} + {f0697ab2-ecbd-4dc2-bc70-eeba13905451} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_vs110.vcxproj b/Redis/Redis_vs110.vcxproj index c4f87a532..81f2c0c19 100644 --- a/Redis/Redis_vs110.vcxproj +++ b/Redis/Redis_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoRedisd - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoRedismtd.lib + ..\lib\PocoRedisMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoRedismt.lib + ..\lib\PocoRedisMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoRedismdd.pdb + ..\lib\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoRedismdd.lib + ..\lib\PocoRedisMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoRedismd.lib + ..\lib\PocoRedisMD.lib @@ -285,7 +285,6 @@ - @@ -296,6 +295,7 @@ + diff --git a/Redis/Redis_vs110.vcxproj.filters b/Redis/Redis_vs110.vcxproj.filters index a2960112e..6a63327b9 100644 --- a/Redis/Redis_vs110.vcxproj.filters +++ b/Redis/Redis_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {95229aa7-64b5-423e-bbfd-25d4c79aff38} + {e18ef628-4b08-4e1f-9b3e-6d663db81dbf} - {bd5b74f9-bdcb-4b0b-ac46-c57d0e9bf1ad} + {a512c4ee-cf52-4d34-9edd-d19aa446b16a} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_vs120.vcxproj b/Redis/Redis_vs120.vcxproj index 5d2c4a403..bbe6c6bf8 100644 --- a/Redis/Redis_vs120.vcxproj +++ b/Redis/Redis_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoRedisd - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoRedismtd.lib + ..\lib\PocoRedisMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoRedismt.lib + ..\lib\PocoRedisMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoRedismdd.pdb + ..\lib\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoRedismdd.lib + ..\lib\PocoRedisMDd.lib @@ -272,11 +272,10 @@ Default - ..\lib\PocoRedismd.lib + ..\lib\PocoRedisMD.lib - @@ -296,6 +295,7 @@ + diff --git a/Redis/Redis_vs120.vcxproj.filters b/Redis/Redis_vs120.vcxproj.filters index c69d39db7..077d908d5 100644 --- a/Redis/Redis_vs120.vcxproj.filters +++ b/Redis/Redis_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {14a6448d-f227-45a3-b077-55da84d9fb78} + {78095a74-d8bf-42b2-8a89-3b7d384d305f} - {4d1c4995-75ad-416d-b815-3a0e39ca9e7a} + {4c5137ad-6ea4-4c46-b934-0d23e8607776} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_vs140.vcxproj b/Redis/Redis_vs140.vcxproj index f601c36fe..5929f2874 100644 --- a/Redis/Redis_vs140.vcxproj +++ b/Redis/Redis_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoRedisd - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoRedismtd.lib + ..\lib\PocoRedisMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoRedismt.lib + ..\lib\PocoRedisMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoRedismdd.pdb + ..\lib\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoRedismdd.lib + ..\lib\PocoRedisMDd.lib @@ -272,11 +272,10 @@ Default - ..\lib\PocoRedismd.lib + ..\lib\PocoRedisMD.lib - @@ -296,6 +295,7 @@ + diff --git a/Redis/Redis_vs140.vcxproj.filters b/Redis/Redis_vs140.vcxproj.filters index e5a21e79c..df053661f 100644 --- a/Redis/Redis_vs140.vcxproj.filters +++ b/Redis/Redis_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {44f52e4a-db1a-4f79-ae54-8b75e4163917} + {5d28065a-05fd-4df0-8f76-7306823367e2} - {8423e460-dafe-48c5-bd99-9a1d08cb9be8} + {e4b5734a-6e11-4f45-80af-ccc6a8ee25d7} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_vs150.vcxproj b/Redis/Redis_vs150.vcxproj index 567a93f99..746c2bda7 100644 --- a/Redis/Redis_vs150.vcxproj +++ b/Redis/Redis_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoRedisd - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoRedismtd.lib + ..\lib\PocoRedisMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoRedismt.lib + ..\lib\PocoRedisMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoRedismdd.pdb + ..\lib\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoRedismdd.lib + ..\lib\PocoRedisMDd.lib @@ -272,11 +272,10 @@ Default - ..\lib\PocoRedismd.lib + ..\lib\PocoRedisMD.lib - @@ -296,6 +295,7 @@ + diff --git a/Redis/Redis_vs150.vcxproj.filters b/Redis/Redis_vs150.vcxproj.filters index 66ab82aee..e36253d44 100644 --- a/Redis/Redis_vs150.vcxproj.filters +++ b/Redis/Redis_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {c4811399-7521-409a-a06c-4c5626acb9b1} + {4b5122e3-ef0c-4722-8de0-04caa335a49b} - {1df7b5eb-b3f9-4067-8bfe-745c97f8fe4c} + {420b907e-b652-4224-bb0a-9b4bd6a76e78} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_vs90.vcproj b/Redis/Redis_vs90.vcproj index 9dfe61194..2f0b2b3a6 100644 --- a/Redis/Redis_vs90.vcproj +++ b/Redis/Redis_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoRedisMTd.lib"/> + OutputFile="..\lib\PocoRedisMT.lib"/> + OutputFile="..\lib\PocoRedisMDd.lib"/> + OutputFile="..\lib\PocoRedisMD.lib"/> + RelativePath=".\include\Poco\Redis\RedisEventArgs.h"/> ..\lib64\ obj64\Redis\$(Configuration)\ PocoRedis64d - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis64 - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoRedismtd.lib + %(AdditionalDependencies) + ..\lib64\PocoRedisMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoRedismt.lib + %(AdditionalDependencies) + ..\lib64\PocoRedisMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoRedismdd.pdb + ..\lib64\PocoRedisMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoRedismdd.lib + %(AdditionalDependencies) + ..\lib64\PocoRedisMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoRedismd.lib + %(AdditionalDependencies) + ..\lib64\PocoRedisMD.lib + MachineX64 @@ -292,6 +300,7 @@ + diff --git a/Redis/Redis_x64_vs100.vcxproj.filters b/Redis/Redis_x64_vs100.vcxproj.filters index b0ea241f9..589598202 100644 --- a/Redis/Redis_x64_vs100.vcxproj.filters +++ b/Redis/Redis_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {7f0d99f5-2fe4-419d-8f7d-dc48dc0c2446} + {933e443a-9973-4cf9-baca-445b1ae5f098} - {d4d04d27-72a3-4488-a8b0-b29f2d09dd80} + {d921dc6d-735d-4af0-a441-0ad94d724fda} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_x64_vs110.vcxproj b/Redis/Redis_x64_vs110.vcxproj index 080b04eff..01a5aa0b8 100644 --- a/Redis/Redis_x64_vs110.vcxproj +++ b/Redis/Redis_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoRedis64d - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis64 - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoRedismtd.lib + ..\lib64\PocoRedisMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoRedismt.lib + ..\lib64\PocoRedisMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoRedismdd.pdb + ..\lib64\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoRedismdd.lib + ..\lib64\PocoRedisMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoRedismd.lib + ..\lib64\PocoRedisMD.lib + MachineX64 @@ -284,7 +288,6 @@ - @@ -295,6 +298,7 @@ + diff --git a/Redis/Redis_x64_vs110.vcxproj.filters b/Redis/Redis_x64_vs110.vcxproj.filters index 6ef8f0524..7d9cc9108 100644 --- a/Redis/Redis_x64_vs110.vcxproj.filters +++ b/Redis/Redis_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {955e3c47-0978-40c7-a857-f8e75f96551b} + {9da57fb5-8a1e-41f0-a923-f99c995b2a93} - {74b726f4-5a4d-4866-94f5-82f8655aee7a} + {8573bac2-af32-4d5a-baa7-8f0aae30e6ce} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_x64_vs120.vcxproj b/Redis/Redis_x64_vs120.vcxproj index 3c4245317..b197ae2c7 100644 --- a/Redis/Redis_x64_vs120.vcxproj +++ b/Redis/Redis_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoRedis64d - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis64 - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoRedismtd.lib + ..\lib64\PocoRedisMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoRedismt.lib + ..\lib64\PocoRedisMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoRedismdd.pdb + ..\lib64\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoRedismdd.lib + ..\lib64\PocoRedisMDd.lib + MachineX64 @@ -271,11 +274,11 @@ Default - ..\lib64\PocoRedismd.lib + ..\lib64\PocoRedisMD.lib + MachineX64 - @@ -295,6 +298,7 @@ + diff --git a/Redis/Redis_x64_vs120.vcxproj.filters b/Redis/Redis_x64_vs120.vcxproj.filters index 8531e715b..dd835cfb6 100644 --- a/Redis/Redis_x64_vs120.vcxproj.filters +++ b/Redis/Redis_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {c75a04c4-d096-402f-b732-14eb23070c5f} + {afafff0d-eb90-4429-9bf2-30a274f9e06e} - {811986ae-819b-4804-b563-bf0ffd32553b} + {0897832c-7cae-481e-ab53-57717c0a3b31} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_x64_vs140.vcxproj b/Redis/Redis_x64_vs140.vcxproj index d99b431e1..8afc348f6 100644 --- a/Redis/Redis_x64_vs140.vcxproj +++ b/Redis/Redis_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoRedis64d - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis64 - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoRedismtd.lib + ..\lib64\PocoRedisMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoRedismt.lib + ..\lib64\PocoRedisMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoRedismdd.pdb + ..\lib64\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoRedismdd.lib + ..\lib64\PocoRedisMDd.lib + MachineX64 @@ -271,11 +274,11 @@ Default - ..\lib64\PocoRedismd.lib + ..\lib64\PocoRedisMD.lib + MachineX64 - @@ -295,6 +298,7 @@ + diff --git a/Redis/Redis_x64_vs140.vcxproj.filters b/Redis/Redis_x64_vs140.vcxproj.filters index d0f99cc05..20a347b5f 100644 --- a/Redis/Redis_x64_vs140.vcxproj.filters +++ b/Redis/Redis_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {5fbbd88f-ad37-43a2-9ac2-8965e8f7d855} + {99fc4529-cee7-4395-b61e-205963852ef3} - {bd3476ff-ce88-4f53-8704-60dd3ec8c9e7} + {df50c605-18de-48e5-bf65-71e37dc76423} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_x64_vs150.vcxproj b/Redis/Redis_x64_vs150.vcxproj index 8bfcd5fbd..c599cbe53 100644 --- a/Redis/Redis_x64_vs150.vcxproj +++ b/Redis/Redis_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoRedis64d - PocoRedismdd - PocoRedismtd + PocoRedisMDd + PocoRedisMTd PocoRedis64 - PocoRedismd - PocoRedismt + PocoRedisMD + PocoRedisMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoRedismtd.lib + ..\lib64\PocoRedisMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoRedismt.lib + ..\lib64\PocoRedisMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoRedismdd.pdb + ..\lib64\PocoRedisMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoRedismdd.lib + ..\lib64\PocoRedisMDd.lib + MachineX64 @@ -271,11 +274,11 @@ Default - ..\lib64\PocoRedismd.lib + ..\lib64\PocoRedisMD.lib + MachineX64 - @@ -295,6 +298,7 @@ + diff --git a/Redis/Redis_x64_vs150.vcxproj.filters b/Redis/Redis_x64_vs150.vcxproj.filters index df95555eb..29af39ddf 100644 --- a/Redis/Redis_x64_vs150.vcxproj.filters +++ b/Redis/Redis_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {4e62195a-b9b9-4930-a809-3ac6b3dc721c} + {58387876-6c8f-48f6-97cc-e5b32c9d0c0d} - {384ede37-13a0-48a3-824c-011c84bbff08} + {8e501c89-9676-4fde-97ef-3bed19d91fb1} @@ -36,9 +36,6 @@ Source Files - - Header Files - @@ -65,6 +62,9 @@ Header Files + + Header Files + Header Files diff --git a/Redis/Redis_x64_vs90.vcproj b/Redis/Redis_x64_vs90.vcproj index 6b31965f1..632168077 100644 --- a/Redis/Redis_x64_vs90.vcproj +++ b/Redis/Redis_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoRedismdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoRedisMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> @@ -433,7 +433,7 @@ + RelativePath=".\include\Poco\Redis\RedisEventArgs.h"/> ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Redis/testsuite/TestSuite_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_vs100.vcxproj.filters index 64b71a583..951eaec7f 100644 --- a/Redis/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {d6284716-2016-49ba-8bfd-b28a101077cf} + {1b73e615-ac17-4196-a07f-5f288565bbd4} - {34076047-ce5c-4386-ae42-18ef89f07cee} + {e8e53956-3111-45be-8634-d8504abaaddb} diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj b/Redis/testsuite/TestSuite_vs110.vcxproj index 20cabb1fc..a99169dab 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_vs110.vcxproj @@ -211,7 +211,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Redis/testsuite/TestSuite_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_vs110.vcxproj.filters index a826c0c88..d28a9ca70 100644 --- a/Redis/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {61aeb5bc-8562-4519-8684-e240a52e3466} + {2ec501ec-9493-4a7a-99a2-3cb42627a343} - {b264f480-8c54-4ea7-9e3c-7abadb1ef7d1} + {32dd1566-ce55-43a4-8c66-9cb2ae840192} diff --git a/Redis/testsuite/TestSuite_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_vs120.vcxproj.filters index 4276fca87..377d927fd 100644 --- a/Redis/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {606458e4-d55e-475a-b9c6-480bbed80068} + {4fe06581-4128-4e1a-8cf3-24867f3a4d09} - {c669cafa-cb85-42e7-941b-6ffab50a5a2e} + {84645288-c714-422c-9d64-a29960e046a0} diff --git a/Redis/testsuite/TestSuite_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_vs140.vcxproj.filters index 448016cf9..637059084 100644 --- a/Redis/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {0108e2eb-0827-4bae-8ad2-65c012e2f196} + {8e069116-449a-42bf-a220-98e789061645} - {c1277a40-384b-4857-a91a-ccf02b1130be} + {9ca2ec5e-cab3-45b7-8f95-a11eb0e9cfab} diff --git a/Redis/testsuite/TestSuite_vs150.vcxproj.filters b/Redis/testsuite/TestSuite_vs150.vcxproj.filters index ad694f21e..d1ad9ff72 100644 --- a/Redis/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {ad56db14-dd9e-4a6a-9cea-eefcedca0129} + {306338de-6d1c-45d7-ab76-a0451d6c84cd} - {eb2c4e47-8e4d-4b08-95be-3c46479fd1c0} + {e4513b0c-6784-4525-8a86-08bedf4670d4} diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj b/Redis/testsuite/TestSuite_x64_vs100.vcxproj index e19f9c127..ce938eb6e 100644 --- a/Redis/testsuite/TestSuite_x64_vs100.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj @@ -201,7 +201,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -236,7 +236,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters index a0f43abe5..119eca793 100644 --- a/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,10 +2,10 @@ - {a4af758c-8fb3-48d7-98f8-6b149650af0f} + {624923de-f701-4bf2-959c-f1ddfec7f5fb} - {2f339c05-3a8d-48e9-b395-0b663e554ed0} + {fb9a9080-1254-45ed-8ab0-7fe73b47c200} diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj b/Redis/testsuite/TestSuite_x64_vs110.vcxproj index 65ab4cf25..164fb1627 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj @@ -211,7 +211,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -243,7 +243,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true diff --git a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters index b438500c9..5fe6288db 100644 --- a/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,10 +2,10 @@ - {5257043c-58c5-4ea2-b45e-a8ecc08dd370} + {5b6e1b9c-3d3e-44eb-a19b-cc53f19c277d} - {01bec204-e7e1-4b3a-89ab-7bbf86a0e73c} + {763bcc53-6268-4b21-90d8-cccffe9d915e} diff --git a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters index 41586d70a..3d4957fd2 100644 --- a/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,10 +2,10 @@ - {cea25085-dd95-4810-b6b7-45618e72f3db} + {76b6a575-e42f-4fee-9aaf-65e71b85e88e} - {51414225-6e3d-496f-9291-61e7d97427af} + {2e37658c-2feb-48c5-85b9-378bf832b041} diff --git a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters index 527cb7d0e..30b09cd4f 100644 --- a/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,10 +2,10 @@ - {f49d2c7e-14e8-408d-a941-d61e966698bc} + {4b779996-bfa8-4535-9a31-3eab7a711e8c} - {01bd3d98-e481-4afd-8b7f-209aae8a96ab} + {26d29a84-c645-4790-a545-d2d1dcea50b1} diff --git a/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters index 103079f40..ba8294fe9 100644 --- a/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Redis/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,10 +2,10 @@ - {09724be2-5f6d-4c65-a16f-1df3f67c359d} + {1145ead7-bdac-4c62-9fb9-b84e529c8958} - {031a59b1-6652-40ce-8713-d7cf28985ca2} + {63742877-6446-49ba-8700-ea5568eebb8f} diff --git a/SevenZip/SevenZip_CE_vs90.vcproj b/SevenZip/SevenZip_CE_vs90.vcproj index aaeacf54a..00d62588a 100644 --- a/SevenZip/SevenZip_CE_vs90.vcproj +++ b/SevenZip/SevenZip_CE_vs90.vcproj @@ -198,7 +198,7 @@ BufferSecurityCheck="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoSevenZipmtd.pdb" + ProgramDataBaseFileName="..\lib\$(PlatformName)\PocoSevenZipMTd.pdb" WarningLevel="3" DebugInformationFormat="3" CompileAs="0" @@ -214,7 +214,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoSevenZipMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoSevenZipMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoSevenZipMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoSevenZipMD.lib"/> + OutputFile="..\lib\PocoSevenZipMTd.lib"/> + OutputFile="..\lib\PocoSevenZipMT.lib"/> + OutputFile="..\lib\PocoSevenZipMDd.lib"/> + OutputFile="..\lib\PocoSevenZipMD.lib"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoSevenZipmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoSevenZipMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Util/Util_CE_vs90.vcproj b/Util/Util_CE_vs90.vcproj index cbf93c786..e37089afb 100644 --- a/Util/Util_CE_vs90.vcproj +++ b/Util/Util_CE_vs90.vcproj @@ -56,7 +56,7 @@ + OutputFile="..\lib\$(PlatformName)\PocoUtilMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoUtilMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT diff --git a/Util/Util_WEC2013_vs110.vcxproj.filters b/Util/Util_WEC2013_vs110.vcxproj.filters index 3fdbfe2b6..a90ab7451 100644 --- a/Util/Util_WEC2013_vs110.vcxproj.filters +++ b/Util/Util_WEC2013_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {fac414a4-35fd-476a-9273-535afabcd5ec} + {72391f16-a995-47cb-a939-5fed23dacddd} - {ced563d3-47c6-4cb4-8843-c61f9a5995d8} + {4141c19a-1efe-42b5-88e1-03b32b56f6b6} - {5b8cd19c-1b63-442c-b9cf-b664e65db7c8} + {d504b2cf-2437-4e49-b00e-45d305828f6b} - {52c78bf3-91e5-44ae-9473-63d89ce08b79} + {eccb6c54-e8c6-438c-b537-0c66dbcbfd34} - {733886ef-c91f-49d1-b5b9-bc31b1c174cc} + {ac6bdd90-8e73-49f2-9b78-011e1c9620d5} - {70a5ae5e-0525-4438-b7fa-a6d3428312d4} + {c31da52e-953a-41bc-8995-9e780742ed80} - {0d66743c-c7d9-43fe-ae7d-3aed2b66ce1e} + {c7a7aada-8a01-4475-ac1b-1524c403b9b6} - {aca62d80-99e7-483d-9545-2fa7fca60970} + {5b08bc51-bab7-4428-a42b-025d0092fad3} - {62cb8333-63f6-48d0-b4c0-4b81d16cad50} + {b7bbb873-973a-42e2-98d1-5a6acbd81abd} - {235edd0a-22f3-4914-8148-7f5ff9c9248c} + {0ae9b0ae-2713-44c3-8042-8806dbac36d8} - {14fa2d19-23cf-4e3d-ae49-031b479d0454} + {9c738bd7-6eed-4ebe-8f5d-f391db5ee97b} - {f4918e78-3bf0-488d-aa6f-a8ba7daa426c} + {6e04081b-2cb0-4481-ad55-5e1178fb6e6d} - {cba919b7-8d56-4975-912b-f4a78757b7d7} + {e6a53db2-eebe-4ab3-8ef1-f297f78e7322} - {e678101a-2f42-4144-b1f2-d1baa1d94a7d} + {5bce8013-47e9-412a-b910-c77ffadf382c} - {b9ae4857-2b99-4d0c-9b7e-c46888807691} + {3ffbfc1e-86fa-420f-b9e6-ae39900cc0a1} - {1c7ba7b2-a88d-43e3-b5dd-ab49808ca000} + {0435861c-0e60-400d-8941-7343d810c9bb} - {cdbfa108-5d8d-48a8-b3ac-d8570fa56ffd} + {f88ea10f-d6dd-4c76-966b-b07d11f4a046} - {ee88b0e9-cd7f-41a8-9938-132a5bd302ae} + {05ed1e82-3868-4853-a867-c3131afc0fb3} diff --git a/Util/Util_WEC2013_vs120.vcxproj b/Util/Util_WEC2013_vs120.vcxproj index 5e79fe58f..9a7d31372 100644 --- a/Util/Util_WEC2013_vs120.vcxproj +++ b/Util/Util_WEC2013_vs120.vcxproj @@ -50,11 +50,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT diff --git a/Util/Util_WEC2013_vs120.vcxproj.filters b/Util/Util_WEC2013_vs120.vcxproj.filters index e17361163..7297a5ad1 100644 --- a/Util/Util_WEC2013_vs120.vcxproj.filters +++ b/Util/Util_WEC2013_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {18187faa-7823-4f58-8086-18fa15b54319} + {5ddedf55-eaad-46d9-a685-a98c73b25aa9} - {61feeda3-4886-4496-bc05-df931def5a5b} + {b59815f6-6a54-4b9d-9ca2-3f3010e9bdd6} - {967c93d8-b023-4013-a593-91df3fb6826f} + {43daa6c8-bba8-466c-9c53-615a26e2ef9a} - {efe971f2-f65d-41da-9b4d-74631426d1db} + {25a1330d-7508-402b-9cb7-92fe8c223db0} - {4faa19c1-68f5-4c59-970a-bf3d289e09e6} + {b5ffa5f3-2877-4e7a-b44c-fce933026696} - {263f0496-bd7a-4ea9-b605-510ac994cde5} + {0818eeb7-9b17-459d-ba03-a7246162ed95} - {ee9d0615-62dd-4ff5-a638-0f3f2ff13e36} + {a158898e-682c-43a9-a1e1-152a15e87060} - {957853e5-bbd3-49de-9b7d-901bdbbcaa5a} + {dc6eaceb-67d9-4d3f-ab78-40182acd4e3e} - {7d6cde4f-0710-4e67-a1d3-2f4658a7eef9} + {91458acd-6a6e-430f-a401-a98c7d2454a8} - {fa39de8c-6601-42ef-9108-e6432813ff11} + {f8d70b8b-6a79-42d6-af9f-758b4e74b696} - {9c5df186-d542-4525-af98-edf260b39418} + {7187da0b-5d8b-4239-9889-ff14110a97d3} - {c852213f-b3c9-4cf9-b96f-a825d00d131c} + {ea2961f4-7234-4f34-a12f-c6297d333a18} - {20004264-1c63-482b-ad07-2617ad763eac} + {55d66327-250e-4037-b843-3d70bf81dc23} - {de2cb63e-2331-464f-a639-e32d0eba80d1} + {8f1a93ad-803e-4a05-a9cb-1ed649fc69ac} - {49a0439c-d961-4586-9434-c6e87a45f6cb} + {4c19ee2c-0ba3-48a9-b227-5581409d5428} - {97312381-c8e2-47ea-806b-a8a4d578d405} + {b41d064f-6bc9-4d35-8469-6fc933b4ef56} - {950c314c-935b-463a-8a94-29d0158c3ee4} + {f4e052e1-61f9-4867-9e37-aefdde24bd95} - {c6766904-8106-4aea-b204-e06b7651db60} + {d235e610-26f3-4e9f-b2d9-92aee0214848} diff --git a/Util/Util_vs100.vcxproj b/Util/Util_vs100.vcxproj index 2e4803e12..185e24558 100644 --- a/Util/Util_vs100.vcxproj +++ b/Util/Util_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Util\$(Configuration)\ PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoUtilmtd.lib + %(AdditionalDependencies) + ..\lib\PocoUtilMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoUtilmt.lib + %(AdditionalDependencies) + ..\lib\PocoUtilMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoUtilmdd.pdb + ..\lib\PocoUtilMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoUtilmdd.lib + %(AdditionalDependencies) + ..\lib\PocoUtilMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoUtilmd.lib + ..\lib\PocoUtilMD.lib diff --git a/Util/Util_vs100.vcxproj.filters b/Util/Util_vs100.vcxproj.filters index e12bbaeaf..280973ab7 100644 --- a/Util/Util_vs100.vcxproj.filters +++ b/Util/Util_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {9661e43a-b3ca-4d8d-8461-291e8509e38a} + {ebd2cb97-ee01-43ef-be42-4bd845295bb4} - {c39fe98f-c8ac-409b-b382-d3831397c6e2} + {3809a7dd-6675-44a5-acba-c93cbacaf1e6} - {6709fcd9-12bd-47fe-9cbe-20f33fa496d1} + {eeeea169-054f-4f14-a876-abf7fa12ef19} - {cc89fa8c-a77e-42d2-bf0f-2e845b4df149} + {7c4a74a1-acbf-407a-ae04-d4d5ea336263} - {4a2fc783-e4a2-4ff6-8f0c-6a506656faaf} + {ecbb54d5-1098-4d56-905a-f88f2f480693} - {27ca55c6-4839-411c-8a11-c7bae4248dbc} + {36df7c69-e7e9-4c51-a7e3-af65b873242a} - {112ed58f-cb70-4fbe-b73a-9955fa066384} + {e97c6f0f-ec2e-41e4-ae5a-c19f71e5ff9f} - {c21f368e-a27e-4d86-a28a-0a7c18f6a4a6} + {947b37d3-6ba1-419d-a1f8-d12524a92a6c} - {226e2174-a131-4c3d-ad70-94dca4eea6c0} + {d1273e60-a583-4019-8640-dfc76a7fa6fd} - {8670ae11-5b87-4d8c-b70b-92cf33674f9d} + {97d02159-4138-4ea2-b9db-d33ae5e5aa94} - {9f9f3b12-825a-4bbd-b1cd-70e8915d757e} + {f25acc3c-3ae7-4db6-8a4d-aad47c67ba85} - {857d9f65-4579-4e9f-ade2-191425bf2f04} + {996e25dc-db6f-4a88-8296-ee429b7bfcbc} - {d34c7e39-a8b6-48b2-8ad4-383c6aabce9d} + {7a5ae026-7738-438f-a24f-b55b0c3f9892} - {e67a634d-c0e4-4aa2-bc22-2137f5d00f9d} + {f3004a40-a40f-4e64-935d-beee7e2be10e} - {35a15693-4eac-40a0-b865-eaf333f329c2} + {1487788b-9bb5-4cf7-8f03-b1e09ba8f5ed} - {763c576d-d92a-41b6-8b2c-febde1a0ae34} + {052180df-87af-444f-82c2-1b01e9813a49} - {5216805a-851d-4791-8195-20cf23ebe7f1} + {1a78d115-5f23-45bb-85c0-cd189e6a88db} - {03961563-12a8-4f1d-ab02-a259660816c9} + {3033a16a-f97a-4865-9659-443881fafac9} diff --git a/Util/Util_vs110.vcxproj b/Util/Util_vs110.vcxproj index 1d9c114ab..bf4c94a0d 100644 --- a/Util/Util_vs110.vcxproj +++ b/Util/Util_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoUtilmtd.lib + ..\lib\PocoUtilMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoUtilmt.lib + ..\lib\PocoUtilMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoUtilmdd.pdb + ..\lib\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoUtilmdd.lib + ..\lib\PocoUtilMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoUtilmd.lib + ..\lib\PocoUtilMD.lib diff --git a/Util/Util_vs110.vcxproj.filters b/Util/Util_vs110.vcxproj.filters index b616782a7..07bb464d6 100644 --- a/Util/Util_vs110.vcxproj.filters +++ b/Util/Util_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {e4fc22be-4c3e-4cd5-91ac-36f3148473c1} + {eef0b3aa-1013-4541-885f-87aa1fe4122f} - {737c51b7-217e-486a-b891-5c6375b025bf} + {bf0b181d-b280-4a93-b43e-457c1d9fce20} - {0b3709b9-dee0-414d-a3de-ff417ec1843b} + {551bde4d-9ec8-4ad0-9e5d-23f6adf71e83} - {7c2fc2fa-844e-492d-8ee8-761ad18488a8} + {bf9c08ce-b681-4dd2-acc2-3d96618f43c8} - {a9bcebd4-2ada-4216-8e79-da36b537cab6} + {a1e3a512-7cd7-4050-9d08-9b3c46986212} - {89ef3bec-1db2-4fcf-bb14-eed2c580b18d} + {1ed8219a-d5a5-4610-97f9-dc11eb67ab1d} - {8efb3c1c-d58e-47e8-ad07-d7ee734e49d2} + {6a5b0461-880d-49a5-8686-c2a3198887d1} - {f2614c20-8429-4840-bdc1-39286d0d2352} + {65ef5638-8faa-4d38-95a7-3009c5224317} - {306d351d-f443-44fb-8962-29cc39e0b591} + {406c13c1-f39a-4342-9878-72f97572b1be} - {cbd4b9d0-9593-412b-aa4f-edccaa530fa4} + {0d8e2875-9a92-44ef-ba57-f29590e31070} - {7c41c81b-9ba5-44d2-ad16-7ab21ff7df66} + {1c1a7d8e-fa74-4834-975a-dc0dea152f12} - {8696e6be-c9c3-4499-a891-4e3b6599c133} + {e61934eb-68cb-4137-94d5-c4b08b87298a} - {5464bb0f-0dd9-4ec9-96a1-cc3fdcdb238b} + {e89dd432-f8ea-4de1-8b15-d8357a2e78d8} - {ef487063-daf0-432f-973c-cd17df45688e} + {a5d1700a-b615-4800-8177-1ba734fccbf0} - {064dfd05-08dc-42e9-8098-6b1c4de74d29} + {06cc2604-c394-4b92-9c72-7320f6582433} - {7e3b8428-f341-49d0-928f-d89be59b8b01} + {e7fdbf57-89f3-4838-a21f-87c88c81d3f4} - {05a7c8c6-7452-46a9-b1da-f53c394dc868} + {7342da86-f365-4c37-b76d-65be285bbf89} - {658cc724-0bfa-4133-b1b5-bdcbbddbb61d} + {c1d67e94-1768-44bd-b2dc-a2a241bd176f} diff --git a/Util/Util_vs120.vcxproj b/Util/Util_vs120.vcxproj index 742135f07..21b691723 100644 --- a/Util/Util_vs120.vcxproj +++ b/Util/Util_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoUtilmtd.lib + ..\lib\PocoUtilMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoUtilmt.lib + ..\lib\PocoUtilMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoUtilmdd.pdb + ..\lib\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoUtilmdd.lib + ..\lib\PocoUtilMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoUtilmd.lib + ..\lib\PocoUtilMD.lib diff --git a/Util/Util_vs120.vcxproj.filters b/Util/Util_vs120.vcxproj.filters index 1779f6356..b476020f6 100644 --- a/Util/Util_vs120.vcxproj.filters +++ b/Util/Util_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {74792b5b-80be-4ffd-9ea6-7c0a42050d9f} + {2d7dea50-3f2d-4065-b96d-17999cbbeb26} - {6ad079d9-74cd-4cb1-8e2e-a1e53f884888} + {657ead06-2440-4cef-8c82-52522ae9361b} - {c7bb5a47-ae9a-4ab5-8c68-f438acec99ec} + {6b1eb30a-7e4c-4690-bceb-84a31ad1b8be} - {b2e5ced7-c417-47a0-a5f9-60af24f64872} + {b7d798a7-d5e1-4bca-9a07-31e84929628e} - {8494492a-dcfb-4c35-a7c4-3fce74b8f673} + {194c0502-5d3f-4f9a-92dd-fe5fedebec8c} - {d7e01937-0d7e-4a84-a075-1d319796c3e1} + {969f66e0-e686-40e7-9c98-c976d0206fa3} - {a4b50747-ba78-472a-8469-8afc406ad292} + {9c12d63e-24b0-44dd-8aad-5094add0dada} - {56b4d931-1076-4b62-b945-53d431019427} + {aa2b013b-d372-4d8c-80c3-034f346fa153} - {477b23cf-c024-436f-8cec-9d3f0359598f} + {7f66607c-39a3-479c-81c9-a82e994cb9c9} - {1cc5decf-092c-4c88-9805-5e9560c7fea9} + {0086f8e5-dcc0-496f-9ad3-190aa6e61944} - {93e63a6e-2301-4c19-bd04-1688bca1a72e} + {97abf740-f330-43df-8c96-df7de73dcc48} - {76681a28-b663-413a-a093-3300f65b27a8} + {d18afee4-c497-412b-bb6a-779f66e51438} - {03a06149-4ac8-40c9-a3d8-85ecfbf4d427} + {e20667d7-b8dd-4be3-afdf-14ba5afb678e} - {3297b1f8-38b5-4205-8aef-808cb2f87325} + {3a96174b-9fc3-410e-a193-30eb4710a5b0} - {8edd3d27-93f0-4899-b2b2-5fcfa63a9778} + {4b1b5ac1-d164-4441-96f0-654f443af16f} - {2a531f86-e273-4742-b2e7-b10d3843e733} + {0681bc25-46ef-4a82-be42-f5eb74e2348f} - {80602cc8-826e-4752-b7d8-3ca3bc56a0c0} + {eb0a8a6d-e55c-4a2b-b2db-a949c2af91cb} - {c22c3758-d190-47a6-aff6-2215afbe1b4d} + {9a92b9a9-3b9e-44cc-8372-59f933592665} diff --git a/Util/Util_vs140.vcxproj b/Util/Util_vs140.vcxproj index 58698e0c8..5848453bd 100644 --- a/Util/Util_vs140.vcxproj +++ b/Util/Util_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoUtilmtd.lib + ..\lib\PocoUtilMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoUtilmt.lib + ..\lib\PocoUtilMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoUtilmdd.pdb + ..\lib\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoUtilmdd.lib + ..\lib\PocoUtilMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoUtilmd.lib + ..\lib\PocoUtilMD.lib diff --git a/Util/Util_vs140.vcxproj.filters b/Util/Util_vs140.vcxproj.filters index b9ff89609..ed0ba5a63 100644 --- a/Util/Util_vs140.vcxproj.filters +++ b/Util/Util_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {85cd007d-db8b-46ab-95bc-49dd48c99e0a} + {b9483f72-21ed-49d9-a95a-bc0a714c5fe0} - {59d427d8-5fdc-4bd7-813c-7e5d9bb87399} + {1035ec4e-e227-42e0-8e04-8df9a2b60237} - {388f81c0-6610-4ec3-9d6c-0495a8d5bc9b} + {9a7593c3-51af-4147-a6c9-b757dffd195a} - {e178cf93-3656-4c80-8cc2-d825961e8ac7} + {a593e04d-651c-477b-87ef-adc2d2119f4e} - {01683869-b03c-4231-926c-c0af26abc4ae} + {e41ba7fc-5727-4b13-adb9-9d5697a208aa} - {3e4618f1-c4b6-4fd5-a072-53b3afe3bb96} + {49a9be50-143e-4bad-86bf-9db619c75777} - {035f5e30-8e7b-4b99-9511-ed2342780519} + {3b447bea-9e15-41a8-aefd-f58039ac7fe1} - {8d5384ce-0bc9-4485-abcc-10c76a1f671d} + {7effca22-8d78-4f99-a06b-931e42954964} - {bcbc3dd2-5d5c-449f-961b-3b3fac98b13b} + {00a627ce-bab6-4afd-89d5-0144fc38ad1b} - {50271a87-ff12-4034-bade-67aec418824f} + {9111afcf-fe73-435c-84f7-83fbe812260f} - {bc96a551-3d1e-4052-ab52-6bf98e6d18da} + {0cf16e63-2be6-4939-9220-ef35281ea64f} - {b6b0f07b-8cea-4143-b899-0de1427cb37b} + {f57aa4cf-35ae-454b-b8ea-811ac6f00592} - {5059f955-49df-40bb-8f6b-4f3c8cac6642} + {38262115-d8f4-4a4b-9dd2-7aee789329e4} - {717cdcd2-2136-460c-8b20-d21e501b8ca6} + {191b2dc1-d5d9-4a4a-a89d-2351457123bb} - {68ea5a0c-92ac-4ed0-b259-b1b473a9a36e} + {3cd46be9-6fa7-4a82-b3cb-d4184f3837e6} - {90476503-63c0-4488-aab6-b4ca1b0e4cd2} + {ddcd5c59-d392-4742-92f7-d58c503b89da} - {600ffe18-713b-4ca3-9636-d5166bbcd204} + {45dfccb4-6e68-4fec-8d7d-1add3c05d664} - {dcb28c26-9df3-4827-a4c0-770d8a98ba05} + {b8345bb8-2621-4b9b-851b-6979c8d1a059} diff --git a/Util/Util_vs150.vcxproj b/Util/Util_vs150.vcxproj index ec8357427..ad0bc70d9 100644 --- a/Util/Util_vs150.vcxproj +++ b/Util/Util_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoUtild - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoUtilmtd.lib + ..\lib\PocoUtilMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoUtilmt.lib + ..\lib\PocoUtilMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoUtilmdd.pdb + ..\lib\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoUtilmdd.lib + ..\lib\PocoUtilMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoUtilmd.lib + ..\lib\PocoUtilMD.lib diff --git a/Util/Util_vs150.vcxproj.filters b/Util/Util_vs150.vcxproj.filters index e323bdcbf..52c809811 100644 --- a/Util/Util_vs150.vcxproj.filters +++ b/Util/Util_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {e882df7a-b4bc-4af2-b55b-481b9593f3e8} + {767e34f5-fe86-4bfc-a5a7-07c66dd92a11} - {c027f63c-1747-4b7d-a68b-3802d8c0ffaf} + {d11182ca-c90a-41a0-b7ea-b61e7f930e3f} - {4fb5610f-5b0e-4c77-9459-f762b77c32a3} + {2efd0eb7-2dda-4873-bfee-983f34f6067a} - {c3a06799-2b63-475d-a102-a5e5357eb433} + {0fe811b9-580a-49a5-9599-4252780986fe} - {18ac4042-ac7e-407d-87a1-2231c92ceed2} + {1ced3b92-5e19-48af-b4d2-3090820dd5e9} - {2d23a6ab-08af-4e04-9756-47890d477276} + {31f9e79f-4770-4b6f-9ae6-002128cba87b} - {31ff1843-d998-47a6-bbeb-ceeb1e6315a0} + {28ed417a-9658-4710-92c5-31e0aa08a843} - {08f0731a-d891-4ecd-b648-2e4d24b79e26} + {f8b0473f-1cbf-4734-b5bb-e9304a53ebf7} - {4a1997c7-348d-4981-8000-3b880c2808b4} + {36502d0e-4dbb-4afd-b69a-ed441767a2e0} - {594f77a8-c373-4ccb-99ae-5aa2beb0d71f} + {cb755711-f171-495c-865f-61bb0874dc32} - {b6e35f19-a15d-45f0-9524-5963088dc0c9} + {dbbe0349-cd86-41c8-9be2-b07bb33d7d95} - {0eb8e855-d1f3-4982-bbb4-d1d53d06a410} + {406b69c6-22c5-4f01-9600-57890e3c01ac} - {5fb78f23-aa07-43a6-841d-b2b8bc5c754f} + {55c11518-7423-4222-858a-ed973e557aa4} - {a838f661-9ea4-4eec-b625-e8f2ff9a8027} + {be2f45da-c99d-4044-b2ab-2f765376a261} - {257ac9fa-00e9-4760-a473-3b8585b3a964} + {d053a732-0cfc-4262-8029-f0422e591ee4} - {7d71b6e4-053f-490e-9388-84c5975f4286} + {431650fe-a93a-453d-bda8-952a3b27c31d} - {b0b76425-60b4-4b89-8acc-0a35369ffbd7} + {4dd7ade1-bd4e-41ca-bc0f-d75d8169f8e8} - {3ad90d4d-f822-46d0-8d52-3c207fbd8ace} + {d1a6a19d-ecfb-46fb-8dc5-347fdea36a9d} diff --git a/Util/Util_vs90.vcproj b/Util/Util_vs90.vcproj index e6f32017a..c97ffb144 100644 --- a/Util/Util_vs90.vcproj +++ b/Util/Util_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoUtilMTd.lib"/> + OutputFile="..\lib\PocoUtilMT.lib"/> + OutputFile="..\lib\PocoUtilMDd.lib"/> + OutputFile="..\lib\PocoUtilMD.lib"/> ..\lib64\ obj64\Util\$(Configuration)\ PocoUtil64d - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil64 - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoUtilmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoUtilMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoUtilmt.lib + %(AdditionalDependencies) + ..\lib64\PocoUtilMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoUtilmdd.pdb + ..\lib64\PocoUtilMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoUtilmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoUtilMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoUtilmd.lib + %(AdditionalDependencies) + ..\lib64\PocoUtilMD.lib + MachineX64 diff --git a/Util/Util_x64_vs100.vcxproj.filters b/Util/Util_x64_vs100.vcxproj.filters index 11eaeb504..2e9997f0a 100644 --- a/Util/Util_x64_vs100.vcxproj.filters +++ b/Util/Util_x64_vs100.vcxproj.filters @@ -2,58 +2,58 @@ - {a31f0885-63d3-4120-98a6-82e4a820a4f0} + {da08e35b-e142-4594-9ccf-82ac74312abb} - {40fd97ca-8527-4103-a463-1308d8b77e38} + {d0a2e2dd-7f4e-45fa-8c90-b9abb70aa5d0} - {ab545767-bb5e-44d6-866b-47109d5587da} + {640f1e6d-9860-4526-b55b-ae85878f4fa9} - {aeaafa5a-2224-499c-bb7b-01488a4b398e} + {ca5e745c-f426-4480-825b-37e4b741e42f} - {51b83d14-e715-44fa-9632-929653e8ace0} + {6f347ca9-a4e9-4859-8440-33ea1e4c5c45} - {21ac4aa5-12e4-4610-8680-9a9363d9b4ed} + {6e5e0c9a-b944-472d-8b81-0a4cc24460c3} - {b28917f7-0ac5-4f08-b420-bc8e93e5b22a} + {347db6d8-fa42-4e35-bf28-53528d49a1d3} - {1fd2b561-0e72-4c61-ad41-6bc10e80fa55} + {0e8f41dc-d884-4f5b-adb8-5b74d72377f5} - {6a0bc0c8-658a-49cc-bcb4-6081780ee825} + {5e8a7b05-1a04-4a2d-93fe-df9e2d7b9932} - {18a5d39d-32a4-436b-ad63-151a39121b87} + {2b87058a-e97f-4739-846f-92bee869fec9} - {0f403bca-7666-41fd-a997-0a1c4ade641c} + {167adad6-a10d-4df5-acd8-9954792bafe3} - {e42ee3b9-94b2-4129-ad00-2859ae393b19} + {68dd333e-75bd-49e3-ba77-4129995249c8} - {49e0b21d-fd36-4856-ac93-751c1f424794} + {e7cb1428-6df5-412a-8bf1-a4c9de57a4dc} - {4a419cdf-1f6d-427f-ac58-0bd9d56387a5} + {e372b545-fbb5-4ddf-993a-467c0eab5cd3} - {5c14087b-59e0-4f95-95d6-a0e3baeecea3} + {94689d61-68b3-44c0-8858-996f096e8432} - {e0eb33a8-1f17-49d1-8be5-8474f0b9556d} + {f988f7ac-57d5-485a-8cba-1075cc6c3fca} - {6cf04869-6261-44ce-8622-2fd94291f9ab} + {edc2dcd1-012e-44dd-bb46-0d73ea9d5c57} - {c6e73896-ea6d-4eae-86ba-8ba31e47f09a} + {f3d6f27c-ea51-4235-a881-9d2184c2d97a} diff --git a/Util/Util_x64_vs110.vcxproj b/Util/Util_x64_vs110.vcxproj index 2bb8d1076..505186874 100644 --- a/Util/Util_x64_vs110.vcxproj +++ b/Util/Util_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoUtil64d - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil64 - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoUtilmtd.lib + ..\lib64\PocoUtilMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoUtilmt.lib + ..\lib64\PocoUtilMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoUtilmdd.pdb + ..\lib64\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoUtilmdd.lib + ..\lib64\PocoUtilMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoUtilmd.lib + ..\lib64\PocoUtilMD.lib + MachineX64 diff --git a/Util/Util_x64_vs110.vcxproj.filters b/Util/Util_x64_vs110.vcxproj.filters index 03c37dbc9..ee1996cf3 100644 --- a/Util/Util_x64_vs110.vcxproj.filters +++ b/Util/Util_x64_vs110.vcxproj.filters @@ -2,58 +2,58 @@ - {856075ed-ae32-499a-ae87-83cdf39fdcf7} + {70e79adb-815e-43ab-b67e-76317a196b7f} - {e1dfa7eb-7c97-4e6d-b945-30ce48d2e640} + {2a747ea4-554d-4b8c-9057-4d176e00dc57} - {80b372f6-9dd0-414c-b54b-d1af818c104a} + {98412c42-ef68-496c-826b-5e90d5dffaf4} - {cf797ca4-d037-4344-ba55-5c08e515e0f5} + {e45024a8-409e-4a99-bb80-60f41e92f84a} - {7358d8e1-7f24-4ad7-8314-831c253780fe} + {2e7612b8-e460-4300-b182-cb697be818c1} - {d514bbd0-3aa5-4876-9182-af215954be90} + {8377aae3-520b-42f5-bfa1-d81e10f146d3} - {2748a489-1649-43a6-a8d9-35c62bd5770c} + {da2a5c98-1dbb-497d-840c-11a51f5c158f} - {34cd1792-db52-4993-883d-4dbdd81bbce3} + {06739bf5-2072-4f64-82d7-f82c40bd8a34} - {107fdcd7-de65-4378-bc25-273825764d2e} + {574ad0ec-8a4d-4ce6-a571-3e5c1068ae87} - {8e38f748-f561-423a-95ae-8f8a46023ec0} + {daf28cc0-ff16-4719-8b82-85d0fe134c01} - {83c6f68a-27a2-4383-873a-7d93e67d5ebe} + {9493bac9-4a5b-4e5d-8ee3-339bd24be93b} - {1595069c-8bcf-4bcd-b511-20415fd9166e} + {aa8ce435-bf84-4ce6-b779-8a2aa3c81a62} - {927a82e7-6fc2-4658-b1f7-bc1e821114d3} + {63182c53-a2bd-4dee-9a2a-531bc7e35251} - {313d9300-d769-4700-8b07-631f2138a418} + {99aa265d-7cf5-44ad-aa96-39a893ad579a} - {22355f37-bf92-46c8-8832-976a744d82dc} + {8fd2b8f5-8c7a-4c37-8ba6-5d2db21e23c0} - {670e749d-8738-4509-8d44-48191e35716a} + {4529e78f-9f6f-46ef-9da3-0a3523ca5e84} - {2bda2b64-d739-44c3-8735-8d3f02a24263} + {8e52e28c-60df-4e24-afb3-d3ddf544d7fa} - {a04f85b6-c179-4df5-8f44-c2046595d555} + {1b1934d1-c9ae-439a-88d2-0198370d115b} diff --git a/Util/Util_x64_vs120.vcxproj b/Util/Util_x64_vs120.vcxproj index c11c37a2f..52abf6dc0 100644 --- a/Util/Util_x64_vs120.vcxproj +++ b/Util/Util_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoUtil64d - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil64 - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoUtilmtd.lib + ..\lib64\PocoUtilMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoUtilmt.lib + ..\lib64\PocoUtilMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoUtilmdd.pdb + ..\lib64\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoUtilmdd.lib + ..\lib64\PocoUtilMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoUtilmd.lib + ..\lib64\PocoUtilMD.lib + MachineX64 diff --git a/Util/Util_x64_vs120.vcxproj.filters b/Util/Util_x64_vs120.vcxproj.filters index 910ddddd3..8f773607e 100644 --- a/Util/Util_x64_vs120.vcxproj.filters +++ b/Util/Util_x64_vs120.vcxproj.filters @@ -2,58 +2,58 @@ - {48b79864-41c5-45c4-9d9d-b2e3a431ce7e} + {0ad89e26-aecc-47b0-8201-b78dc87ed01f} - {1b4b3fa5-6d9c-4bf1-87b3-32c8d48ca3c6} + {250ea357-64eb-4db5-94aa-c3c59007b010} - {73da0c12-ea21-4270-bb2a-882869158048} + {0e17e0ac-506a-43d0-bc74-6f654e74c492} - {c33a712a-ac45-45ae-bff8-36177d8d2c1f} + {343d331f-d1f7-4aeb-9661-54ee7ee88280} - {91ecc277-8364-4497-a992-7d2649586e1e} + {5523edca-7177-43d7-a239-bcedc49d72da} - {7f529cea-ff44-4358-a7d8-096bfca37cea} + {856f0928-3b94-4a2d-bf08-9f2026d47c23} - {3f97cc81-7127-4ce4-bfeb-63f25cb9a48d} + {64e7970b-abf9-4f2b-bac9-7a53656c07e2} - {16e93e05-8c3f-4fc7-87ae-39a983f9eb04} + {b7ad3110-70ae-44da-895a-3bd15c804a44} - {5ab021e1-8ed3-46ae-9728-8da6df0a7a34} + {713c599f-94c3-4029-a875-322168130834} - {f0928556-3b0f-40f4-b32f-c37e4701fbbd} + {d4c429cc-e871-45df-94d2-a4b0fe356279} - {6fd76e33-536b-4bbf-9d94-e0895e882b44} + {e96fe07e-2b39-45d5-9b2b-32218bd88957} - {bd7df05e-dc9a-427e-8519-e9a675818ab0} + {01dd23bb-1e17-4929-b82b-32c3782a2490} - {8216aecf-b29e-4429-af13-ad9789f303da} + {b85bc9da-7d42-46d0-b879-78d9d86628fa} - {d9f7fe80-28a5-44b6-889a-932dcea15022} + {0d684c40-1ed2-43c7-a8a6-e59d33293870} - {e6afeeeb-184d-41dc-b7a9-e71db044f07c} + {a9734f39-246f-4cc6-adc2-35f39f07bdf0} - {5e5edd41-45ec-4d9e-a539-f01876f3d119} + {ab39e50f-9e45-4539-bc46-7060cd13ca37} - {7789e8cd-e648-4f3d-8b58-7073e5808538} + {a0f8e2a8-91cd-470e-95e9-20477c8290cc} - {262f2183-72bb-4dd6-8de7-6b83b5f4b1d9} + {814ec934-9363-44ff-8696-c72b2a9dd24a} diff --git a/Util/Util_x64_vs140.vcxproj b/Util/Util_x64_vs140.vcxproj index 2b4a69fcd..38b7748aa 100644 --- a/Util/Util_x64_vs140.vcxproj +++ b/Util/Util_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoUtil64d - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil64 - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoUtilmtd.lib + ..\lib64\PocoUtilMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoUtilmt.lib + ..\lib64\PocoUtilMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoUtilmdd.pdb + ..\lib64\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoUtilmdd.lib + ..\lib64\PocoUtilMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoUtilmd.lib + ..\lib64\PocoUtilMD.lib + MachineX64 diff --git a/Util/Util_x64_vs140.vcxproj.filters b/Util/Util_x64_vs140.vcxproj.filters index a0c9cc2cb..e9239ea8d 100644 --- a/Util/Util_x64_vs140.vcxproj.filters +++ b/Util/Util_x64_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {6509a9e1-aacd-4d20-b011-6044f2e5bb9d} + {584951de-2f63-4b91-8a91-d4a015748f82} - {70a88050-6fda-4d0a-bbb8-223947a62d8c} + {627aa07f-3cce-4ef8-903e-4470a35f6bc9} - {56f5b3a9-5652-4996-a9f9-2b5996bd87ae} + {a82c1ba1-ca19-46ac-919e-f0477e3b45d1} - {7f25dcea-2777-4da8-88a7-291078b1c29e} + {ff17c25f-69ea-490d-b269-ed1db71f625d} - {d3a814c5-a52f-4dc6-ace0-f70f706def78} + {473cca4b-ae30-4dda-8d03-1dde88bd54e2} - {0745eb1e-defa-41c7-9fe5-050950fadfbd} + {e6725d56-53e1-478f-93a6-776ac26c14a7} - {908893de-710b-4230-8f9b-ee113aecf0dd} + {10afd7a1-b990-452e-8aca-b0c631001ee7} - {e1211aa9-28c9-4b0f-adec-eaa6993c0b83} + {fadbdde0-c878-43ca-a8dc-0846a7fc32e7} - {95b2c3b4-9b6b-4902-ae44-a4a3070dea45} + {a936077b-b14b-4911-916b-57913839687e} - {0411f9c9-7385-427c-8915-4d73d2878b66} + {b9057031-2b55-402c-904c-3a9ad39f5229} - {209de9cf-9803-43e7-b498-8e3e889004f9} + {88b86d18-2775-4967-aa51-1851aa369ed7} - {24c020bc-fc13-4094-a927-0ab67cfcf96f} + {f5ec8a2d-9e7b-4ee8-86a8-2c0ddbcf6d63} - {c8eeca25-a1ea-4288-8b6d-4e42105ea31e} + {d98e8d08-2f3b-4031-b737-87d6974f5182} - {b7a68c2a-7e19-405d-a7db-0ce54404b65b} + {4f194088-c297-4cad-af45-85cffc90066e} - {ee79efb8-503f-4159-a2e8-5d007cecfadc} + {ffdbaaa6-5f16-4e41-83b8-3fbffc6d12da} - {451850ed-1030-4e9d-a8af-8187523460d8} + {23912f25-d776-41bf-9659-7942f8ce2f05} - {9cbbd807-345f-4413-85c9-581045aab7e5} + {ef7343c0-8752-40f9-9a31-4dc8e8e7aa94} - {1641d9ee-a12b-4760-a1ae-87567a651ced} + {082e6e69-f44f-4bba-9262-6847abad35e1} diff --git a/Util/Util_x64_vs150.vcxproj b/Util/Util_x64_vs150.vcxproj index 7b3871852..a0aa52a20 100644 --- a/Util/Util_x64_vs150.vcxproj +++ b/Util/Util_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoUtil64d - PocoUtilmdd - PocoUtilmtd + PocoUtilMDd + PocoUtilMTd PocoUtil64 - PocoUtilmd - PocoUtilmt + PocoUtilMD + PocoUtilMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoUtilmtd.lib + ..\lib64\PocoUtilMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoUtilmt.lib + ..\lib64\PocoUtilMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoUtilmdd.pdb + ..\lib64\PocoUtilMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoUtilmdd.lib + ..\lib64\PocoUtilMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoUtilmd.lib + ..\lib64\PocoUtilMD.lib + MachineX64 diff --git a/Util/Util_x64_vs150.vcxproj.filters b/Util/Util_x64_vs150.vcxproj.filters index 08e05d2ae..4040ed226 100644 --- a/Util/Util_x64_vs150.vcxproj.filters +++ b/Util/Util_x64_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {e361447e-5694-497b-8168-cc130bd20bc4} + {4d1e4e53-0f19-4423-a8c3-9952a2617ed9} - {dbbe8ff9-6e7e-432c-b169-ab279276130f} + {d0fc6abb-6647-4919-8b9a-148750fbb344} - {f736a23b-f529-45ba-90a8-b34b0d311e21} + {4230b47a-bd0d-4d3c-901b-8baab8ee10dc} - {74f9d0eb-1584-4a2e-8309-d2d9eae1d04b} + {53232eaa-7aed-45a8-858f-b4fa85e02a5c} - {efd3f3a4-95ec-4451-8a50-c7d03d3e6fba} + {0bbd4a8e-5f06-4416-ae40-3b0ba0bc5ea7} - {8558bd26-0ebf-4240-9cc1-eb00eac7a983} + {22a9925e-70ba-49b1-ac1a-03d9922b7adc} - {6379077b-07bc-47d1-96f8-b5669cc81462} + {a3614acd-4655-4238-811e-5a2582b8c007} - {0c7cec93-a4f8-4f78-a98d-d9842b68ca38} + {dc6f6674-083b-4c1d-9997-f14bb584a157} - {824f6c7e-00f0-45ad-a772-dca0271eb0da} + {a65d6326-37f9-4127-b4b0-ef38c718df53} - {a722255d-f2e7-4455-9e64-699a30b9d299} + {1b15d5cc-7c46-4b88-b709-961c7d6f6c3d} - {5cacdf0f-1f05-4550-a81c-d332e20fe4af} + {8525da49-6f7a-41e2-b540-ff9658b74d72} - {acf576d4-b833-461f-88c3-4064d364321b} + {32063420-2204-4d0f-a480-f2862be12e6a} - {3aa97979-d703-4db6-8d5e-70e805da68a4} + {8357a425-3a28-470a-949c-42443ecd2c82} - {665decb5-9033-4c77-8ce5-9d6a6c4fe8d8} + {1afa86b2-072c-4a60-bf40-cdb524cacab1} - {04b088d5-61eb-407b-877e-51a65cb66924} + {bb7407ad-d2de-4f79-b98e-7347c946f5a3} - {2b7147b9-aeb4-443a-8888-c6ddf1d69f2f} + {e2760048-4ce8-4cc2-9d88-ff978f99948b} - {bebf559a-762a-46d2-bb44-59a8dcfba626} + {87a08cfe-5139-4b8f-a43d-164f82e7b150} - {6f9eb2e5-aa58-453c-89b8-8efb32efe710} + {4bd73f29-e932-4896-8764-3af49c66b24b} diff --git a/Util/Util_x64_vs90.vcproj b/Util/Util_x64_vs90.vcproj index 48ecab7e0..d004a8c83 100644 --- a/Util/Util_x64_vs90.vcproj +++ b/Util/Util_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoUtilmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoUtilMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Util/testsuite/TestSuite.progen b/Util/testsuite/TestSuite.progen index 4d0e5c374..be62ce0f1 100644 --- a/Util/testsuite/TestSuite.progen +++ b/Util/testsuite/TestSuite.progen @@ -7,3 +7,6 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include;..\\..\\XML\\include;..\\..\\JSON\\include +vc.project.linker.dependencies.Win32 = iphlpapi.lib +vc.project.linker.dependencies.x64 = iphlpapi.lib +vc.project.linker.dependencies.WinCE = iphlpapi.lib diff --git a/Util/testsuite/TestSuite_CE_vs90.vcproj b/Util/testsuite/TestSuite_CE_vs90.vcproj index c0e7fa8c8..849df58e9 100644 --- a/Util/testsuite/TestSuite_CE_vs90.vcproj +++ b/Util/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {ea2075aa-7928-4776-ab5b-744683116074} + {44b62023-d58c-4cb6-9e8f-959914b613f8} - {0c491805-ba18-4a8d-bea4-680c7695026c} + {4fbf2661-1b89-4566-a63a-f7d27d45a4ea} - {967e6f79-686d-40ca-9070-53cfc308a6d9} + {645ff2b5-2841-454d-8d83-9bd56236f137} - {ec7a1b70-8f27-455d-ac0e-06508e304977} + {e7c06d25-0f3d-4c8f-883c-63f83481f68f} - {5fb35ca0-f4b6-46bb-8887-198b1cbd0fbb} + {85a510dd-3cd0-4fa0-ba36-36d85ad7f32e} - {0281dd95-f165-426a-ac08-758dee0fff83} + {10c59f78-0710-49bb-8fc5-1aa2b7a823e9} - {9d886fd8-6673-4cc0-8da8-40bb1c6e4c78} + {f52b653e-1104-401e-be9d-433af868ca9c} - {79f21502-eb1b-4a17-a4be-44e757089ae6} + {1518f332-cb03-44d7-9c31-2dbf49ccf84f} - {ad0cbb4d-a811-4bba-b26c-74466232b004} + {6335204d-6b75-4727-9f08-8f06f5cf7031} - {e506fb2c-c8a5-4b4e-af7d-24aecfd02134} + {628614c9-dc5a-44fe-9cf2-2dc500f6e941} - {fb47b7f6-829c-4ece-b32f-1400bb071230} + {5b019116-eae3-4f48-a314-3526f203a109} - {4834659f-bd65-47c5-b763-c269cf032491} + {4b84467a-b6cb-42d3-baec-60521903828a} - {fa2d9062-772d-4b8d-a057-98d8890fc7f3} + {a8fc4b41-d167-48e4-bec9-d428aec62ced} - {5cfc0d3f-57e1-4622-b1a0-3cb237717662} + {85676517-8d08-4998-8041-39ffc0c92d7c} - {7258079a-1cfc-4e90-bb57-7c61a5720610} + {9222eb97-b521-42ee-b242-d32c05e33f07} - {56d14bdf-05a9-4d39-bbe4-852e0cf1e638} + {69f6ee3e-cbc6-46c1-a801-920c71de7312} - {d4f329e1-1aaa-4473-a8cd-a1ca4ff27ae7} + {17953567-46cc-4d6f-9253-6675e77c86d0} - {89768c1e-1cb3-4c1f-adcc-08cf2a194e8f} + {26b64360-ad52-498a-8607-5301c4fd88f3} - {2b11d970-5249-4f78-8b43-247287239a76} + {e518ec94-be82-4f41-8385-d62fead3a94d} - {eb3c14e1-198b-4406-be5b-84091445c4fb} + {c1c597f6-8e93-4743-aee9-5a8fc4d45449} diff --git a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 1dfc93fed..eac2d9732 100644 --- a/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {f3fb0411-b175-4b9f-8c45-a56ea86bb4ff} + {ec43dd88-be57-4009-8f42-def752b64df4} - {80a420e8-978b-48aa-b33c-29303cf59ce0} + {fc6487a2-e5e5-474a-a3c3-6625082ad8ec} - {3280354f-cb54-4af9-93f3-0a0be7e8dcdb} + {bd8a17e4-2a55-4f07-989d-ec33a21f05e6} - {079148f3-cd78-4645-9e7e-4020b7db6c60} + {c2c9e024-3f4b-4fd6-8ce6-c405a2ff66dd} - {0ecd46cd-06e1-4673-b219-eb040654c6f4} + {22d01343-5da7-40f6-ba6a-e2795459ed33} - {eb1b31bc-a4f8-4275-bcea-b30a4ec97fd3} + {22b958cf-0214-47a9-bb22-da51a10b6866} - {0ce33caa-3837-40fd-9075-a1928da8ffb4} + {0989a6ed-21a3-4463-b769-5f80adfd78fe} - {ad5313e8-ef58-455a-9688-0550d3fab823} + {e7d83252-d0ae-4f0a-b06c-f3dad7afdc9b} - {275d8969-0c70-4eab-90a7-365720d0c3e4} + {5b5eef5b-3bee-4e5d-a5c7-a28da9797c0f} - {832a4050-097a-47c4-823c-f52858c30ded} + {0af8ccde-700e-449a-ba2d-926df81f90ac} - {00ee4058-6740-42e9-a9fd-c60294806213} + {9f7bbeac-e0e1-4c2a-b62d-6b346e7d772a} - {8df95af5-2072-4200-b385-3e262fb7e7fa} + {ae551c01-e749-4bfd-b039-18196f4590cc} - {0a79da72-ae6a-413e-86f2-6391c7e0a577} + {8cbca4d1-3f53-4162-a673-da89195fec3d} - {073dcea9-249f-4d76-94af-c0b299c2545a} + {cf52527a-4462-464d-a1a7-e7f90533acf2} - {3e97fabe-7d3d-4176-9c43-5ab8452b49de} + {d98a5dd0-d48c-47f7-acc2-52d913e402ed} - {d0f074f4-903a-437f-a39b-fd205a35e2ff} + {3a5218eb-ff11-46c3-a1b4-29897882efa0} - {8ee08f45-abbd-440f-9513-f84856471f3f} + {c76049f3-1755-47c5-8f67-b8be738fc301} - {68ee0e98-c367-4d0d-b36c-75585c1d5dd6} + {47d14bda-b7df-4d48-bb4e-f203e679aa72} - {a10fec60-fca9-4001-ac43-6a74fd27d3f6} + {778d978b-fd10-44ca-80b3-4602838ff487} - {ae69819d-087c-4ac6-8ab5-54776fc7cbd4} + {f9ed42f8-9013-461c-acaf-36357c79ef36} diff --git a/Util/testsuite/TestSuite_vs100.vcxproj b/Util/testsuite/TestSuite_vs100.vcxproj index 829a175b3..efb8fd76c 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj +++ b/Util/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs100.vcxproj.filters b/Util/testsuite/TestSuite_vs100.vcxproj.filters index 9f1409fa4..491f1e6bc 100644 --- a/Util/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {c93d617f-e05f-414d-b166-311169fe6e32} + {fc65ea39-750d-46b5-bcc9-34d6aec87286} - {1bbea3b6-3169-449f-b453-e9b9da7c02a1} + {96441d24-9bdd-4087-a47c-f160c3482bee} - {68a6721e-5815-439a-b8d2-9929450bf3bd} + {93d6fb84-b6f8-4222-a763-e060af03c435} - {3ac210c3-970e-4891-8085-30e17ec8c48d} + {50f2de94-62bc-467a-b666-3ef989b8f26b} - {61834fbe-0c80-4392-bfc1-39b1e8d530a9} + {ecb49306-aa15-44d1-80fa-d914ec5c5e48} - {023f40c0-5255-4e84-b6cb-483cdb422ae8} + {85bdf04d-68f2-4a9e-98d1-aaa2c8f26480} - {a358c808-69be-4756-85bc-11265484b7b0} + {d7770d7c-fef8-4d71-824a-9759d3d95cc1} - {422bacc6-2e8b-428b-be31-fe70f1d422d8} + {aef9e1a7-3c70-4d0c-a75b-df66fd0c6b99} - {7a270784-7732-47fe-9961-9784625e088e} + {c0153be8-cb2d-4b9a-bb45-168b90e94d44} - {752c9223-802d-4790-8400-6c73b0780d62} + {2126af0b-8f04-4087-968e-8a42c1a003fc} - {1e855c42-7c11-4d6c-910c-3b00afd04551} + {d9a7331d-d5fa-4992-820f-c0f453f6552e} - {d0ccdc3a-670f-4026-bc81-b92500a73f38} + {cefa88d4-a960-4cd0-b53e-71b1f39482b0} - {47c729ae-7219-44e8-b8b1-c814dea90b9a} + {3f614cad-75ff-4509-a39d-666c4a1bf9c3} - {23cb337d-f98d-4f7f-b64f-525ab0cf2556} + {c3080da4-56ce-4bc4-9f12-3cd3a982fef5} - {11d11d6c-9da5-4c52-af98-a1622f913e2c} + {11ead70d-6ae4-47b8-8b7f-46a557477f70} - {6e358071-2992-4e45-a04a-8af1c54e7bad} + {a3ce732b-b1c1-4042-9abc-063d6563bdd2} - {97391c74-b922-46c9-ba23-5381ae8c1fcd} + {56799e8b-881f-4ea8-a497-ba3c10f4eeef} - {2f8655cc-f917-49ac-b428-fdeea4cd7e1d} + {4f9ca672-952b-4d68-817f-628c6cc79f7a} - {0591d0b2-dae3-4ec5-a5d0-500dd51a7d51} + {2b8ceb42-70f7-4c4c-b7ff-81cbcba91486} - {211e3c88-37ca-4096-bf71-baac7c947902} + {c341c7e3-da48-4e28-a062-1ef95185dbbc} diff --git a/Util/testsuite/TestSuite_vs110.vcxproj b/Util/testsuite/TestSuite_vs110.vcxproj index 97a5ffcca..9706797df 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj +++ b/Util/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs110.vcxproj.filters b/Util/testsuite/TestSuite_vs110.vcxproj.filters index b4a101d4c..dac8ec19b 100644 --- a/Util/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {e4a80f13-49c3-4bfd-b075-1d88fd645d0a} + {e3bad43e-2b48-4ce4-bcd0-2566ab125ad6} - {1b5daae0-9bcb-4a23-9326-afe736bca556} + {429daae1-0c36-438a-bc9b-004e6918628c} - {45ca820e-30b4-4367-8cf9-eb1549d2e99c} + {dbe9fb28-a5dd-4bb3-bcbc-cc14c028bf29} - {1083532b-698b-4b87-bb02-cd1b7d47f273} + {e5e60184-e9bd-472c-a735-92abd321f9e9} - {e010150a-df3a-4084-ae94-d7a5b63e3c8f} + {6ecb345d-2afc-44a0-9c8d-fac06c1c83ea} - {792babe9-6189-4402-b730-458407a207fb} + {d20db6cb-9b19-4a51-bdcb-5c4113527f5d} - {56307e02-1740-406c-9e7a-48ceb77c4670} + {e85c6ad5-cf6d-4382-aa87-9f7b8627e220} - {cc039a3d-738d-4eec-9d33-fca4323987f6} + {54fcf0b7-8da6-4794-adfb-dccb8f3266c3} - {1bbfed92-5409-4bc4-81bd-3ae94d7c4534} + {a26420fd-bb1e-4b00-84c4-801f25fca089} - {5c213bfd-fba9-48de-ae65-78cf22a75435} + {42bacfb0-d6c6-475a-b88a-89ed097f0b10} - {a327b3da-f837-4bcd-b265-40a5bab1fa17} + {dde2ea1f-9157-4b11-9008-41c37462d1b5} - {c735cb2a-3f70-4336-89ad-7c881005fe64} + {cd9df0a9-19a9-418b-a5a5-7b1e75fd96d1} - {32b91793-e36c-4181-bd00-db08acdf348a} + {cdb81284-cc52-40e0-9531-e533c4d1ed99} - {cd2f1964-b646-4684-b6de-a14f8f140f19} + {3a870db3-c7c8-4db2-bae1-dec792dea714} - {63a81bb2-0e65-4a1c-a9df-e560e156e8d2} + {0a7a073d-3e34-4f67-bcf4-a3b2a9a8e7cb} - {d16d7ed1-2e5a-41e0-a162-64134ce09257} + {c85e32a2-cc90-408a-9265-469c06eb392f} - {afa5e740-52b3-4921-b662-46b283b29902} + {f6a37a1f-3f25-4f16-8a6e-d333bac7710a} - {385f0d91-f3ea-4232-a271-f5b3e31765d5} + {6a5dff74-5ece-4f39-a40a-210a2404abe0} - {d77a9ec2-1b8c-468b-9698-ccbd288cbd0c} + {bbabc25e-02eb-4aad-be4d-8543fd7eefe5} - {b0dd303c-14ed-4f19-9814-d8047031ae7e} + {eb3cf152-3d4d-42b8-bc36-24addf31fcba} diff --git a/Util/testsuite/TestSuite_vs120.vcxproj b/Util/testsuite/TestSuite_vs120.vcxproj index 7d28f4062..2b998252b 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj +++ b/Util/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs120.vcxproj.filters b/Util/testsuite/TestSuite_vs120.vcxproj.filters index 322c9c3eb..0ee3320e2 100644 --- a/Util/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {b04f9a8c-54b4-4cd2-8984-44f8a06e3a0b} + {c271d375-8478-413f-963f-eabefdc2a6d5} - {f2167631-fbda-4552-b18e-9039ef9d93a4} + {0fa66965-1fd4-4b25-836c-011d27ef529c} - {638d4b5b-ff9f-44ec-985b-f2e14811b6dc} + {bac7992e-2b41-4ecd-829b-162dfa1d63a1} - {aff96f4f-f218-4f46-919a-61825782e2f1} + {9fd5a2ee-f429-4a85-ad3f-0f66f6398427} - {c0891029-79f0-45da-8085-e5839693559b} + {9f4ee927-dcde-493a-9bc4-6e9d48875748} - {0ef7cb14-fe9d-4f1a-abf7-105e31410ee6} + {7aebb73c-70ab-4ddc-aaab-0139f26c0c07} - {4065628e-ba85-4558-b156-313f5873570d} + {9edcf77b-5f22-42a7-9667-88aed59c5c4a} - {a38b0bf0-dd35-47e3-a35b-3421ec88c116} + {46249cf8-101c-4805-afc5-37258a7d93d3} - {3762e073-19a0-4b30-89c9-33a43b7c3060} + {bbfa1bed-2c25-4bdd-874f-2f971a4d7afe} - {e3ca5f93-7ecc-4a73-8adc-d69cdd824bca} + {23ddb1ae-0c17-4582-928e-673fab0c5ab7} - {1adf2e49-d6ca-40ea-af18-f42f4bcf8fcb} + {1e3b807b-237f-4dcf-adff-949bec8eb412} - {d6a0c07f-10ff-45d5-8ff3-5f9b7a33d20e} + {187acbf9-2d02-4469-8a18-4bfe87b3c502} - {10cbb82a-3849-49d0-b61d-45e57da1dd90} + {77b004f2-557f-4492-b7e4-434e46967d8e} - {7efa8a1f-bd9e-497d-8b6c-2348779c2569} + {8682c62d-cd9a-467e-9942-5d1ea58f519f} - {e126efb5-731e-4e45-bc8a-f7b8ee24f9eb} + {71ef874f-8290-491b-950c-b5eff2477cb1} - {90c661fe-d748-47c2-9dc1-ad613eb96812} + {9eae7dca-6849-48e9-b20e-fef0b96f67a8} - {550fca91-031c-4502-9ade-64fc531ef3ad} + {7c9cd641-7f5f-4eb5-b317-70cd62a9362a} - {e0c45bc2-8bec-4ec9-bb79-a91fc12d5fa9} + {0ec7f735-1f28-454e-9e64-6600f9cdbba9} - {2ca34814-80a8-478b-abdd-9c2501514192} + {48c0a9aa-5ed4-467f-8882-1bb87344eb7c} - {0ddc9b2d-8663-47fc-9003-ab3ccace2d67} + {9cf77200-6bc9-44d9-9495-c6901765646c} diff --git a/Util/testsuite/TestSuite_vs140.vcxproj b/Util/testsuite/TestSuite_vs140.vcxproj index 9c7c9b448..c9ada0428 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj +++ b/Util/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs140.vcxproj.filters b/Util/testsuite/TestSuite_vs140.vcxproj.filters index 54a035ddb..5cc95eab6 100644 --- a/Util/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {ce6ea790-2aba-4ae7-8219-c8546911a257} + {5253d6f8-cb15-4aa8-8403-e5b3481719e6} - {9a1a62bf-ab25-422e-bc5e-31a3783e6aa1} + {8842b8d5-7251-4c61-81f9-c1e704f66667} - {7b3f1e24-eef8-409d-902a-a6b407664f64} + {2d130bdb-1080-4cc9-95fa-b235fab459b1} - {d64aff76-0f21-48db-b8d6-59bb0fdb81e2} + {71d93169-1f28-4498-a97b-da3fe5181022} - {0d874774-b05d-421b-b9fc-3d5b8f226ab9} + {43fd14dc-e1b9-4da0-bb3b-c1cdc24e1ec4} - {fc4662fb-bbd5-48da-b5a1-58713ed5aec8} + {6bbbe4fb-a0c5-4686-bb9d-456ffad54dfd} - {76926124-c266-456c-a794-beb512e1e097} + {61ea76ec-dfc9-4374-9fd1-a068fba67974} - {3fa42b86-9e4a-4309-bcc8-461b467b4775} + {0b719b2f-a324-4ad2-bc6f-f3f3e994fe0d} - {51418042-7c27-4ea8-b90f-27e572f6b3ee} + {75596b45-beff-4594-8895-fe30e1b63835} - {38479396-f425-42a0-abbe-b6f9ce156512} + {d168b646-b26d-4320-b7e6-e6bf33fa2cb5} - {69d54b1d-01d8-4be8-b2c6-3c71f4b97d67} + {8b947579-93d8-4b7f-a96f-38fa7764ec52} - {2fbd69f5-5fb0-4ce5-9375-c510ef831526} + {b65b681f-b02e-4dda-bfb3-f16694b7ceb7} - {c999c1fa-96be-4aec-b13b-d46e127788e5} + {e27a850d-208e-454c-9b86-35b6e50a935d} - {ea4a1a2a-f610-489f-b8f6-47441a6fb687} + {9980bc83-4652-4ad3-9dcd-5682325f368e} - {013c44ae-f1b9-428f-b446-108bb1aa030f} + {c0fc7881-2640-4e3e-942f-76f0ac970f7a} - {949e4fb4-7b96-40e1-b9e0-ac0b495d797d} + {faad8732-4c76-40a8-b9ef-ac15d905b9b1} - {f3cae720-5e55-494b-a2f9-39b62d36ff3a} + {d94267ac-8198-4f5d-98ff-fb4e8eea088a} - {d09116b5-62b0-45a2-9485-23cfff6b2edf} + {400c889c-0042-4cec-997c-c1eee7fd8ce6} - {87e2274f-4c6e-40f4-88b7-dbbdbb0b2330} + {1eff029d-b5e2-4aa0-83d3-6d4643e6b53b} - {bdb9e0f7-bc9c-4b60-bf3b-aa354c3d06e7} + {907bea64-8974-41e8-afcb-90113c7aaf39} diff --git a/Util/testsuite/TestSuite_vs150.vcxproj b/Util/testsuite/TestSuite_vs150.vcxproj index 3600ed2af..9d84f3f9c 100644 --- a/Util/testsuite/TestSuite_vs150.vcxproj +++ b/Util/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_vs150.vcxproj.filters b/Util/testsuite/TestSuite_vs150.vcxproj.filters index 970727cc2..9c4a47aed 100644 --- a/Util/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {df13a283-6f4c-44ec-93b3-86bb11e7004d} + {9496cc81-377b-4c76-9354-dfa5b3f21d67} - {8e8d8ce9-ae98-4f9a-bb99-8c17b76753d5} + {df0c43e1-1fd9-4e2f-a857-abc05d087645} - {c9dcb8f4-549b-4ff1-81e8-39df23c952f8} + {edef18c7-1828-4357-ae66-13c35b31da67} - {7befa23b-b8df-4500-b9cf-05f19d40d307} + {7804e66e-8292-49a8-89ca-0344242c2057} - {4b37d50a-3593-4c5b-9aaa-e1f16af127ae} + {d80795c4-7263-4cf0-8e42-a000cc8bc577} - {ba826da4-29b4-4d5a-8cb4-6abfe1111195} + {1e96eaa3-574b-47a5-a7b2-5b88a918a318} - {30b44201-b245-4c1d-b9cf-d9abd1a18d07} + {e48c5e83-15bc-4aa3-9cbe-d66d4f2f39df} - {4a59f9f5-7354-462c-a1d1-ad6f47b45074} + {945ffa4c-bc14-4189-9757-8d2dbc03851f} - {64edf687-6822-4ae2-adcb-8c7c6038f54e} + {0ac31c8c-4699-42f8-91cf-20de24dd6c5e} - {255d2bf4-439f-402f-8c87-4eff4c9db112} + {286eb754-9527-457f-8234-915df911fe01} - {ac2dffbc-66ae-47a4-a40b-5ce8f1ebaab2} + {5680601a-6ec5-48b1-b624-22b0854a1acc} - {d88d1fd5-da56-4a18-8178-d44c95889e66} + {ecb5b856-3bfc-4601-b33b-ed59a4b01ef3} - {0d447b3d-5a18-4895-b838-9db263a2103a} + {0d6580e2-89e8-42a4-a1c9-3252d7ea3918} - {ad35b279-f1c8-43b3-90c3-97ffbdae2c63} + {b6be928c-dbb0-44d4-9fe8-9a99f7c91942} - {b80d407a-991c-4551-91f8-7671213ade25} + {cf6c75b4-6b4a-4e63-bd60-c5353c8098f5} - {927a0d33-89f7-4dac-b2d5-06203b05144b} + {81cf4653-d19d-489b-abca-a3fa09de4646} - {c6376869-b1f8-4bd5-a30e-6d66def411e4} + {502ccb30-b4a5-45e3-b0a5-48a8f695668d} - {cbba7619-5561-40a2-900a-1865d18b9a56} + {63664f15-ade2-4a3e-8c2f-6a5dfcdf62e9} - {a03ab6c2-aa66-48f1-a4ea-972615e107ee} + {2efa2df2-9762-4818-83f6-a3e406166ad8} - {e0dc55ce-0fb7-4745-a276-0a9130ba77a3} + {27dd074b-8e0b-4b96-a9e1-6a9f7912efbd} diff --git a/Util/testsuite/TestSuite_vs90.vcproj b/Util/testsuite/TestSuite_vs90.vcproj index ca2a58243..46eadb4e4 100644 --- a/Util/testsuite/TestSuite_vs90.vcproj +++ b/Util/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters index 7dc30012c..8741f63cc 100644 --- a/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,64 +2,64 @@ - {4dad6dcd-9ca8-4704-b122-a96f86f54684} + {15755d50-b828-4c6b-b020-77633c04c180} - {2a3a9d86-8572-41db-98cd-b68b0d25861e} + {e0e91e41-e439-4891-842f-aaa51688e070} - {f768964b-424a-4b84-b99e-d4e3ef064a0b} + {62116fdf-8eb5-40f6-84ed-bf6203c7aa26} - {0784346a-2e77-48b8-b3a5-0258c1963564} + {729700e0-7067-4d34-8af6-1797d29652e5} - {141dbe1d-86c2-4f33-9e32-7d37e5203707} + {c18ae20b-5759-4bec-9142-42992650350e} - {dfc98102-253e-4804-bbc8-bb36239a1113} + {190f07ff-b499-4607-b1df-0a63ca993c54} - {ebd15199-e856-407a-8673-4ab8bfc6dac1} + {94bf0c22-4c15-4a50-8834-b28d6c73daf9} - {69e06d8b-f7da-4cd5-a39a-5e2bd019645c} + {48efc299-ad4b-4c06-93b9-b1ddb6101755} - {fffbc27b-3963-4145-88d7-7f5f040af5e7} + {d115deb2-0c23-43be-885c-d0972303ba4b} - {d3bfbf6d-a9ee-4c54-b83e-1faeff7fe319} + {b2bf9487-9f7b-4e7c-a72b-bd1068c29819} - {5918413d-d2b4-4a74-bd3e-2fb107b5520c} + {b2d00375-cb92-425e-9bde-1b8e9dc01742} - {b6dde138-b3d9-4fb4-b091-9a7f536d8837} + {8e73c831-953f-4290-a7b9-7a0b34462987} - {5fde061f-8e22-4a17-ad66-0e590136cb6c} + {b7ffa4be-318b-4481-9ce8-21f7b710ba98} - {42258f83-6290-4212-ad55-90b528a1951d} + {3cbbca29-fbe9-4cb2-94e5-02f40b89b1e2} - {735182ad-159d-4d5a-aefe-7506ccbe930f} + {0dfc65e8-bd49-4336-a50d-4aeb2e03b814} - {7736ad53-7beb-4747-9f95-7b0d93c4a5ae} + {60c90cbc-ea2e-4dcb-9381-78ea73314537} - {56ed167b-7e16-4d4c-9c86-898a631a63fa} + {fa75b291-dd23-4771-bbc3-3a08fe3c74e5} - {c58efc16-459a-4a9f-ae3d-5e5ee3441520} + {4638d027-80e3-46ad-a5dc-26fb75b4d08d} - {b5a17c1b-f623-47b5-8c48-8f28acea47b8} + {84fa93b4-5fb9-492b-b1f2-83c2d851ac11} - {8bb63b27-1bbb-49cd-9aff-8c9f1dce168f} + {40a85b98-85e9-4a52-84cf-970bdc5320c1} diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj b/Util/testsuite/TestSuite_x64_vs110.vcxproj index 562b2fd70..ad91b5122 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters index d9dede277..2415cf439 100644 --- a/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,64 +2,64 @@ - {aa0efef9-ea97-455e-b7ec-611582f3ee84} + {a3993845-6e4b-4c4d-8235-86cc0751e0d1} - {cb0daf8c-519f-4ff7-9d98-8b11ab66ec44} + {29710a83-6b5e-45f6-8588-7ba96b8cabab} - {9d57e6aa-33b0-422b-b660-fd239c3bd2d6} + {da15f155-0b4b-497a-8aab-1eae356f1f50} - {5b70a316-31fa-4226-b83c-12d4aacb3ec0} + {5c3a961e-8c0e-417c-908d-185be6561b80} - {d5d1e447-0d02-4c03-a537-d0b74f509e57} + {02747d52-849c-4745-ac12-6c23de262109} - {ca98be48-8870-43ea-aa72-d42330857596} + {0ddff597-48bf-45f8-b984-839879aeab00} - {026c16c3-3e17-4919-97a8-818fd409ffbe} + {495883ef-1535-4e87-8167-ba7d234ac5b3} - {41f304cd-d937-49cd-8510-e299ebf60316} + {8b4b1296-331d-4339-adbe-433ddafed714} - {0e33313c-3f50-460c-acbd-db0bf376df63} + {3bbf93d9-b6a2-473c-9738-a3e1e52d9f2b} - {314217cf-db05-4628-a7cc-8361a227c577} + {ff9503c7-e3c3-4568-b0ea-c1b23c71079b} - {3cdaa8d1-2d79-4332-8185-3193a82dc31d} + {225c884f-9857-4cd8-8a15-6bf0a4bbc759} - {c33bc92d-07d3-4433-a130-96932fb4eca4} + {001e0e80-380a-4a8a-8907-d29cc27c1225} - {0c3c3b7f-54e4-4ddd-8c53-566db4435ebc} + {dbaccebb-d6f2-458d-ba21-17ca4ae676e8} - {b0da002d-ad67-4f64-8d51-0ee5b98534fe} + {14e840f0-ef30-4656-9192-30f770700fdc} - {ca4250c5-4662-4102-80c3-658774d4ee11} + {6f18e97f-cb98-4215-aa73-10ddf8fef31b} - {75b629d3-d70f-4a9f-af0f-0aa73a61c7bd} + {8fe41022-9c8a-4101-b7e4-04e5aa82cc69} - {6d0b1c2a-9c8e-40a3-ba9b-eef58635b6c3} + {94aeeac9-0ca0-4f74-83ed-eb8deffe5176} - {55255743-7cd9-454f-a31c-f86fc5587141} + {0758a398-a534-4f26-9c1d-187e62e3423b} - {6027c120-18f6-4a3b-8119-a93cfc11f675} + {388bd13a-7893-4bbb-8113-91da8de5c959} - {118f6d99-c9da-422f-94df-deb49303fbee} + {3cfad9a5-2fb9-4223-9f59-ee2b19cffc2e} diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj b/Util/testsuite/TestSuite_x64_vs120.vcxproj index c50bcb85d..a188e40d7 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters index 5b92e5b7e..9d4c99699 100644 --- a/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,64 +2,64 @@ - {46ff3180-50c6-46df-9924-f13925633cfb} + {f90e847c-234c-4382-a35c-602e9eb6609f} - {7549a074-15d4-48aa-8983-243627960f30} + {59f267fb-4171-4c79-95de-5230282faea7} - {c5226fac-b851-4a73-ac07-e96c990ef092} + {00c296f6-197b-442a-bf75-80df4fd2f3c2} - {284e807c-4aa1-445e-a9c0-abe33b30d637} + {9ac45de0-e6b6-4dc0-bcc6-62182eb01c50} - {33ab8043-3859-4524-8ec3-222999a2a378} + {f581dddf-8d48-481c-a348-f543ff7bf4f5} - {171c3d27-3c06-4275-b813-9e968a03cb8f} + {099f4d82-09bc-4177-8aac-84905ebe7fcf} - {c56e289a-9b9b-4d26-86f1-0cdee34ab6c8} + {adfa5421-6cd5-441c-bd8f-a1ea43df55e5} - {d85d83df-15e3-45d6-a9ad-cbc81f0b3239} + {4f39bd06-5204-43e1-9463-64590af41036} - {0786e96a-2673-4196-b7f7-575f383d314e} + {4426ec43-96f2-4936-8108-c653c2bd103a} - {77720da0-ce32-4521-8227-733b9c04d345} + {d002acc5-2229-4989-8c81-e807bffc7ca5} - {4e4ec007-a080-48a7-a0f1-2e13105b8ccf} + {6990964e-61fb-4607-abb5-186fcc85f0f2} - {fc24761e-033e-4ba2-b3e4-4bba071e8f6c} + {abb401ce-1e06-4c99-9676-1d0c884d6516} - {5d3b5ad4-dd6d-4019-bf4b-24606e921ad7} + {30aa3685-bb61-447e-8dee-d9ce56f12100} - {a2eac77d-a18d-4ae5-a7d1-c91ca3dfa752} + {5c266ee6-9660-484c-bed6-26e5352ceba1} - {bf21dcde-125e-4e71-a8dd-743d1736a31a} + {4a2831a1-7de4-4f5e-9154-054ea8186f88} - {a951a051-89bd-42c9-aa73-fd144404eeec} + {9a8dc7b9-a4c1-4aad-a2bf-3b83265e69db} - {d2746975-b67a-43dd-bb91-1d680e540ea9} + {297223ec-dd8f-4866-be8b-29c0df2c9bb3} - {b9e32874-b2f6-4cb9-a5cc-72986589a590} + {5ab37418-a5b7-4ecd-b331-637e4e3c9bc3} - {52707bfb-7c4c-4cd7-a897-992fe6c82245} + {4ce52f1b-9d75-4d6a-a07c-1a9acb4700e7} - {c05e4dd6-4e1f-4dcf-8569-7ff887859883} + {8b26d212-1038-4d51-a841-2917a863b644} diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj b/Util/testsuite/TestSuite_x64_vs140.vcxproj index f5ce08c74..ed4889bd0 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters index e952ddd25..31e6b163f 100644 --- a/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,64 +2,64 @@ - {46987708-8d83-4734-a35c-c20b8e1cbcec} + {78aefb25-04c6-4c33-8d14-b7152ae0ba8d} - {2bda8713-f213-4e2f-9a1e-1479ec692751} + {100288f3-870a-4924-8992-87b643397e30} - {757a2cf5-4668-4a88-94a6-3187f4202845} + {58aa804e-08cd-456c-83b5-5d400bce7b6f} - {d552502a-1200-4584-88d8-db621cc41ee0} + {89362acf-e354-44cc-84c6-f669e3ec08ba} - {8cee5512-0ae4-4c9f-98a9-20ad5486bcbc} + {6f543414-38e6-42f8-8544-2cc03b810201} - {d4fec6bc-50aa-4309-9268-4cf5648094f3} + {7f1d74e5-baff-43fd-9ca6-bf425bcec9d9} - {0eefb853-bf45-4fa8-95ba-dcc5bde9db6e} + {08b9d7e2-12b3-42a4-bbda-93ba146395be} - {5e2c815d-b8d8-4496-8d7b-737f2f2cfec8} + {9b9cb0dd-23cf-4b3c-92ee-b0233ebab192} - {50162e0c-f22a-4a31-bba3-b27e6c44c830} + {ce502745-c98c-4fe0-b61e-d8dba4480071} - {9c4f0992-c66d-4909-b75d-b413785a13ae} + {daf75ab5-4c52-4309-8090-96c27f422ae1} - {c2a3d82e-4544-4df8-b2e8-5699889da22d} + {23370b87-b4ef-42b6-b163-58d0b5ae7f5c} - {b5af4013-ccee-49fe-b203-910f44a6c515} + {78217ee4-00d3-42db-8d49-d7a20b9152b6} - {5a322bca-d024-4142-90a9-d8a2008ed37b} + {4d1bfbc2-4d56-47a1-b987-8b2eea6bbc3a} - {a017ccf4-a0fb-4b75-996e-51a71c7d0010} + {a985bef0-f50c-427b-96b4-e8e3ef066e9d} - {b39a243d-cd3c-463e-898f-95d13ea72ad0} + {1eaba7be-f96b-489f-896c-d430a09ac243} - {2cbaabc7-3240-4d47-9c31-8d4cd9ccbc4f} + {ac4832f0-8348-4be3-82f9-48cf00617121} - {8974e440-80a0-490c-b5a0-1c03f2c85670} + {db83d056-6f31-45f5-a854-6662f8e9736f} - {9f2ffcfa-fcd9-4a8b-a566-69f7924898eb} + {4648c0c4-c29b-4b49-a17b-e468b1dd7946} - {8d5cf423-c76a-4e07-a94e-e74e566de9a2} + {57d62ce8-c172-4cca-8fbe-c5a4b5542a08} - {e9cda46c-4eb5-4721-9505-9cf75ffb46b5} + {406a8a0d-5500-43f2-99e1-860993de072b} diff --git a/Util/testsuite/TestSuite_x64_vs150.vcxproj b/Util/testsuite/TestSuite_x64_vs150.vcxproj index c7c121a1b..a96a55d60 100644 --- a/Util/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Util/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters index 2c2d4a166..3b0f9c5f4 100644 --- a/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Util/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,64 +2,64 @@ - {cc4095ba-9fd4-4f3d-9dd5-890866eddfcc} + {d9a912a1-9f51-48cc-b254-afb405cd4112} - {1f2548c0-c8d9-460a-aba0-2bdb14785085} + {523ea23e-c52a-4a4b-af19-2bcde5802319} - {164ea6e8-cdbb-4236-8150-3e1310322c18} + {e30de7fc-09b8-41f4-ae9d-e30d61df0121} - {00f1fe76-15c4-46f5-8c7c-8e20f730d9a5} + {6180d33d-92f2-44f5-835e-d91ec3ce4ded} - {2821bc6f-7352-4951-834c-6c616f00acc4} + {db96db91-e9fb-4ca5-9126-3289f8c59aff} - {11e98d36-ac3c-40db-ac40-3000076b9ce8} + {1d70e485-3ccd-47a8-95ff-99469e469c18} - {e400451a-7479-40d8-9769-9f2919559c3d} + {75ccb9e5-f423-4961-9a4d-d6db11f8975c} - {bbec9fc0-ae48-48f3-a682-4d7d45967bfb} + {eba64ca4-bb56-4f21-83f4-57e9a6120b99} - {a72058ff-2f5e-42ea-8cda-52ca8f81a1cb} + {35fd3559-70bf-43ac-aa15-b0c4ff70b13e} - {f242e89b-1a88-45f3-b897-09f0d66fd2a9} + {3624cb68-8b9a-4056-a67b-6c65e12c0e63} - {549d294d-954c-42f8-8f7a-c5f42f8bccaa} + {6e17cb91-7498-41b8-8d4a-9f4bf3ba55c1} - {3ea6adea-d319-4452-82d6-ba7b14be97ef} + {e4b431bd-701f-4417-88af-57ea84aad41c} - {2986186c-9b1e-43db-8c50-e9846b0106c1} + {761007bc-220b-4ea0-8871-3d807d49311e} - {aef720ce-bd25-4626-bedf-5373f6b6bb2b} + {263c18c2-b069-46b7-bf9b-33d2ef225359} - {bc7768e7-3999-46be-9509-7d1db980f477} + {3f81f29f-cc10-40bb-b1d5-37dc0af5c489} - {17a664da-6fb6-4bbd-b383-8a5094b53f5e} + {3eb5464c-7585-431a-9289-f465b7c6efbb} - {490a694e-9e5e-499a-b390-fc5b47a2845d} + {03799899-e9fe-419f-b712-56d81de89340} - {0b41f763-69ac-4146-bead-b1d172a1301e} + {2c2d0080-6fbb-4e3a-8fcc-d8ff3d25d6c3} - {ab90f7c4-f562-4cbd-a050-7369f59d913f} + {6f6eed72-6fee-48ac-b600-5c42630f1e44} - {90281c89-6af2-4839-8adb-5769aba3e0b7} + {1e66d3c4-db86-468e-affa-debab5542600} diff --git a/Util/testsuite/TestSuite_x64_vs90.vcproj b/Util/testsuite/TestSuite_x64_vs90.vcproj index d53540353..a99ed8a3e 100644 --- a/Util/testsuite/TestSuite_x64_vs90.vcproj +++ b/Util/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoXMLMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoXMLMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoXMLMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoXMLMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT diff --git a/XML/XML_WEC2013_vs110.vcxproj.filters b/XML/XML_WEC2013_vs110.vcxproj.filters index 2eee8b197..21e3e4ad4 100644 --- a/XML/XML_WEC2013_vs110.vcxproj.filters +++ b/XML/XML_WEC2013_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {4d565343-77c1-46ee-853a-7001d5fead77} + {4ccbfd42-32fd-49b7-a229-6c2048dd94ba} - {2f6b9452-320a-47ee-987e-24268a7aa2c6} + {34e950d4-27ee-494c-beb8-b364e35eb016} - {09b44c3d-1d7d-402a-9d60-686bf242e47e} + {d5da0ecc-6701-4e47-aa9d-409f6e79c397} - {0f2d84c3-72f8-4503-804f-5a9679c48a72} + {d19b822b-c0e2-49dd-8b50-f00bf5005f9b} - {888b6177-55a7-45f9-9ee3-d21639638efc} + {158f4f70-9d47-42dd-9a46-0563c898e70b} - {5302ae5a-d871-4a43-8e9d-f0aca4aa63d5} + {3b6caacf-bd54-403c-8723-724e072b0ff1} - {a0a876e1-9565-4e60-8bbd-8e8df03a9db8} + {04498201-6308-46f0-b638-612cd266fc85} - {2b8dc0d5-5776-40c7-b381-b108fda608f3} + {da6cdada-f02e-4d9f-8126-3edff595a5bf} - {948fef3c-7401-44c9-9f41-c1e61d75a3a5} + {a86864ba-0379-45e3-b62a-b633c8c5320c} - {36c8b65d-d082-469f-bcd5-58e30b3b6468} + {80c22677-7a32-454e-86cb-3d804627fc51} - {e488a6bc-8462-47da-af8d-75953228323e} + {ec7ddd20-5a07-421c-9e22-daeacfbe559c} - {a3ace479-f902-4447-9dcc-e0e08925aeec} + {b8ed75a9-8d65-45ef-a1a0-2a3f8a699e80} diff --git a/XML/XML_WEC2013_vs120.vcxproj b/XML/XML_WEC2013_vs120.vcxproj index 2d626451e..460a216d7 100644 --- a/XML/XML_WEC2013_vs120.vcxproj +++ b/XML/XML_WEC2013_vs120.vcxproj @@ -106,11 +106,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT diff --git a/XML/XML_WEC2013_vs120.vcxproj.filters b/XML/XML_WEC2013_vs120.vcxproj.filters index 8195dee07..f6141fbe5 100644 --- a/XML/XML_WEC2013_vs120.vcxproj.filters +++ b/XML/XML_WEC2013_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {915746ad-84a6-4ef8-a0e3-87e765ab86e0} + {5c2e6dd7-98dc-463c-ae9e-9a62e1ad3c74} - {732da8eb-b3d4-4a06-8f14-90dccb7861b0} + {0cf26c08-7a43-42d2-9b4e-b891011b1a3d} - {4d53194e-7e05-46f4-8a71-355edb0eb4f4} + {8e72d6e5-5ebb-48f5-9fe2-7b1ea734db77} - {1795dd49-409d-44d5-956a-b05eedef37f5} + {31199106-f4ee-4345-8666-4d29a97bdb0b} - {9abea635-5a54-4ef5-93cd-c58979cffe80} + {aa0e2a6d-f74a-4bde-afb1-2a06e75e448a} - {f755da5d-d2c3-44d1-87b0-dd0619acd17a} + {c403f2c4-1768-45b1-88e7-9c9a1afa43a9} - {c9fa4ddb-8b69-4431-8a68-b645adcdf85f} + {42e8b34d-b361-4a03-a583-6b9c3c3b0d62} - {e63dd7cb-f8e1-4fc6-b461-c4778469eb79} + {c8189e66-ce9a-4a08-9e3c-461849bbc418} - {395c9563-07e1-409c-9ae7-61ce108529f4} + {2f8f121f-0078-492c-b764-3ce294ffc3dd} - {8992eaf2-8927-4387-9afc-d3aacc394430} + {9c0e8c3e-fab0-4db2-aa03-ef905ae6e62c} - {00766f96-1f58-487f-87cf-34213bce1924} + {8ab54ba2-477e-4b78-b5dc-b496af515bf4} - {a1fd8f32-68e4-4d3f-982f-5060279d867a} + {79cd23d3-c3ea-4d20-86a8-4521db04d8bf} diff --git a/XML/XML_vs100.vcxproj b/XML/XML_vs100.vcxproj index cd51128a6..17d44aee7 100644 --- a/XML/XML_vs100.vcxproj +++ b/XML/XML_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\XML\$(Configuration)\ PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoXMLmtd.lib + %(AdditionalDependencies) + ..\lib\PocoXMLMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoXMLmt.lib + %(AdditionalDependencies) + ..\lib\PocoXMLMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoXMLmdd.pdb + ..\lib\PocoXMLMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoXMLmdd.lib + %(AdditionalDependencies) + ..\lib\PocoXMLMDd.lib @@ -271,7 +274,7 @@ %(AdditionalDependencies) - ..\lib\PocoXMLmd.lib + ..\lib\PocoXMLMD.lib diff --git a/XML/XML_vs100.vcxproj.filters b/XML/XML_vs100.vcxproj.filters index 431c0a13f..b27fbf8bf 100644 --- a/XML/XML_vs100.vcxproj.filters +++ b/XML/XML_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {56a5ac1a-5815-42f3-9e84-2321b487fd25} + {5f204d39-12f6-41d6-978d-3e9448deaf8b} - {db00a5ea-08ca-4b9e-9264-a851bb06a438} + {5c0afa8b-2528-4422-bd6b-edcfc37a98ac} - {3f8c9c82-2bea-492b-ba61-5f6bd0c025c8} + {ae3fbae3-b7fc-44da-8c6a-952e9fd545fa} - {67a8e216-bc5d-4dbc-9b8b-c13809764e3c} + {f8286fee-fc86-4b22-8496-528a73d6cd49} - {f70dcc18-394c-46d7-8edf-98c98af8998f} + {69422375-0a13-4a78-b8e7-69c4ec06e91f} - {a15168e4-9d4f-48cc-a163-4544ebe04b7c} + {305e7dcf-e4c0-424e-b3ba-99e38f13d6a4} - {0c990ceb-cff1-4c0a-889a-a2b963fee361} + {c00a865d-0fad-4379-9bfc-b178f0291d86} - {f9f9d446-53f3-4525-894d-3e23fbee73a0} + {f3d7d053-5e29-4b53-a310-8dd8b25c7050} - {e7c675d4-ff0c-4fda-9b2c-1f0bfd606070} + {f25f71c9-f77e-4131-8b84-9609de1c7a54} - {2b9edf1e-3857-479f-b215-53c44455e228} + {b3f9488f-e74e-4924-82a1-b272b9db5e51} - {83bb8bbb-0427-4e38-a2f2-f7d8f543b2f9} + {76a98959-a3e4-493b-9bd4-7eaca0a03967} - {4a36d12b-91dd-4ca0-8136-179376c031cf} + {d268a686-c398-4f97-a654-2ca9dcf94b16} diff --git a/XML/XML_vs110.vcxproj b/XML/XML_vs110.vcxproj index 3db57828f..7ddb4ad42 100644 --- a/XML/XML_vs110.vcxproj +++ b/XML/XML_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoXMLmtd.lib + ..\lib\PocoXMLMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoXMLmt.lib + ..\lib\PocoXMLMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoXMLmdd.pdb + ..\lib\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoXMLmdd.lib + ..\lib\PocoXMLMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoXMLmd.lib + ..\lib\PocoXMLMD.lib diff --git a/XML/XML_vs110.vcxproj.filters b/XML/XML_vs110.vcxproj.filters index 01e30d226..ffd2f7f99 100644 --- a/XML/XML_vs110.vcxproj.filters +++ b/XML/XML_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {b4106a07-0f3a-4b57-bf1e-d78f27f24a30} + {35a4e973-fc00-40b1-b3a6-00d318b8dfd2} - {e9ae31dd-387e-45b5-ab13-1b1db87438b3} + {303a3ffe-f29e-4adb-a0e5-bc4e62032d29} - {48ef15a8-b51b-4b78-8705-d52777540b5d} + {133c05ea-406f-495a-b9cf-2822718524c7} - {91fd59fa-0ea7-4913-80d4-6c7a7b9b64e3} + {ba06bb80-6dae-46c3-b121-dacc6cf9e83c} - {081aa3c7-0e7e-4133-aefb-37316f1ee40c} + {95b744f8-5c1b-4fb9-ab72-d5b9200dd48d} - {c1de8594-ff5f-4294-8d2f-6111a8befc9b} + {fbabe360-ae71-4d2a-b474-bc8dafe0a322} - {30a29536-6091-44f0-b35e-12f30b640f25} + {30b877b2-8a76-44dc-b96c-03a37b50e437} - {e6d57d4c-f67b-41ba-8f10-c9b9d909cdda} + {42d4683a-4b7b-410b-850c-abfc4e37d1ce} - {932f5441-0a48-4d78-9823-0ba844c8d22c} + {03fcc14b-f623-4842-bd60-31750b83ae8c} - {29a82b02-a765-4afd-b315-4063b87d8209} + {34abbbbe-a032-4cd9-954a-3f4e161a20c9} - {43626e26-c6d8-4560-bf65-1db65b522383} + {841123e4-5bec-4284-b042-60c03253fbfe} - {73408183-13a2-4f2a-9057-82b060de752b} + {65b42e64-60e4-4a22-8f68-68024b206f8a} diff --git a/XML/XML_vs120.vcxproj b/XML/XML_vs120.vcxproj index f4d7c3d76..bdb09ac5e 100644 --- a/XML/XML_vs120.vcxproj +++ b/XML/XML_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoXMLmtd.lib + ..\lib\PocoXMLMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoXMLmt.lib + ..\lib\PocoXMLMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoXMLmdd.pdb + ..\lib\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoXMLmdd.lib + ..\lib\PocoXMLMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoXMLmd.lib + ..\lib\PocoXMLMD.lib diff --git a/XML/XML_vs120.vcxproj.filters b/XML/XML_vs120.vcxproj.filters index 2f715d75c..9a4bd34f4 100644 --- a/XML/XML_vs120.vcxproj.filters +++ b/XML/XML_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {1da1fa47-6f5b-443f-93f9-1f5e408bc6b9} + {ff39df1b-ee24-4a97-af7b-0b4a44cdca02} - {94f24e0d-ee66-4d6b-9ba9-f17f95eaab11} + {0f868595-8f3a-456b-918a-f77d91cd5c91} - {603194d3-5a0b-4a79-810e-22b5e73d01f8} + {e4160858-99c1-4b0c-bba2-7989f879163d} - {2f7a7bcd-2cd2-480f-b9f8-463ed301bde6} + {69310169-6800-4bf3-ba5f-ba4e8fcbd81b} - {c1c42f26-888b-4571-aceb-39f69abc3e48} + {56a235b3-f2e9-496f-95b3-e0eb6b8081d8} - {b69125c3-b528-4b87-bfc5-c16adb80f1a2} + {8810355b-f056-4f2e-8c28-54cb2f1efe84} - {32e89539-d3ec-4c29-8d5d-85f468858dc6} + {69150d91-393d-40ad-a6c1-9ae79e11a350} - {88623b28-5d18-4c02-ae2c-bd94be43db03} + {d1fd0148-cb60-4116-99fc-3cf462949f1b} - {575991ed-ac50-472b-b970-876ce4c292b3} + {b6648019-0ca1-45c9-9556-5f755a6782d0} - {32258539-c4b8-4064-98c5-ef595e215298} + {4ff509bb-8ce0-49dc-922a-e7ee5ce642dd} - {5f96272d-f975-4b90-97b9-58ebd32fe48c} + {9687a930-81c6-4b57-89c4-a7792b14a6dd} - {21fa3b0e-9bd4-44f7-8011-1cfdee28c354} + {9c89b055-f77f-48ac-b205-3fd4e8046618} diff --git a/XML/XML_vs140.vcxproj b/XML/XML_vs140.vcxproj index eb26c0ca4..8729bf11f 100644 --- a/XML/XML_vs140.vcxproj +++ b/XML/XML_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoXMLmtd.lib + ..\lib\PocoXMLMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoXMLmt.lib + ..\lib\PocoXMLMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoXMLmdd.pdb + ..\lib\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoXMLmdd.lib + ..\lib\PocoXMLMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoXMLmd.lib + ..\lib\PocoXMLMD.lib diff --git a/XML/XML_vs140.vcxproj.filters b/XML/XML_vs140.vcxproj.filters index 93d9cbe9f..8f0b4d940 100644 --- a/XML/XML_vs140.vcxproj.filters +++ b/XML/XML_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {3f444d6e-485c-444f-be0e-eb78aaca79d3} + {4dad1955-e19c-44f9-aeec-82aaf59e0f46} - {6dfa5333-b095-4aa4-a963-25c5b4604173} + {1e59f9ba-5508-4eca-a5c0-7b3d988d62dc} - {6a039ec7-97d6-4562-ba8b-0f13614b386a} + {5f0ee766-1549-45ed-8ab6-e0bc8d41dd0d} - {26c6a6e9-6602-4894-ae6b-e2c3012df454} + {6a953f3c-f013-4206-9afc-e381599930dd} - {b50dda0e-a63b-45f1-bc5a-8772c2b8967f} + {cd79c5ff-cd29-405a-88f5-6f5240837e75} - {01695b5d-1273-4f79-af8d-0bd55700673b} + {b9512a31-1894-4890-9166-8570dcb28ff0} - {a1b0e29a-bd7a-41f9-8ed4-7ef3b3da4e89} + {cad21f9c-9442-4e92-898d-8a072eb258ab} - {a016c5e9-c56e-4ee4-b65c-c5c749b3579b} + {270b9cba-7e17-42ca-a3c2-0679ea095b02} - {741408e4-9978-4921-9f58-20ee08f53df1} + {8ed6aece-20f1-4b04-9235-748de48345cf} - {3db75c8a-1d43-40a0-bee2-8e718a3ccc14} + {1cdd1087-34d2-4888-83b2-0dc220cfba69} - {05ed60d9-ed1e-4a39-9177-5cd983880a0b} + {e767ee44-59e9-4444-a61b-23b88ae4e201} - {a9c9ed85-de22-4f7b-a6c9-53e5de9de881} + {1279f4ab-57c6-4296-912c-2ed557d0edc8} diff --git a/XML/XML_vs150.vcxproj b/XML/XML_vs150.vcxproj index 91ec25e4d..662b5cc29 100644 --- a/XML/XML_vs150.vcxproj +++ b/XML/XML_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoXMLd - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin\ @@ -200,7 +200,7 @@ Default - ..\lib\PocoXMLmtd.lib + ..\lib\PocoXMLMTd.lib @@ -224,7 +224,7 @@ Default - ..\lib\PocoXMLmt.lib + ..\lib\PocoXMLMT.lib @@ -241,13 +241,13 @@ true true - ..\lib\PocoXMLmdd.pdb + ..\lib\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib\PocoXMLmdd.lib + ..\lib\PocoXMLMDd.lib @@ -272,7 +272,7 @@ Default - ..\lib\PocoXMLmd.lib + ..\lib\PocoXMLMD.lib diff --git a/XML/XML_vs150.vcxproj.filters b/XML/XML_vs150.vcxproj.filters index a638b042f..9fb5fa370 100644 --- a/XML/XML_vs150.vcxproj.filters +++ b/XML/XML_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {3d5cda11-b5b6-4fff-86e3-878f000668f5} + {7934278b-66aa-4cce-ae23-a499d4cc30a3} - {2c7a367b-fc72-4ef2-9e4a-6e53a9065bf6} + {41fa59ff-c9ca-4fa3-89c0-5c105b5727d6} - {fee80166-1b42-4f21-98ba-e97d4b284272} + {54f124d3-2c7f-44a9-84bf-b656f85f8cbc} - {442a7f54-6df7-45de-8ffd-02a07a5fe93b} + {492f8ce3-33ae-452b-8eda-7581ea378403} - {a0a8904e-a6af-4e5e-9493-26cc27f9ce02} + {26a01b75-76e1-49d4-a5f4-c4e68a7a9fa1} - {ba6c43a5-d770-42af-8143-f817fd1afff2} + {93875e3c-65ca-4ea2-a82a-e79aefb265d0} - {2dd67d4a-d815-4d07-9b88-c330c2915d49} + {e21185d3-150a-4a8e-96db-392ba72cf956} - {d8d0c2a7-c367-44b1-bbcd-ec0d2dd3b608} + {6577897c-1f53-4080-9570-bc964dba5f8b} - {27defdef-772c-4d25-9932-35271932edbf} + {3945aa8a-fb86-4fe3-9480-e1e077387c3b} - {09aca560-94ed-477c-be04-3ae0d7c41594} + {07e93722-a8e0-4fe4-900b-dabf3258168e} - {2e0406d3-1ac9-4e8a-a294-7aa3bb660d18} + {e2c651f9-ea30-4e0e-81bb-c4b7f39be766} - {f4f5f7b9-2690-4676-9139-cdec759e076a} + {f5e91a6b-0b34-483a-827e-1bc13028848c} diff --git a/XML/XML_vs90.vcproj b/XML/XML_vs90.vcproj index 904d1f7aa..0853f2f44 100644 --- a/XML/XML_vs90.vcproj +++ b/XML/XML_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoXMLMTd.lib"/> + OutputFile="..\lib\PocoXMLMT.lib"/> + OutputFile="..\lib\PocoXMLMDd.lib"/> + OutputFile="..\lib\PocoXMLMD.lib"/> ..\lib64\ obj64\XML\$(Configuration)\ PocoXML64d - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML64 - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoXMLmtd.lib + %(AdditionalDependencies) + ..\lib64\PocoXMLMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoXMLmt.lib + %(AdditionalDependencies) + ..\lib64\PocoXMLMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoXMLmdd.pdb + ..\lib64\PocoXMLMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoXMLmdd.lib + %(AdditionalDependencies) + ..\lib64\PocoXMLMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoXMLmd.lib + %(AdditionalDependencies) + ..\lib64\PocoXMLMD.lib + MachineX64 diff --git a/XML/XML_x64_vs100.vcxproj.filters b/XML/XML_x64_vs100.vcxproj.filters index 929982b68..21014b0b1 100644 --- a/XML/XML_x64_vs100.vcxproj.filters +++ b/XML/XML_x64_vs100.vcxproj.filters @@ -2,40 +2,40 @@ - {86dbc419-a600-47ce-8250-da4e6749d785} + {8c77d0de-d750-4302-88c3-6f41f9177b46} - {bb06364a-0521-46a2-9d8b-0ab7ac45d3c6} + {9f2238ff-dfb9-4061-8636-58d460b369ce} - {bd8017ef-249d-4a2e-a871-74bce818aba1} + {c3b8ad4b-3137-4922-a6cb-deb1048225aa} - {1614b41f-a875-4f0b-ba2c-784f5b13cc4d} + {c23c6618-3756-4c0c-866d-10b0b1406779} - {0ca7be8a-b4ee-49bb-849c-16b8fe7ea55f} + {c2cdcfa1-e64d-48fd-a9b3-861e3fbcd31a} - {2cbcd7a6-6455-49fc-97a1-0ff40cbbcc4e} + {bb4c21e8-8d49-4e4f-8816-7f42274096f4} - {8fc6ade2-7e22-44d8-975b-8d190ae8a46c} + {0b55a9e3-ffc3-48ce-b70b-b08fa765d1ff} - {2ca7beef-d206-441a-96ad-6048dc76bbc3} + {ca2eb348-9374-40c6-8b29-0bf89595d356} - {34bfd341-015b-4ee9-9184-a34e25de848c} + {8aebc071-3a8c-4ef1-8f58-b4fe021590d6} - {4ffa35aa-8861-4bc2-a5ab-a21dae1cf73d} + {66d63e88-8cef-47a9-900e-e895c97871d7} - {6bd1b4d4-25f5-4a71-bad7-12ee0c44766c} + {0206c749-0d52-4e7f-b8d8-0ded3f4d939f} - {6172b179-af57-483b-a47f-420bbade2033} + {6723a082-a05e-4a6e-a8d9-fdb4a05a54f7} diff --git a/XML/XML_x64_vs110.vcxproj b/XML/XML_x64_vs110.vcxproj index 18e231033..e0cedff26 100644 --- a/XML/XML_x64_vs110.vcxproj +++ b/XML/XML_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoXML64d - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML64 - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoXMLmtd.lib + ..\lib64\PocoXMLMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoXMLmt.lib + ..\lib64\PocoXMLMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoXMLmdd.pdb + ..\lib64\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoXMLmdd.lib + ..\lib64\PocoXMLMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoXMLmd.lib + ..\lib64\PocoXMLMD.lib + MachineX64 diff --git a/XML/XML_x64_vs110.vcxproj.filters b/XML/XML_x64_vs110.vcxproj.filters index e41fde54f..2b9d8f860 100644 --- a/XML/XML_x64_vs110.vcxproj.filters +++ b/XML/XML_x64_vs110.vcxproj.filters @@ -2,40 +2,40 @@ - {3729b0c5-fa79-422a-8777-5747abe114f7} + {c5dc3ae7-6ec4-4663-ab7c-ce869a84284e} - {b19557bf-57fa-4fbd-ad04-381367e39047} + {2d1db416-0f5f-4f0f-8fbd-6438545c4acd} - {0a916444-5c53-4984-b354-ca2f98e6cc88} + {04b72d47-34c4-4e52-a799-3d06fdb29b29} - {c765bc6d-7bf5-45e5-bf29-bebeaac66141} + {269cf3ee-2be0-4847-a512-8e515f17bc0b} - {4b12041c-284c-4a66-9b78-7462d450326d} + {7f8d77a4-2219-4a35-afc2-20f0005ddff2} - {8e5b3227-fa82-4871-8c8c-96bb1a714c8f} + {6e0cfdc5-97d8-4806-903e-f78a2dd0dd28} - {404a45be-7f67-472a-8ac5-03ff44877f7e} + {d3955948-f7bd-4037-8a2f-fc992bf2d55f} - {3d6b2561-5427-47d1-864a-77d36bc2fab3} + {4b32a5e7-0e19-4f05-b9d3-b7501bc81d52} - {30a51aa7-0923-4699-bc7c-d7512efec3b6} + {bef7de7b-f595-4b1c-a9a9-f46acbb81a0b} - {c1644103-5243-43a5-8be3-200da9b7453c} + {9f258650-476a-4598-ac2f-80d06b7d7128} - {61817202-8011-4a7b-8172-dd02a955ca60} + {085d9d46-6255-4268-9fa9-512fd9eedd11} - {8e1a0cc2-b7f9-49de-ab6f-105c57707b39} + {e6ecaf16-35c2-4416-9ba8-1a0fa2373d2c} diff --git a/XML/XML_x64_vs120.vcxproj b/XML/XML_x64_vs120.vcxproj index 22a737f71..3738e639c 100644 --- a/XML/XML_x64_vs120.vcxproj +++ b/XML/XML_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoXML64d - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML64 - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoXMLmtd.lib + ..\lib64\PocoXMLMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoXMLmt.lib + ..\lib64\PocoXMLMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoXMLmdd.pdb + ..\lib64\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoXMLmdd.lib + ..\lib64\PocoXMLMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoXMLmd.lib + ..\lib64\PocoXMLMD.lib + MachineX64 diff --git a/XML/XML_x64_vs120.vcxproj.filters b/XML/XML_x64_vs120.vcxproj.filters index b704835b5..bf27668b1 100644 --- a/XML/XML_x64_vs120.vcxproj.filters +++ b/XML/XML_x64_vs120.vcxproj.filters @@ -2,40 +2,40 @@ - {d04c5399-8f3d-4ff8-9354-eb67ad31dc1f} + {f969ac2c-bf32-411f-976a-87c3884fd919} - {f8f1e92d-609b-40ff-93c1-15721ef4150a} + {7f3eaf19-31f5-43a4-88e6-860284e41aa0} - {0b63733d-7f55-40d1-93f8-62a36fd7fa0c} + {785ca49c-1a8b-4884-a684-df8d862c1633} - {5d89989d-015e-449d-bc04-cb96b5ffa5d9} + {a9839f44-7d55-4927-b4f5-8cf8e7788d2c} - {58b60c25-ea74-4290-bbaa-e6fdff739722} + {712e49dd-7fdc-47e1-a3bf-59ffeb41ecde} - {c49c4750-7e38-4835-97cb-a4e703063fc7} + {6a59dcae-d565-447a-937b-0cc289f241c0} - {00ddc28f-4407-4ae6-b33b-ef11a0046178} + {0de62a8f-f0ce-4763-95a8-6379fce76e0c} - {77c48821-503f-47e0-8838-beabcdec8a84} + {7fab8f6e-766d-42eb-bfdf-31b484037578} - {c310b1d9-9b9c-47aa-a2ee-173f39d1ed46} + {063e7f4a-23bc-487b-933b-cd277b3b1807} - {c75d3fda-1a4b-4189-807d-6c5df09829c1} + {c13b3a86-fd7b-4eea-a64e-8bc4f6d59d61} - {1c7300b3-753e-499d-a08b-8619b425e003} + {458992d4-c664-4423-b444-f72829806e9d} - {2d564e68-0e0c-4edd-8ceb-fb57af69ea94} + {ce6a0228-7d24-450f-bf08-59e341d6b7d0} diff --git a/XML/XML_x64_vs140.vcxproj b/XML/XML_x64_vs140.vcxproj index d49809460..07a68ac31 100644 --- a/XML/XML_x64_vs140.vcxproj +++ b/XML/XML_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoXML64d - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML64 - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoXMLmtd.lib + ..\lib64\PocoXMLMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoXMLmt.lib + ..\lib64\PocoXMLMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoXMLmdd.pdb + ..\lib64\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoXMLmdd.lib + ..\lib64\PocoXMLMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoXMLmd.lib + ..\lib64\PocoXMLMD.lib + MachineX64 diff --git a/XML/XML_x64_vs140.vcxproj.filters b/XML/XML_x64_vs140.vcxproj.filters index 2dae9d13f..c09800a50 100644 --- a/XML/XML_x64_vs140.vcxproj.filters +++ b/XML/XML_x64_vs140.vcxproj.filters @@ -2,40 +2,40 @@ - {75640bfd-a0b7-42a0-88eb-e0eb9cb0d99e} + {6b7e2e77-cbc9-4f9d-928c-1343d3c06d32} - {30dcd988-176c-4ae2-a2fb-673919ed5c2b} + {a6778b06-7b11-4638-ae59-62569af6c7ef} - {6ac47627-44ce-476b-b869-3eb0688e3fe8} + {7fee92f2-a5ed-4081-a7e4-713093d324bf} - {b2e8b8c9-a425-4f28-a0dc-8881204aaab4} + {01146a10-37d1-47d4-8036-b0474f2d69ff} - {ca92454e-827f-4d9c-a72b-2ae9df5d3729} + {f279e0b8-ddbd-41ff-b30b-ceeacaad22c9} - {6813f7ce-38d0-4335-a138-0b3cf598f1e1} + {f566cba9-bb39-427d-a696-de679676eaaf} - {3ed67900-4224-49c2-8ace-12b89470a82d} + {c13534ae-99fd-4900-a02d-4ce2860b4584} - {423397b1-7ad0-47e6-afa8-345e640472b2} + {5649b35f-0875-4e41-af11-ba51f08235dc} - {311927c7-76f5-4277-8771-437dc4ca7aaf} + {8cfca137-829d-4a0b-834d-8a1980a742ed} - {99b24cdc-9125-4d26-8064-e2f80afebae9} + {83162f84-30d7-48e2-84eb-23acce944ec4} - {59cc834c-526b-48ab-8bc6-6dd82a6bc6ca} + {3e4674e9-b407-4282-9195-2d1e856fa1f1} - {34c8b7a6-0ec1-4c99-8958-f57e3e1aa1b4} + {af75a6f5-534d-4aee-a5c3-4095f4599473} diff --git a/XML/XML_x64_vs150.vcxproj b/XML/XML_x64_vs150.vcxproj index ba0f23fd6..e75e7e080 100644 --- a/XML/XML_x64_vs150.vcxproj +++ b/XML/XML_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoXML64d - PocoXMLmdd - PocoXMLmtd + PocoXMLMDd + PocoXMLMTd PocoXML64 - PocoXMLmd - PocoXMLmt + PocoXMLMD + PocoXMLMT ..\bin64\ @@ -200,7 +200,8 @@ Default - ..\lib64\PocoXMLmtd.lib + ..\lib64\PocoXMLMTd.lib + MachineX64 @@ -224,7 +225,8 @@ Default - ..\lib64\PocoXMLmt.lib + ..\lib64\PocoXMLMT.lib + MachineX64 @@ -241,13 +243,14 @@ true true - ..\lib64\PocoXMLmdd.pdb + ..\lib64\PocoXMLMDd.pdb Level3 ProgramDatabase Default - ..\lib64\PocoXMLmdd.lib + ..\lib64\PocoXMLMDd.lib + MachineX64 @@ -271,7 +274,8 @@ Default - ..\lib64\PocoXMLmd.lib + ..\lib64\PocoXMLMD.lib + MachineX64 diff --git a/XML/XML_x64_vs150.vcxproj.filters b/XML/XML_x64_vs150.vcxproj.filters index 983b2cc89..fbc0db4ef 100644 --- a/XML/XML_x64_vs150.vcxproj.filters +++ b/XML/XML_x64_vs150.vcxproj.filters @@ -2,40 +2,40 @@ - {c319a165-a39d-4bcc-b894-d3a057a9aaff} + {82360c2a-4818-49c3-8e5d-07e61044ecd1} - {78ca0e33-d3a8-4208-9376-f6ee3dcc460d} + {c6fdd742-4161-4995-b119-88963da71975} - {4cf5d949-558b-4ca5-a25a-7590caaf716b} + {b200bc1f-82cd-4161-acfe-02d72c83d805} - {fb8a450e-6083-4543-9a4a-d8dc6d42664c} + {72968ddd-3bf3-40ca-a03b-9b6ef052aad6} - {de89359c-3c8b-4eaa-b4c1-848a1c85bb05} + {500c3d4f-6372-44aa-b0f1-c414b9818543} - {0e1c0ca9-9b80-4a7f-889d-8655cb85e02a} + {7c7bca10-a635-4269-b405-6d32069c8572} - {36620d7b-5280-45d7-b46d-ce2a974ae64c} + {e68d2722-bde3-4e3d-bb61-47878bf000c6} - {c0e03842-b0cc-4d81-b1c1-ee9c7f1bee53} + {ec350912-7e23-4fab-b1c8-a46d8c79b35b} - {fed2fdcd-55a0-48e3-b581-a28da333cc0d} + {a606a6e4-fac1-4f6a-bf19-42a6a63806e5} - {52638cbd-9c33-4f17-b4e0-0470707a649e} + {3ab576b9-123b-4188-bf45-514970e83a5b} - {e05c237d-2d45-4810-8a32-2f9165b73daa} + {72314f26-820e-46af-9e5d-92cfa25e002c} - {c867e459-3fe4-4976-b058-6824ca74168f} + {28527eeb-8dd8-497c-a097-6a51d5fe74e5} diff --git a/XML/XML_x64_vs90.vcproj b/XML/XML_x64_vs90.vcproj index 88076c2c6..7e4c31f56 100644 --- a/XML/XML_x64_vs90.vcproj +++ b/XML/XML_x64_vs90.vcproj @@ -56,7 +56,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoXMLmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoXMLMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/XML/testsuite/TestSuite.progen b/XML/testsuite/TestSuite.progen index 6e114f1d2..b72269574 100644 --- a/XML/testsuite/TestSuite.progen +++ b/XML/testsuite/TestSuite.progen @@ -7,3 +7,4 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.linker.dependencies = iphlpapi.lib diff --git a/XML/testsuite/TestSuite_CE_vs90.vcproj b/XML/testsuite/TestSuite_CE_vs90.vcproj index 3a4dd7397..b5d8286f2 100644 --- a/XML/testsuite/TestSuite_CE_vs90.vcproj +++ b/XML/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {f4f2e5c2-16a2-4f34-a149-4267c9826690} + {64b380e6-d3d0-43af-98ab-c179cadc26c9} - {51875e49-7dab-4b7a-b518-d53b9900eec5} + {4622b0ad-5255-4050-be5f-668465daf5e0} - {00994284-e062-4eae-a273-b1a6f24a8f18} + {5bc95e9b-3739-4ed7-a101-52a86923b2fd} - {8877a574-a121-4504-8dbf-af69929ad522} + {d9b6ae22-cdda-4192-9faa-f286211bd3d2} - {937e10b9-6ad9-41a3-a042-356004ec9a4e} + {a9106722-e5dc-4792-9682-ef2451da57fc} - {a80194e8-fadc-42c8-a010-0d7961059a1b} + {ddb8419e-93fc-41e7-90c5-0578d87f8880} - {326ff3c2-ce03-4124-b9c2-e63fbc213897} + {53eabe20-84e5-4f87-900f-e7bc698c6c71} - {93a33e65-c237-489d-a329-04929b4c95ab} + {56d78628-8af0-418e-8354-a42d86416e1e} - {35e1e93e-f9b9-4e89-866b-b1979bd7c2a7} + {8516f9f3-d376-499f-aafe-518e81c35784} - {d3ed1125-14b1-451b-9365-cd28fee75bab} + {7dec22b2-8ffd-4830-b92b-7b0ad6c81154} - {9d3256b0-b7b3-42b2-ab55-9bbcda0801fd} + {f205e3e9-8f92-4c9a-b0f9-2ddf3775ea1c} - {94c8ada1-448b-448b-a5bb-6bef2866f024} + {674905a0-0549-40fb-ada1-8d266a198598} - {85b3d538-2230-4570-8e02-ff6508e74a41} + {a86c9c48-7764-457d-aea9-8c2de7330ccd} - {ee1b65fe-d3d0-4259-be5c-23059d1306b5} + {a135eac1-57ae-46d9-b16d-702f97f51b61} diff --git a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 3a8762e0b..afa5e4c3c 100644 --- a/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {10f70e5d-8206-4900-959f-88cfdd9c147f} + {68960e08-fb1c-4102-968d-f50a048ca1a8} - {21168f37-5525-4efa-adbb-a94c7ccfb91c} + {7d21f5e9-1d6c-4714-a444-e3a574adecc0} - {f64ddb2e-6cc2-4c29-b58b-377686cf70ad} + {1a4d7f23-521a-42a7-a4e5-a9196bde751b} - {003e9d55-01c0-4029-8712-c31d061e2c6e} + {ed7b5b23-c733-40a6-b560-30befd743f97} - {5de89585-2439-4432-a88f-d5765a6f6286} + {f00a725b-4752-4da8-9448-7b14799c74c1} - {e1550cd5-8b7c-4f33-bf95-fe1fbbe95ff1} + {7f52cd45-ac8c-4cff-880a-39ab14fffaeb} - {a4349ee0-81c5-43b2-92d3-6ec2fcbccd6a} + {ae5f7e52-fc03-4734-a8ce-467c66e203a0} - {02726647-a719-49b9-8893-09fe314a3f08} + {8e7c68ca-3092-4071-93fb-7e7592039cbd} - {3a4bc9e6-9afe-4b31-a11e-02ae79c1de1a} + {5524809d-c22f-4c93-85df-cfe9307e0a96} - {dc132ddb-8300-4523-b9b6-963f6046700e} + {7c63ee96-101f-459c-9d2c-8f9d46a1dd98} - {44ff4563-6d86-442d-96f1-519a9afeb95a} + {9fad980d-f08c-4aac-a41b-81934a4dc186} - {bdf755aa-6de6-4e22-bd1a-8b8b296e7e07} + {a5cd7eaa-1324-4041-bd54-4a5541ef3799} - {53fac873-037c-4b63-ae12-976dad28e2c4} + {c848a5ea-7d5e-4bdf-b9bb-e347d88c9968} - {2403946c-6b95-4b89-9662-7a76d4367756} + {547605df-52a5-4859-9cd2-e7014f5bb111} diff --git a/XML/testsuite/TestSuite_vs100.vcxproj b/XML/testsuite/TestSuite_vs100.vcxproj index e23754ac7..b87448ec9 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj +++ b/XML/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - Iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - Iphlpapi.lib;%(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs100.vcxproj.filters b/XML/testsuite/TestSuite_vs100.vcxproj.filters index 04df24b05..cc43e713c 100644 --- a/XML/testsuite/TestSuite_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {6c7ddb57-1ee2-49c7-8e6f-59572196af90} + {e81e4b9b-a5b6-479d-9014-e7135d5b2808} - {e0b4803c-09f4-468f-8edb-8d2de1d1dd15} + {3ef80f9b-0fb0-4f11-88cc-0489aaf915a6} - {ab9c5135-0223-45a8-992c-fe1bfb526f96} + {d5afd62f-cb45-456f-a5b9-b1a1e97738eb} - {383d17e8-7fd4-4c18-bdaf-272ea10d0b14} + {e38932b1-6ba7-4ffe-8f01-e1b1c27b8a8d} - {7b91e599-059c-4b81-ae4e-e448ac03b466} + {6e468ccd-cf9f-4d25-bf86-5aef26d81c69} - {5fcffb45-f851-4374-9bdb-eb72e0640061} + {8a9746a7-53df-4aef-a62a-0643272e3f1b} - {c75c50b4-d4f5-4d19-be7c-265582857ca1} + {bb37eea8-4bf4-42ea-a7b6-59b3b664d46b} - {3c26774f-50d6-4720-9204-4948aa0b672d} + {966c16fb-d8c9-4615-90da-febb316e8880} - {f11bf943-4788-4e0c-afe1-c82608dd3e5a} + {858152df-7c32-4d3b-8542-c86acbb17e26} - {d2a97dc2-609a-4235-86f8-d00819fe32f4} + {c53eb44b-0e82-4bd0-8259-041306648546} - {16456933-9b0d-41ff-9b5d-a39d96256099} + {cbaa53b6-9222-4f2a-b418-0d70bf4fd417} - {5d163c51-56e7-4700-8340-a4bf531c81c7} + {9186eae4-bdf3-4602-b78c-5e111b9979dd} - {f0705423-94be-45dd-b717-ae943d71a020} + {3fa766d9-a50b-484a-848d-f0a5c5b495fb} - {12eea7e4-255d-4e5d-9cf4-3304f51c2d6e} + {3328043f-60cf-4e07-8176-fb5df71c8705} diff --git a/XML/testsuite/TestSuite_vs110.vcxproj b/XML/testsuite/TestSuite_vs110.vcxproj index f1254b4ed..6b8309010 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj +++ b/XML/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs110.vcxproj.filters b/XML/testsuite/TestSuite_vs110.vcxproj.filters index 62071fb96..814fc9b97 100644 --- a/XML/testsuite/TestSuite_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {3db721c1-b11d-4ab6-b290-20978e9686da} + {1a675fa4-d93c-4b78-bab8-d22a2f4e05f9} - {237bda54-d74c-4ce2-bb80-d0c1d84d260b} + {3bb08f63-d429-4ca1-b6c7-038978c88dd3} - {4c4919b4-2ef1-4d8f-acac-91ff2b905e94} + {a4b5143e-b520-4d34-a683-9f5fe90671f5} - {65924c1c-f0fb-47da-965e-775bdbd04b68} + {1d4fe72b-2af1-430e-baa4-e33bde462809} - {74271298-8154-49b6-a363-f4d10f9e4476} + {140a5f74-3242-4861-9e4c-524b78e73ccc} - {c3299808-10af-4395-90b1-56749630aebd} + {ce0d44b0-606a-46f0-b342-9ab9b9974170} - {e5f0f518-5578-4d60-bc28-c40248448b5e} + {2763688b-92fe-4aa5-8bcf-e2d6e81f64f3} - {77733a8b-7108-46c9-902c-033b6579dcf3} + {fb62e822-125f-47b3-b19d-9089e6f3df3d} - {9de028d0-ffd5-45c0-acb5-b86a3bd9ec3c} + {8a89ff76-c6b3-4de0-bf74-8015060bcaf0} - {775c098d-4819-40f7-abd3-897ae2df90aa} + {b3312084-dd39-4821-80da-37894c4989ec} - {385006f5-f737-4144-8f1e-506b7f340b1a} + {1e71a371-f35a-4f90-9026-8565a99003a8} - {108886d8-df2f-43b5-8624-07d77a18ed9b} + {b3b134bd-ef7c-4396-b24f-d7c423f778b3} - {6635abf3-ae05-4752-b2f6-060eb289a26e} + {5b757a99-c394-47e7-a59e-7b9b7e2eebb5} - {a8de4e8b-d31c-49d0-94d6-f388bf5c0987} + {a85f69a0-185b-4e41-8e52-edcd14132de4} diff --git a/XML/testsuite/TestSuite_vs120.vcxproj b/XML/testsuite/TestSuite_vs120.vcxproj index 3e68dd154..2bf53ac8f 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj +++ b/XML/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs120.vcxproj.filters b/XML/testsuite/TestSuite_vs120.vcxproj.filters index 348089756..c5ac8bab5 100644 --- a/XML/testsuite/TestSuite_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {476315e8-d469-4efc-b960-67f74555d242} + {14afd783-2762-4bba-919f-39b238a551a5} - {73dfb5e7-cc0e-44f9-8c4c-758fe2eb28f6} + {4f76fcdf-b6ec-49f1-8743-0e06bb1e77a5} - {01b6a74f-3c5c-4720-96ee-97009cf222d1} + {f0bbddc7-2f4e-4525-ae3b-8d1345b24058} - {06d5ca29-fbce-4da1-996a-70fd937b247c} + {2d4d92e6-f8ea-488b-aff3-3eae0fae62fc} - {44bea22b-8675-402b-891f-909994f88280} + {8da35c6c-c8d8-4028-9c5b-a6a24bce8198} - {57009f4c-43d2-4bcc-80c3-3e5951aeedcb} + {9f80d92a-fa4a-49be-bd94-d3f390ccfb64} - {1eb87131-a1e7-4259-8ed3-bda0bb447aca} + {79293577-83f4-4ef0-a684-2be4d6d9be1a} - {36965158-c462-44e3-97df-cc8e8e3ac937} + {54162163-8c40-4f54-a61d-fe20a379c3f7} - {305bcba5-44b0-4054-a3b7-9de638b1010b} + {b314c4cb-c7b5-46e9-9e91-45c13db547fa} - {d1f30468-df4b-4730-8edb-47c68c189c2d} + {4528e68c-1154-4640-8872-5d22d0d33482} - {60e9367a-4b09-4cea-9483-06581fddc456} + {910d6e7b-fb2c-4e3d-9de0-ee5e12922f2a} - {38db0bb7-771d-43f2-a66e-5f8f6d0bec39} + {6b1af579-40a6-4063-88bb-58f9a76d731c} - {045532be-04cd-45e6-b9e0-5709fc025e47} + {2dae5b0c-2ea0-420f-80b9-8e9cb6096085} - {0d1c3da6-c4fb-416f-832b-f70c9c8eac24} + {793a4c91-a415-4223-9350-06a480ac279c} diff --git a/XML/testsuite/TestSuite_vs140.vcxproj b/XML/testsuite/TestSuite_vs140.vcxproj index 19026acd1..878ff31ab 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj +++ b/XML/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs140.vcxproj.filters b/XML/testsuite/TestSuite_vs140.vcxproj.filters index 578b115f9..142120f3b 100644 --- a/XML/testsuite/TestSuite_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {d3934f11-15bf-41e3-935c-7e68abae860a} + {3cf290a3-9e30-49ff-bbda-f1d8caf65e56} - {b8c94276-a16d-41f3-a21c-f9826a1c7ab3} + {123309b4-7afd-4802-bf83-c8278454376a} - {2c505517-52ba-42ae-a831-549e2f585f96} + {9519e9d9-ac63-4471-99d4-4166b97dd4cc} - {b80e6a65-db70-426a-b48e-d3f429bd38b3} + {ad498115-d380-4d33-a565-df208ba85a76} - {63789afa-d62e-4267-8eac-16794fb41709} + {ac0bffd7-5ccc-4408-961c-cba244112e24} - {45561e3a-cd18-4ac8-bb04-e2a81f9d0719} + {9151245a-f159-45f5-a861-bbce0c060870} - {000b998d-7391-4757-9ec6-a44e00c97d61} + {0983832c-1a1a-4a48-8a68-045d7af0218d} - {3edca753-3111-4026-8b4a-dad2b8fbb593} + {55d1aec5-0e49-4a3e-baab-d16e7c08c326} - {8eee592d-549c-4c70-b632-4b886e24d80e} + {7c1da5a0-5dad-4185-88ae-fa2ae1df488e} - {36775170-60f4-47e2-bbc5-bb7d5ee75327} + {942fd9d7-8394-42b3-aef1-d38689543d2d} - {bb22cfc4-82bf-4687-a500-6be5579c5afa} + {0f8bba13-8e84-4661-987a-1971e0039175} - {e8b831dd-8c4f-4509-a746-c084d9520c0b} + {4daab29a-769a-44b2-b0e1-ce678c6bac12} - {45c2eb4a-21fe-489f-bf9f-401c19b75cd6} + {02d3baf3-a68a-4fda-b40e-0d835c7d7d7c} - {c3cb420d-e745-484e-9b3b-df9ea58fe85b} + {a416d4c5-e348-465b-8f1c-ad1b50497ea0} diff --git a/XML/testsuite/TestSuite_vs150.vcxproj b/XML/testsuite/TestSuite_vs150.vcxproj index 5363e461e..82b664225 100644 --- a/XML/testsuite/TestSuite_vs150.vcxproj +++ b/XML/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_vs150.vcxproj.filters b/XML/testsuite/TestSuite_vs150.vcxproj.filters index 7a7eaa754..95bf3b954 100644 --- a/XML/testsuite/TestSuite_vs150.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {6d069662-a57c-4ac4-915b-3e9fb071f2a0} + {6c68237f-bbcc-4f07-a053-b5bd4325f648} - {ee7f63b6-c9c4-43a1-8711-187a26f51da0} + {a9d82e9a-11d2-4ee7-855e-0b0b2641af07} - {9c811545-d7ef-4e08-a9af-d8eea7af1a7c} + {721dd584-64a1-49f1-b76d-8321571750f1} - {9c1f9521-0f2e-4f9b-a844-a337bbf70521} + {282d05de-a636-4b01-bee9-7b8770b47772} - {0cfa27aa-39c4-46ed-ba66-af0d4a054657} + {dc880204-f843-446d-87d6-f78f70e74367} - {134cb5d1-23b6-4e46-a98b-07ff88379b9f} + {e05e027f-a6a3-4ba8-84b8-87dd536ef9d8} - {642dbe89-f10f-4e95-9c25-951e622ffb2c} + {5d9bd32f-d44f-47b6-95c9-d6ef0d890bae} - {b4e93973-a73f-4061-8563-c8545552e2e6} + {1f6d6f50-8e6a-4042-860c-d7e64b8db8d0} - {3dbf5538-f2ca-4e54-a1a1-e4732bec9c63} + {215e1392-7c8f-484e-9822-a0683d008acf} - {a40464e5-f877-4dfa-85b1-56a5092914f2} + {3f5ec005-23cb-4df1-b744-15cce5c4298a} - {ab820bac-4564-4c8a-88b0-748780893b06} + {4f3d48da-9f2c-4590-bc7e-64fb1b9b8b7f} - {32f593c9-1e01-4302-81aa-0c18b77a35db} + {57947f55-7301-4717-8a8d-59cc39ace70d} - {cacdbfa3-cdd6-4c7f-b6ef-d2c6a33f13aa} + {ae01b632-b4d2-4a17-a5e2-63b58ac0c8b1} - {b7c1d9ff-707f-40fd-8748-aecb49c53e0f} + {785380c0-45af-4d08-8610-60d8fc99933e} diff --git a/XML/testsuite/TestSuite_vs90.vcproj b/XML/testsuite/TestSuite_vs90.vcproj index 0bc0eccee..5575e75a5 100644 --- a/XML/testsuite/TestSuite_vs90.vcproj +++ b/XML/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters index 270bd81f6..d574e2d1a 100644 --- a/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,46 +2,46 @@ - {a84548b4-9cfe-4193-8caf-e810adfa42d4} + {b9c7760c-8ac9-44be-bb09-7b994556378b} - {2a97d651-6e37-42c5-8284-395027d89896} + {8116902c-8b99-4209-9466-82ce9dbafffc} - {50cccc9d-da09-41de-800e-3a3e12317b6c} + {371b7be5-7b82-48be-9c96-a2cfaec64990} - {1c05f248-a089-4153-a578-92353e6c0bf5} + {1aba1c71-462e-45cc-a854-f94b2c9b3178} - {edd9b99e-dcf5-4a26-879d-bb0b48c39e96} + {6cd8cdb7-1223-4261-9de8-a26d503e5123} - {25842a8c-3242-4776-8253-4da248df6c2e} + {ae4fa60a-d035-4c6b-bd44-78e7aaea4fb5} - {b4ae974c-99d6-4e2a-a694-c6fabe883f24} + {c9d4afee-91c6-4d39-86ba-367b0a315c54} - {23093d82-611f-42f1-a4d7-d6ee570a2380} + {793f35e3-0364-42c5-8869-b253362504d0} - {ed7667ca-e90f-4635-b061-f8b2fa29a883} + {a4c0aa0f-f918-4b6f-91df-59760be5169a} - {a27fe8a2-bbfc-4515-bbcd-a4004cbcbe93} + {2956e0cb-c7e2-4384-ae10-4f8ff0c3254a} - {9d94284f-e598-465e-9100-07b8467aa293} + {0b82c3a8-0591-4d50-bfd5-99e95cec0525} - {ad6a9bc5-820d-484d-a0ad-c79389e2f204} + {e59c7236-4fde-41f2-bb07-e8f24bb69099} - {aa9a859b-3bdf-4cf0-afa3-530f184e8791} + {5d6fa3a2-3e32-4eef-b532-bd1248d9ce22} - {88bd599d-d1e2-46cb-b120-6c975c539b16} + {34c86182-5db2-4c01-8ae9-08cea96cfe4b} diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj b/XML/testsuite/TestSuite_x64_vs110.vcxproj index f7d7884c7..4659f4d07 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters index 01f7399c1..5a244b233 100644 --- a/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,46 +2,46 @@ - {f2df1694-3ff1-47a7-b058-a8fe07b00ba6} + {8cfd2a88-eb80-45c4-8f51-1c4c6f616c67} - {998bd4a3-7337-44ff-94bc-544577abb186} + {77ccbdb7-928a-4b05-a532-769e5737106a} - {0145688a-0633-4ccf-b996-667c360d4ddd} + {5e0b9769-e959-4933-b47f-ab15c3fdd45b} - {b6fa4dc8-d9e6-4998-b255-11ec843a0242} + {10bbd143-4492-4067-9cfc-fb22e241936c} - {a1cfb0d6-be05-4cdc-9a4d-9df7e9bf116a} + {3849f231-3c94-4821-ab3d-6b9c37c68e23} - {43740cf0-87fe-40b4-92b7-2b492bc08388} + {c723ca84-cc6b-4c5e-9ac3-f1e7517952fb} - {4714da0f-8b37-4e25-b712-47f4e929d10a} + {16d3b1e8-f3ba-4a11-934f-134c77698d4a} - {f565c7d6-1b3b-425f-bf7f-0588570da57c} + {fa9593b6-22b3-4ab8-bee4-f46aca67df31} - {3189591d-3d19-451f-9d6e-cac0592e50ee} + {6ff2aac7-d7bd-4a57-a8f6-4ae9f0709d76} - {2a5c0416-7279-40b2-b11a-0f69829f86af} + {3e86586f-f0d3-4eb0-bdb0-a55e2d6de2a7} - {4d7d13a6-50fb-42a5-801a-c8d1c2030506} + {abdbf4ee-8310-4c13-bb62-198a1c5632fc} - {93cf2385-46c7-4769-bfca-b70f633218c3} + {87e3b339-1cc8-4bff-8d41-b6855c7c7f69} - {6f5f069d-3979-4e4c-944e-63cd81fda541} + {e3de805b-5755-49b2-a0f4-13d148e52d84} - {b5326d9d-f372-4562-96b3-5b6a98eaf143} + {427d307c-fbc7-4b4e-99fa-a726e1e9ec95} diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj b/XML/testsuite/TestSuite_x64_vs120.vcxproj index 319c32a36..a419db24f 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters index 290db8cec..498e9bccd 100644 --- a/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,46 +2,46 @@ - {3bcab718-57a2-4ec7-bfa9-10af6bc28a0c} + {189e85b4-7596-462a-8eaa-2896d6d7fa24} - {2ab6926f-98b1-4f8e-a913-6fe890c0938d} + {3ab9df71-8559-4638-81e7-db663674d0d0} - {98b6fb63-c040-4f03-a6a2-22766809f67e} + {87d8f679-02af-4c94-971e-19841f1b1845} - {de9329bd-9b70-473a-8a96-42bc234d08ca} + {cb97abd8-8963-45fb-84d5-7da140fdf228} - {32c20e1b-185d-4530-8ea2-266a2d0450de} + {fada1d09-ce91-4d39-9e67-384962f9dafd} - {55f26cf6-f33a-4d7f-bce9-1e7b15df1a80} + {bd887f38-6041-4b1e-82fa-7dcfa0b28f21} - {85bbdcd0-97ce-42be-95e7-d5d2d7cba01a} + {0d9ce42e-52ba-4f67-a33e-f3a536b74a8d} - {f6355313-5467-41a5-ba26-c9ebddaf5c07} + {5d9d378f-fbdc-418c-8d25-ced15391eb74} - {4b23497a-bddd-4235-8519-de89f48ce58b} + {dfd30d23-6606-4245-98bf-8d915da8d940} - {5fcc4463-c4bd-46a1-8cb2-059d37f3cb26} + {7e0318c6-3845-479e-998d-769d27cb5a1f} - {43f54685-a859-4857-997d-5a3fa0fd13b0} + {cada14dc-ff21-4bb5-8251-3e2f8291a9d5} - {cef7cf53-dd89-4f27-a9d0-9bdc07a102a5} + {ee459f21-e5f5-4bea-8035-553704944c43} - {70f67539-5c64-43c0-adb9-06b6e8f4a4c5} + {2b79f903-4887-4263-b93a-34a9f895e3c1} - {f7634d19-54e5-4afd-8310-36f5475bdf33} + {16fa7f84-7a74-44e9-958a-4b17588a697e} diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj b/XML/testsuite/TestSuite_x64_vs140.vcxproj index e9686ba01..e6dac6e5c 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters index 073e788e8..1244ee3a3 100644 --- a/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,46 +2,46 @@ - {ba64c252-bfd3-40cb-a4a8-9d234b533df7} + {d812dd86-81a7-4aa2-b32c-5cc220e74b68} - {5d4b6048-c18e-4ff8-bb35-b686d37945b5} + {2873eb6e-aae9-47af-8785-a040f8ad3f0f} - {0f79729e-0a9b-42db-960b-1b563ebcf0cd} + {2d60fd98-5cb2-4500-9428-7ec135d6b810} - {2201c43c-a510-42d0-84bb-3f6a5c55a885} + {b323379d-3377-4515-8fe3-390a274bdea4} - {81802215-34d7-4b3b-b9b6-46a551065fff} + {96722d9b-2c70-41f7-b176-eb4d36176263} - {96f2d460-9689-4281-8877-76217c4efad7} + {fb994fdb-b621-4e56-a66f-cecd39d04c66} - {d5eb08e1-56c9-4824-8c9a-a7a59c038419} + {9e5752f7-8d70-4832-881a-7e99fba01dcb} - {da9e0311-3605-4db1-b997-2c66784fb1db} + {c4ec221e-9c45-4b07-a0b4-54781f6d9af7} - {fe2fe5ea-974f-4ab8-8c6f-18c29f5ef9d6} + {10d8a24d-6180-479d-a495-ddc4df18d9cf} - {11f774fe-01fd-4123-a67f-dacc18b56c2c} + {25ae9d99-90dc-466c-bf5c-b79a844ec9e4} - {734ba72b-3f50-4f6d-adf8-5fb161f8849d} + {428c9bb5-0242-4fa5-af1d-c21610cb40ff} - {3326c325-2fd5-42f9-875c-f8fb7eb2797c} + {5cf8b4e8-dd07-4519-b447-26363fb8eb96} - {c331b404-2130-4b64-abdd-314653a4b2d7} + {187a80b5-f41f-4a08-8ac4-388aa14c1afe} - {72ca046c-5897-4465-a541-437a33e2d894} + {2eb028ce-e697-4984-8344-0f334c9c714b} diff --git a/XML/testsuite/TestSuite_x64_vs150.vcxproj b/XML/testsuite/TestSuite_x64_vs150.vcxproj index 77e226b04..6bedd8e47 100644 --- a/XML/testsuite/TestSuite_x64_vs150.vcxproj +++ b/XML/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters b/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters index 54a0a208d..9abd4fbdc 100644 --- a/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/XML/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,46 +2,46 @@ - {1ad43907-cc16-4900-aa90-69bfd53873c2} + {8c36bae8-d4d5-49e7-91a2-0b4d142c941f} - {d75fd86e-fae3-4a35-b3be-692a37fdfc80} + {4c064f15-ea02-4002-9f2b-15c3347a539a} - {fea8fb88-85d5-4e0a-bb61-5aae0c20876c} + {26c6172f-dd48-4cc6-a5f6-860faae93cb6} - {c988262f-f597-4066-ad56-89aae4470311} + {76d7a66a-0d6b-4253-956e-6888b6cbd061} - {0dde166a-c65d-49ed-8d9a-f6a283d11263} + {6e9ad331-1362-48bb-9045-3de3a9baf96c} - {55e5c393-40a4-4b66-8145-db5f30a97f8c} + {103342a5-19ce-459b-8729-982119ff885b} - {064a2082-62bf-4a0f-bb29-b4418d3e0cf0} + {71a41e18-afc1-41b8-ab6f-64b5d45e9374} - {56822025-ce3d-4caa-9987-cebc3cb23dbc} + {1c9964f1-ed57-4330-92b4-1cfa79ed730d} - {e0454944-2ac9-48b1-af2d-fc12241c53da} + {f49bc853-5bee-4e76-86c8-6566bbe34c6c} - {ff729733-ffff-461b-bef6-63d1b1e50fdf} + {665c77e4-fd40-44a4-bc38-cfdfa31507a2} - {32408979-0249-4fbd-8a9a-120a413e9611} + {7236e81b-9c43-45dd-b396-0ef0acc9eac8} - {2d9e5b37-dbd0-40b7-b4d7-40e585e044c5} + {a63fb7dc-d039-4bb6-afc6-76295112b1d8} - {23b0c324-f478-4cad-b5a7-bd4b397963a0} + {7f09d3b0-88b0-4ad4-b84c-40ebe1e5aaa6} - {de14dfd4-5df5-4a05-91a6-3d9ee9dd6dad} + {42c9e144-fb6e-4da1-8093-0ff3fb50c98b} diff --git a/XML/testsuite/TestSuite_x64_vs90.vcproj b/XML/testsuite/TestSuite_x64_vs90.vcproj index a1f78dcb0..3a943044e 100644 --- a/XML/testsuite/TestSuite_x64_vs90.vcproj +++ b/XML/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\$(PlatformName)\PocoZipMTd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoZipMT.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoZipMDd.lib"/> + OutputFile="..\lib\$(PlatformName)\PocoZipMD.lib"/> <_ProjectFileVersion>11.0.50727.1 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT diff --git a/Zip/Zip_WEC2013_vs110.vcxproj.filters b/Zip/Zip_WEC2013_vs110.vcxproj.filters index e208d79b0..ce2b53684 100644 --- a/Zip/Zip_WEC2013_vs110.vcxproj.filters +++ b/Zip/Zip_WEC2013_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {d1a02a6f-c0fc-4f49-bad8-31a482fd7dfc} + {732d1e64-135c-4ca2-890a-0c770bc470e3} - {edeaec47-f1aa-4449-abb3-766a5dea2f27} + {dbdae3e1-5597-47c3-9b02-5a2185764347} - {a597f0c4-5100-43e4-82fe-eceb74d173d5} + {a27c2cff-92ed-48b4-9cb4-dfb5ba35ccef} - {853fce8f-a5ea-43cf-a855-d28b2ff0a85e} + {55e369e5-36fb-442a-b1c2-d69dc983a05c} - {270ccfe4-3b6b-4c9b-86bf-ca1dfe674be7} + {7f295a33-2625-4afe-81f4-b1147b3c8ceb} - {04a3eb85-2b73-4d63-9994-8c1c83533d30} + {37234ca2-b127-44d4-a018-0d702ae0aa87} diff --git a/Zip/Zip_WEC2013_vs120.vcxproj b/Zip/Zip_WEC2013_vs120.vcxproj index d8145266d..e27c3fcb8 100644 --- a/Zip/Zip_WEC2013_vs120.vcxproj +++ b/Zip/Zip_WEC2013_vs120.vcxproj @@ -41,11 +41,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT diff --git a/Zip/Zip_WEC2013_vs120.vcxproj.filters b/Zip/Zip_WEC2013_vs120.vcxproj.filters index 53dbc9fa9..4dc1757be 100644 --- a/Zip/Zip_WEC2013_vs120.vcxproj.filters +++ b/Zip/Zip_WEC2013_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {110ab9b3-80f2-4d49-b075-570521391251} + {c8cac65d-8827-44f2-9075-1059ac56364f} - {0a0dd290-9872-4bf8-b27c-6a3dafec59da} + {ed422999-f12f-41fb-bee3-58d79ed8d906} - {4e97a51d-838f-4557-a496-541b42fa953d} + {e20ad004-9074-4416-abf2-9324dde78357} - {a4beb54b-a5ba-44d9-9091-cf045e4f2d29} + {2bbf8e08-a3c5-4e50-b29c-a118ab767fcb} - {f687b551-9d2a-44e9-8ae7-3e45705bb9c6} + {9da2eb5b-b456-489e-b2cd-5132b1e2e35e} - {0f3bf383-6683-4b75-941c-c94568dc3f53} + {277bfdeb-af92-41c2-a192-c712365b0442} diff --git a/Zip/Zip_vs100.vcxproj b/Zip/Zip_vs100.vcxproj index 6b2af80cd..3dbdaf48f 100644 --- a/Zip/Zip_vs100.vcxproj +++ b/Zip/Zip_vs100.vcxproj @@ -95,11 +95,11 @@ ..\lib\ obj\Zip\$(Configuration)\ PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT @@ -192,7 +192,8 @@ %(AdditionalOptions) - ..\lib\PocoZipmtd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoZipMTd.lib @@ -218,7 +219,8 @@ %(AdditionalOptions) - ..\lib\PocoZipmt.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoZipMT.lib @@ -235,7 +237,7 @@ true true - ..\lib\PocoZipmdd.pdb + ..\lib\PocoZipMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +245,8 @@ %(AdditionalOptions) - ..\lib\PocoZipmdd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib\PocoZipMDd.lib @@ -271,7 +274,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib + ..\lib\PocoZipMD.lib diff --git a/Zip/Zip_vs100.vcxproj.filters b/Zip/Zip_vs100.vcxproj.filters index 7bd682f51..1695d3c8b 100644 --- a/Zip/Zip_vs100.vcxproj.filters +++ b/Zip/Zip_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {cb75c7b9-06aa-4ec3-b0ea-711c4c19bd73} + {ad2326ae-f70c-4c36-a148-f06931136166} - {28b5f1b8-0f0b-4c41-92ac-0cd68f24d619} + {9750f1f6-65e7-457a-916e-ed52c2d37eab} - {b124a6f4-861c-4daf-850a-c5737a9fc9ea} + {bdbea321-cf78-4040-96a9-77bcedce86db} - {aa7949ea-ba83-4e43-ab5a-f0d8a7ca308e} + {30e83e3c-a51d-49e8-8cef-bd172f4ea1cf} - {33ab294f-cb9f-4640-aae5-fc194862e9e4} + {b5a83e5c-3f4f-4f8e-af3d-d8262c15e22a} - {407e754c-d84a-4e6c-9299-6751a4df470d} + {f046607c-3c2d-4e03-ac24-95181e2991cb} diff --git a/Zip/Zip_vs110.vcxproj b/Zip/Zip_vs110.vcxproj index 53ba741e5..e82227e91 100644 --- a/Zip/Zip_vs110.vcxproj +++ b/Zip/Zip_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin\ @@ -205,7 +205,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmtd.lib + ..\lib\PocoZipMTd.lib @@ -230,7 +230,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmt.lib + ..\lib\PocoZipMT.lib @@ -247,14 +247,14 @@ true true - ..\lib\PocoZipmdd.pdb + ..\lib\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmdd.lib + ..\lib\PocoZipMDd.lib @@ -281,7 +281,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib + ..\lib\PocoZipMD.lib diff --git a/Zip/Zip_vs110.vcxproj.filters b/Zip/Zip_vs110.vcxproj.filters index f11fff928..49a3aaddb 100644 --- a/Zip/Zip_vs110.vcxproj.filters +++ b/Zip/Zip_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {84412e8e-e003-4107-b4e2-88756ed65e6f} + {4752ee5d-5fcf-41fc-96a6-2e0a74e1ece4} - {6c3b9282-f45f-498b-9b36-e41c0f1f0d81} + {8902c61e-ce90-418f-a37a-9640922ac0a0} - {c3ffe937-e3c3-43a2-822c-8da6e0f0bb49} + {6b1bfc28-33f9-41db-849d-cc217814d01e} - {40d7e842-f892-45a4-84c1-e12cb3fa3cf8} + {4f0bd2a8-a103-4dff-8246-fe1d1323731d} - {065f4c48-1aa7-4f08-8878-0011276579fa} + {38663593-8799-4541-b7c6-612e7bafc93d} - {d2283aba-29dd-4645-bea0-2d1972a37031} + {10dd52ad-342e-41d8-94be-879d9a10254d} diff --git a/Zip/Zip_vs120.vcxproj b/Zip/Zip_vs120.vcxproj index ef7a86bf2..f98aaf976 100644 --- a/Zip/Zip_vs120.vcxproj +++ b/Zip/Zip_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin\ @@ -205,7 +205,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmtd.lib + ..\lib\PocoZipMTd.lib @@ -230,7 +230,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmt.lib + ..\lib\PocoZipMT.lib @@ -247,14 +247,14 @@ true true - ..\lib\PocoZipmdd.pdb + ..\lib\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmdd.lib + ..\lib\PocoZipMDd.lib @@ -281,7 +281,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib + ..\lib\PocoZipMD.lib diff --git a/Zip/Zip_vs120.vcxproj.filters b/Zip/Zip_vs120.vcxproj.filters index ce6bb560e..3c1f0d3cb 100644 --- a/Zip/Zip_vs120.vcxproj.filters +++ b/Zip/Zip_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {98afb71b-7f41-40fd-a3d7-f50543f40431} + {26d1be17-ccc2-4fe8-ad33-b9146574767f} - {6fa41631-039c-4a15-b6f2-3f12d80ce6ba} + {89eb5f8a-c205-44fd-b765-2e4d4fd41ca0} - {4692f643-c721-4899-a05f-868a4064aa6a} + {fdc0ad56-b831-45d1-9932-5020903b72f6} - {26507ab3-9506-4be1-98cb-6b065a125969} + {e6fdadcc-f3d2-4532-8f44-3808ece135fc} - {18b2045f-af8f-4029-8be7-276f100bae38} + {4ea5b395-5da6-4573-8164-7375cb5b903d} - {94094d0a-9036-49bc-8f0c-11131fef1245} + {b2ac4166-34e5-4cc4-b8ea-8feb5cc683ae} diff --git a/Zip/Zip_vs140.vcxproj b/Zip/Zip_vs140.vcxproj index 560ab9664..157512bf5 100644 --- a/Zip/Zip_vs140.vcxproj +++ b/Zip/Zip_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin\ @@ -205,7 +205,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmtd.lib + ..\lib\PocoZipMTd.lib @@ -230,7 +230,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmt.lib + ..\lib\PocoZipMT.lib @@ -247,14 +247,14 @@ true true - ..\lib\PocoZipmdd.pdb + ..\lib\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmdd.lib + ..\lib\PocoZipMDd.lib @@ -281,7 +281,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib + ..\lib\PocoZipMD.lib diff --git a/Zip/Zip_vs140.vcxproj.filters b/Zip/Zip_vs140.vcxproj.filters index 6cdfa6544..5a65ce4a1 100644 --- a/Zip/Zip_vs140.vcxproj.filters +++ b/Zip/Zip_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {a225fa25-36f8-4a9c-be06-516a501683a5} + {081fe61f-13c2-4330-a976-b0c2f7391aff} - {02debdcb-c791-493c-92b4-fa6a0000122f} + {29ba23a9-03cc-4a65-a65d-f52dfebc9458} - {d87ffe71-98dd-4eb1-a4ce-1b3e53e307b7} + {c69f62a2-2dc0-4cf0-8e0f-ac6ce4014611} - {09fc816a-f797-4b71-a9b5-0b04e9339f54} + {2793913a-d974-4871-b4c5-6635e7126712} - {7cb12d60-7f0b-441e-b855-907ddd5f1c18} + {25682bab-ebdc-454f-89ad-a3e872dc9b7b} - {eb9492f3-570d-4f46-9514-f0c078af650a} + {b7d1ddb5-5608-4989-8b1c-41c1584e0801} diff --git a/Zip/Zip_vs150.vcxproj b/Zip/Zip_vs150.vcxproj index 589b4beca..a54cf8eb8 100644 --- a/Zip/Zip_vs150.vcxproj +++ b/Zip/Zip_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoZipd - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin\ @@ -205,7 +205,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmtd.lib + ..\lib\PocoZipMTd.lib @@ -230,7 +230,7 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmt.lib + ..\lib\PocoZipMT.lib @@ -247,14 +247,14 @@ true true - ..\lib\PocoZipmdd.pdb + ..\lib\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib\PocoZipmdd.lib + ..\lib\PocoZipMDd.lib @@ -281,7 +281,7 @@ ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - ..\lib\PocoZipmd.lib + ..\lib\PocoZipMD.lib diff --git a/Zip/Zip_vs150.vcxproj.filters b/Zip/Zip_vs150.vcxproj.filters index 4876fda78..8d09ba98b 100644 --- a/Zip/Zip_vs150.vcxproj.filters +++ b/Zip/Zip_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {c87bdc63-c038-4535-98ed-9380dede6293} + {3eeaf1d1-3fe4-4f62-b484-cb9b05bed92e} - {80ca5538-ad9f-4ae7-b8e1-9b6b778e7c2e} + {0bb1aa8c-7c72-485d-80ab-42093b677e19} - {e91fc434-8e7b-4ae6-b159-bbacdd16654d} + {1969002f-365c-4445-b411-8bee037749a8} - {8ce2115b-9c25-4cdc-924e-0c9394d99cf1} + {4fa0b347-7093-4efb-a028-1250d90a45c7} - {08115d1a-58bd-4bb8-bbb8-df6fa11b689c} + {22e4ab14-286e-4b88-918b-0bb20f4c0264} - {5f84fcb7-fa8f-44b5-a92e-f1424c24aebc} + {06141810-e518-4909-81ed-96a1e1352e71} diff --git a/Zip/Zip_vs90.vcproj b/Zip/Zip_vs90.vcproj index 853c07b69..7f3ada6b8 100644 --- a/Zip/Zip_vs90.vcproj +++ b/Zip/Zip_vs90.vcproj @@ -185,7 +185,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib\PocoZipmtd.pdb" + ProgramDataBaseFileName="..\lib\PocoZipMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -200,7 +200,7 @@ Name="VCPreLinkEventTool"/> + OutputFile="..\lib\PocoZipMTd.lib"/> + OutputFile="..\lib\PocoZipMT.lib"/> + OutputFile="..\lib\PocoZipMDd.lib"/> + OutputFile="..\lib\PocoZipMD.lib"/> ..\lib64\ obj64\Zip\$(Configuration)\ PocoZip64d - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip64 - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT @@ -192,7 +192,9 @@ %(AdditionalOptions) - ..\lib64\PocoZipmtd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoZipMTd.lib + MachineX64 @@ -218,7 +220,9 @@ %(AdditionalOptions) - ..\lib64\PocoZipmt.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoZipMT.lib + MachineX64 @@ -235,7 +239,7 @@ true true - ..\lib64\PocoZipmdd.pdb + ..\lib64\PocoZipMDd.pdb Level3 ProgramDatabase Default @@ -243,7 +247,9 @@ %(AdditionalOptions) - ..\lib64\PocoZipmdd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoZipMDd.lib + MachineX64 @@ -269,7 +275,9 @@ %(AdditionalOptions) - ..\lib64\PocoZipmd.lib + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\lib64\PocoZipMD.lib + MachineX64 diff --git a/Zip/Zip_x64_vs100.vcxproj.filters b/Zip/Zip_x64_vs100.vcxproj.filters index 7f47e17f4..04bae7ec3 100644 --- a/Zip/Zip_x64_vs100.vcxproj.filters +++ b/Zip/Zip_x64_vs100.vcxproj.filters @@ -2,22 +2,22 @@ - {9b6b46a7-8ade-4362-8e00-9c1887e93d96} + {4877d13a-2637-49aa-9d38-303c6b2228b0} - {b484de33-6aed-4df1-b72c-deabde1ecf6c} + {9279d430-92fa-426b-b44b-8c445997874f} - {ca762354-eb49-4e2e-bc4b-200dfaaf805d} + {e9cb5281-eb2f-4a2a-8814-d155e7032602} - {657ce51f-b1dd-41dc-b85f-e0df2a5f4d8f} + {620ba2b7-231c-4f06-b905-eaab4d807207} - {a67ee823-9e64-4ebc-b72d-510b1ba7fc58} + {b56aac30-033a-47a6-8c3d-d5b9205cff9e} - {a12df83a-85f6-4877-8037-a2ea8ab5df84} + {c98a5962-d697-4549-8e3a-c98f0c96b758} diff --git a/Zip/Zip_x64_vs110.vcxproj b/Zip/Zip_x64_vs110.vcxproj index f969006be..0175ea0bf 100644 --- a/Zip/Zip_x64_vs110.vcxproj +++ b/Zip/Zip_x64_vs110.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>11.0.50727.1 PocoZip64d - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip64 - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin64\ @@ -205,7 +205,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmtd.lib + ..\lib64\PocoZipMTd.lib + MachineX64 @@ -230,7 +231,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmt.lib + ..\lib64\PocoZipMT.lib + MachineX64 @@ -247,14 +249,15 @@ true true - ..\lib64\PocoZipmdd.pdb + ..\lib64\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmdd.lib + ..\lib64\PocoZipMDd.lib + MachineX64 @@ -279,7 +282,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmd.lib + ..\lib64\PocoZipMD.lib + MachineX64 diff --git a/Zip/Zip_x64_vs110.vcxproj.filters b/Zip/Zip_x64_vs110.vcxproj.filters index a4050e9b6..b1f17517f 100644 --- a/Zip/Zip_x64_vs110.vcxproj.filters +++ b/Zip/Zip_x64_vs110.vcxproj.filters @@ -2,22 +2,22 @@ - {eadf927b-85fc-43bf-ade0-29dfac275d15} + {914b0af8-138f-43d0-90cc-ff278a43dd88} - {8b206a17-e623-41c0-9b04-7c06c7c5bd25} + {655b4778-bc56-45fc-a45d-c2c1e73886cb} - {9493781c-3bc1-42c2-9915-7f09571b0266} + {6c58fd34-1bee-417a-96ae-9376b3bcae70} - {3b4fe865-dc3d-493e-a83b-2a619d4c37d3} + {9da352c7-89ac-40a3-99cc-613d252dccf9} - {5de5f36c-f96b-47f0-9ae3-08191be0ed27} + {c3b9288a-42d4-4155-99e9-d25fadb7a9cc} - {7ef168ca-ac01-435c-a8eb-1aeb1ff972ca} + {fbd133b4-172a-498a-bedc-cd509fc84406} diff --git a/Zip/Zip_x64_vs120.vcxproj b/Zip/Zip_x64_vs120.vcxproj index 303484c26..77b4de30b 100644 --- a/Zip/Zip_x64_vs120.vcxproj +++ b/Zip/Zip_x64_vs120.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>12.0.30501.0 PocoZip64d - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip64 - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin64\ @@ -205,7 +205,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmtd.lib + ..\lib64\PocoZipMTd.lib + MachineX64 @@ -230,7 +231,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmt.lib + ..\lib64\PocoZipMT.lib + MachineX64 @@ -247,14 +249,15 @@ true true - ..\lib64\PocoZipmdd.pdb + ..\lib64\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmdd.lib + ..\lib64\PocoZipMDd.lib + MachineX64 @@ -279,7 +282,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmd.lib + ..\lib64\PocoZipMD.lib + MachineX64 diff --git a/Zip/Zip_x64_vs120.vcxproj.filters b/Zip/Zip_x64_vs120.vcxproj.filters index 0b7275742..098323f9c 100644 --- a/Zip/Zip_x64_vs120.vcxproj.filters +++ b/Zip/Zip_x64_vs120.vcxproj.filters @@ -2,22 +2,22 @@ - {7945672f-fec1-478c-b36b-9c07479f3b7b} + {c94d5ab2-17bc-436a-bc6f-351cc58a20fb} - {042c3175-04f0-4800-b38b-2a880f4446ee} + {df65796e-57bd-4d8d-8797-fc6e14e9ab71} - {c4a19024-1a09-4196-af44-2d9c992f1997} + {5ef1d4e9-7ebc-4c5c-96c2-aa91819be1ac} - {3f2d939d-0f9d-4cc6-96c6-b786adecaded} + {d1edb849-bb08-4e3e-9bc2-c41e8a488218} - {e9959d67-2692-461c-8d2b-4e157a3872ff} + {d33c3a41-dc0e-4337-800f-0df1bb435685} - {e9dfa6f8-32d6-4302-a034-94d7511c5d91} + {de2e7181-a097-40b9-a0f7-daa838bfbc98} diff --git a/Zip/Zip_x64_vs140.vcxproj b/Zip/Zip_x64_vs140.vcxproj index 2e75abbba..00b79a83e 100644 --- a/Zip/Zip_x64_vs140.vcxproj +++ b/Zip/Zip_x64_vs140.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>14.0.25431.1 PocoZip64d - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip64 - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin64\ @@ -205,7 +205,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmtd.lib + ..\lib64\PocoZipMTd.lib + MachineX64 @@ -230,7 +231,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmt.lib + ..\lib64\PocoZipMT.lib + MachineX64 @@ -247,14 +249,15 @@ true true - ..\lib64\PocoZipmdd.pdb + ..\lib64\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmdd.lib + ..\lib64\PocoZipMDd.lib + MachineX64 @@ -279,7 +282,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmd.lib + ..\lib64\PocoZipMD.lib + MachineX64 diff --git a/Zip/Zip_x64_vs140.vcxproj.filters b/Zip/Zip_x64_vs140.vcxproj.filters index 6d940f9d4..063180977 100644 --- a/Zip/Zip_x64_vs140.vcxproj.filters +++ b/Zip/Zip_x64_vs140.vcxproj.filters @@ -2,22 +2,22 @@ - {0a722771-b500-4053-9539-8b000011f772} + {8354880e-b05f-4386-94b3-0aec0ac16032} - {20f2800c-039e-4527-bdf0-9f05606c2122} + {ea75dceb-43cb-452b-b28b-4b91710eba77} - {603c1d75-8f33-4014-9e15-5e344de92191} + {37da797c-d7ca-4b15-9dbb-502cced7258e} - {d9359645-0ad3-4225-bf9e-44dfa7873021} + {6175807c-1c85-4b1d-9f2e-a1b88ae00613} - {f59ea5ce-9ade-4a10-9cf6-b11cd7ef1f57} + {2dafb579-267f-476a-b935-afa21b73429a} - {e0d280f9-894f-42d2-96d1-c5d5bb67a465} + {0128357f-b185-44f0-b945-1e3683593ca2} diff --git a/Zip/Zip_x64_vs150.vcxproj b/Zip/Zip_x64_vs150.vcxproj index 2e0551994..17034e942 100644 --- a/Zip/Zip_x64_vs150.vcxproj +++ b/Zip/Zip_x64_vs150.vcxproj @@ -87,11 +87,11 @@ <_ProjectFileVersion>15.0.27625.0 PocoZip64d - PocoZipmdd - PocoZipmtd + PocoZipMDd + PocoZipMTd PocoZip64 - PocoZipmd - PocoZipmt + PocoZipMD + PocoZipMT ..\bin64\ @@ -205,7 +205,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmtd.lib + ..\lib64\PocoZipMTd.lib + MachineX64 @@ -230,7 +231,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmt.lib + ..\lib64\PocoZipMT.lib + MachineX64 @@ -247,14 +249,15 @@ true true - ..\lib64\PocoZipmdd.pdb + ..\lib64\PocoZipMDd.pdb Level3 ProgramDatabase Default 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmdd.lib + ..\lib64\PocoZipMDd.lib + MachineX64 @@ -279,7 +282,8 @@ 4244;4267;%(DisableSpecificWarnings) - ..\lib64\PocoZipmd.lib + ..\lib64\PocoZipMD.lib + MachineX64 diff --git a/Zip/Zip_x64_vs150.vcxproj.filters b/Zip/Zip_x64_vs150.vcxproj.filters index a78674bfd..54f4c9455 100644 --- a/Zip/Zip_x64_vs150.vcxproj.filters +++ b/Zip/Zip_x64_vs150.vcxproj.filters @@ -2,22 +2,22 @@ - {3fa02bb9-741c-4058-b7a8-344627605d90} + {fb029335-3252-4de0-82c1-9c1990f8682d} - {2f30e8c2-2b19-4f61-812e-6fe32f235675} + {2207a78f-f2c1-45b0-a875-69f2cc78d2a3} - {bc4cc460-d50b-4dac-84bb-fa61546fb9ad} + {c2f8a580-5c5b-49c3-a6b3-fe05faa27bf6} - {ff2af659-4441-4aec-b856-0eb75e9576ae} + {5f3d6fc6-4777-407e-9de1-52c347ca7653} - {8866df4a-7eeb-4d59-bb20-c0837c900bcb} + {5630d152-3acf-428c-b05e-28339f69d442} - {89ca77c1-3610-46f7-9b5f-b0f629981dad} + {a08fcc73-0df6-45d3-a74c-910df208168f} diff --git a/Zip/Zip_x64_vs90.vcproj b/Zip/Zip_x64_vs90.vcproj index 21a93ae47..022517f62 100644 --- a/Zip/Zip_x64_vs90.vcproj +++ b/Zip/Zip_x64_vs90.vcproj @@ -186,7 +186,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoZipmtd.pdb" + ProgramDataBaseFileName="..\lib64\PocoZipMTd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -201,7 +201,7 @@ Name="VCPreLinkEventTool"/> @@ -260,7 +260,7 @@ Name="VCPreLinkEventTool"/> @@ -303,7 +303,7 @@ ForceConformanceInForLoopScope="true" RuntimeTypeInfo="true" UsePrecompiledHeader="0" - ProgramDataBaseFileName="..\lib64\PocoZipmdd.pdb" + ProgramDataBaseFileName="..\lib64\PocoZipMDd.pdb" WarningLevel="3" Detect64BitPortabilityProblems="false" DebugInformationFormat="3" @@ -318,7 +318,7 @@ Name="VCPreLinkEventTool"/> @@ -377,7 +377,7 @@ Name="VCPreLinkEventTool"/> diff --git a/Zip/testsuite/TestSuite.progen b/Zip/testsuite/TestSuite.progen index 4b40feee7..3f77831ff 100644 --- a/Zip/testsuite/TestSuite.progen +++ b/Zip/testsuite/TestSuite.progen @@ -7,3 +7,5 @@ vc.project.platforms = Win32, x64, WinCE vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.prototype = TestSuite_vs90.vcproj vc.project.compiler.include = ..\\..\\Foundation\\include +vc.project.linker.dependencies = iphlpapi.lib + diff --git a/Zip/testsuite/TestSuite_CE_vs90.vcproj b/Zip/testsuite/TestSuite_CE_vs90.vcproj index 96340483d..422d2e126 100644 --- a/Zip/testsuite/TestSuite_CE_vs90.vcproj +++ b/Zip/testsuite/TestSuite_CE_vs90.vcproj @@ -57,7 +57,7 @@ - {ae1ed282-17b2-4239-830c-39c3685b2081} + {794ce681-481f-415d-b35e-6cbe81933f5c} - {ae3ac6bb-a43e-46f9-8ecf-330ed43d5d9c} + {b49fd611-ffc2-4dfc-bb65-022817cdbb06} - {9eb979c2-98f2-4d7d-9767-0f6f9fbfecc8} + {4738841d-2d7a-43c8-a683-a424ca6bf7ae} - {c15925d9-1af6-4d06-ac3f-5363cb999023} + {2794a491-3270-4d90-a26f-721e1ce4690f} - {1c1efa3e-dd84-4f30-9dcd-efa956b7f4cc} + {a2787a20-8f64-4abe-91ed-c2e51bb5fda3} - {557fd314-2f6e-4356-a835-871c14f9817c} + {13480909-db09-4ebd-97c6-b7da440199de} - {87f4830c-a036-45df-ac28-61613647221b} + {ecf64216-cefe-459d-9fd3-1dbe28b6f5ef} - {c78a6c63-d285-44e2-9007-b4312cc7f7c2} + {cab7400d-26c8-4d2e-bc02-64d9fa0f811f} diff --git a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters index 7b2e9f543..4e8b56781 100644 --- a/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_WEC2013_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {25cd9a0d-47b2-4bfe-8ee1-a1b24c686152} + {379de290-df9a-4425-b0e9-7f7d372dcbfa} - {c7051196-7809-43e3-9101-b5cfb506e3cf} + {c9231983-e8a3-400d-9fba-80b8eddc862b} - {010977b5-1c3c-461a-be1a-9dec0e090bc9} + {70b96a16-68af-4156-84ab-9de3fe8595ac} - {c915ac3e-a581-4295-84d4-49db60d52bfd} + {53d01f0d-4d6a-44b5-aa32-4eb2582fb445} - {b5384e66-d441-424e-a107-37f2ff23a455} + {90a44671-e94f-4ab0-a488-4abaa7408856} - {b8be503b-dc1e-4ece-9242-66d2f915a822} + {8a0b930e-4bc9-4c6c-8d63-8849755d9143} - {6214cd57-359f-4540-aa57-40faac54ce41} + {1fd43fe2-cede-40ac-8dcc-445d33f91fb7} - {bae95f62-0bb4-4c04-af28-33a6d29266b1} + {87ef2de0-3c8f-4d0d-bbce-03d9e0360625} diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj b/Zip/testsuite/TestSuite_vs100.vcxproj index 54728f901..d0a34da03 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj +++ b/Zip/testsuite/TestSuite_vs100.vcxproj @@ -132,7 +132,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_vs100.vcxproj.filters index 691a15ac9..67093edbb 100644 --- a/Zip/testsuite/TestSuite_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {c5e26f6c-3326-4549-a8e6-985726e2663e} + {a0eb5f77-eeca-4728-b6ed-5592e9bbec4c} - {dc2a8990-19a8-425b-a450-827b6f1bbd3c} + {f043c7ce-33d4-417e-8fd5-1d86515ea8e2} - {8eb4139b-8c75-4850-b80a-19e424995f0c} + {763f6c3c-7bb7-4657-83ba-bc78882fbeb5} - {2f4433cf-3b0e-431f-a6d5-055f7c00a633} + {0c3deba1-5f77-4064-8676-ca8f78fc7fee} - {fa808b64-cc1d-47ed-80e1-ff898fc97fc0} + {7cfaa500-f062-4d3c-8b9f-e22fb42392ad} - {763cffa8-f3de-459a-9da4-6baff8a2a682} + {2ac29c65-ae82-45df-9f7b-038cf86e8d84} - {d3367620-e136-42c0-b462-bce743930088} + {5a2decdc-65f2-4761-b9ce-a1ce4c7123c0} - {0b25ad5e-f169-492e-a467-e8d607e4338c} + {f9d5b964-74d8-4ace-9e0d-3b392d5acab0} diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj b/Zip/testsuite/TestSuite_vs110.vcxproj index 251928fb1..a9aa2a117 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_vs110.vcxproj.filters index 472be4e30..358bf0f41 100644 --- a/Zip/testsuite/TestSuite_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {68bd3012-2c2f-4298-a049-76e44f13b381} + {ccf1d072-3c4f-4653-9803-a87dabc3bd1c} - {a8bc29f3-4024-47ab-9b34-719745b9ba63} + {5c717a09-b499-45ae-a3c7-3293f7594b8b} - {e4b20a01-2862-4213-80ac-c75c1d4213de} + {52deadc0-497b-44c8-b2ef-bdc5696a8c34} - {53c5d8ba-6ca4-45a4-a0e8-08f52a593f7c} + {28ea8bc1-1b1e-4b32-af70-d07d6c7b3993} - {46dfb955-70c2-4401-9d00-205baa4ddc85} + {2ee62adc-7276-480d-87a9-3cc0b9a99396} - {2038ce0e-1022-4c3a-a72f-613de583dd45} + {6873b5fc-0b71-4bd3-92a0-d9c89505729a} - {039f196d-2851-470c-9ce7-e3f64778735c} + {a02f253b-50a6-498a-9d75-246b30bdbbc9} - {af47f85b-21bf-4346-8bba-fc141fabf149} + {6bc5adbf-3b0b-4145-80fc-a0f72f061834} diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj b/Zip/testsuite/TestSuite_vs120.vcxproj index ab6adef42..f3bbfc035 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_vs120.vcxproj.filters index fb1afdbe2..cbe92f449 100644 --- a/Zip/testsuite/TestSuite_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {94ec0826-f740-41f9-81ee-86028b087f72} + {b17d1b54-1ef4-444e-9c4c-a164d279f6b4} - {394dbd38-a0fa-4d02-9cea-acbc2691ad65} + {20f03461-32c8-4d17-8d67-026700a28825} - {86f61256-ccfb-4753-8502-7ad1aca78334} + {95c9f71e-6ec5-4dff-9205-9722f93867b8} - {8ffda914-61a0-49f4-b40e-47360e18faa9} + {c3a3fce6-7749-438e-a97c-0fcde5f8cfc3} - {7984c006-f975-4634-acbe-a751cf08c14d} + {63eb25da-e08b-4360-bc79-ef517ae24bec} - {480abcb3-c75f-40d9-b1c6-8f811bab0f52} + {2b414535-b10b-4b76-b6c8-d6b39b0dde54} - {06703a13-c8dd-4786-8986-4096528077ce} + {be654235-f20a-4ab6-b674-92b9bcafab95} - {8ca1238f-c02f-4571-b2dc-ec888c83a10d} + {ba805e03-2c2a-4806-9d8d-02be2e35e94c} diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj b/Zip/testsuite/TestSuite_vs140.vcxproj index ca59b824c..181c20635 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_vs140.vcxproj.filters index 6d64d7fde..6d3c33b04 100644 --- a/Zip/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {d978fde3-8328-48f1-9f69-92cfc60ad782} + {dc55d2eb-f26b-4325-bb8b-e5b76106368a} - {a19a1ba2-4d66-4e2e-bc1f-b652ed402e3c} + {1d288b66-92f6-4731-8da3-0e3a443cf8ff} - {188d6ed1-9a8e-4f51-8df9-d37e364520a8} + {966aca48-0cdb-4ac3-be04-3c199716739d} - {895e6705-8cb7-4978-981f-4c79860049d6} + {e9b1a799-8ede-4cdd-88fe-96449a5ee565} - {f23a89b0-20a5-48e0-984a-6e777e1a9b7c} + {e71f80ca-f28b-4c66-bf60-08f4569e3159} - {65a1df6a-e3c2-4ed7-ae2b-149135f639dc} + {400777d6-3bd4-434c-9505-05a988549b00} - {5cd70a0a-a03b-40d7-b325-b5ab3f50447f} + {b4dbe303-76c8-4f60-80b3-f1091190e5cf} - {909ef0d6-cf67-4119-b22d-5a5b6774ee1c} + {460fcf90-417a-452e-a16c-fc56d0a871d6} diff --git a/Zip/testsuite/TestSuite_vs150.vcxproj b/Zip/testsuite/TestSuite_vs150.vcxproj index a01659c17..373d65c8d 100644 --- a/Zip/testsuite/TestSuite_vs150.vcxproj +++ b/Zip/testsuite/TestSuite_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_vs150.vcxproj.filters b/Zip/testsuite/TestSuite_vs150.vcxproj.filters index f7b9650b3..d2a098558 100644 --- a/Zip/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {83f8c7d9-4978-496a-838b-4ad063f56ca0} + {94822607-75bf-4e04-a839-bd88191d3d08} - {9287807d-a2c8-4b82-92f2-400ec14b4d6b} + {062fe39c-b994-4dfd-bc24-bd85e5ce8098} - {7aa42506-cd24-4a7d-a01b-9b405380dc58} + {a371fb45-596b-42f5-8ed2-1c53bb100901} - {4ad7621e-8b99-4c8b-a1c7-3e2f77716419} + {6915f084-74e1-4fe9-98bd-fd6635d45c6f} - {26c5d9ad-d472-4762-8f5a-24f526d31931} + {5b58e42b-08b2-4865-bd4b-85ac5d32f3cf} - {06715e96-a82c-4169-8c0f-e83392f9d580} + {394854a6-b622-4d4c-b2d6-68b4e203490b} - {92b9ebca-bc16-4d22-84aa-7fad8c683057} + {e00925bc-1fc1-4dee-a6f7-f0579850accb} - {3f618fba-2920-4ef4-b944-c4cbdcd45d94} + {ea08aefa-8df5-4242-96fc-901cd10dcc82} diff --git a/Zip/testsuite/TestSuite_vs90.vcproj b/Zip/testsuite/TestSuite_vs90.vcproj index 556e3cf62..c4f2d5bac 100644 --- a/Zip/testsuite/TestSuite_vs90.vcproj +++ b/Zip/testsuite/TestSuite_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -166,7 +166,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -198,10 +198,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -233,10 +233,10 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,7 +266,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -300,7 +300,7 @@ %(AdditionalOptions) - %(AdditionalDependencies) + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters index eca8139f3..831489b8d 100644 --- a/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs100.vcxproj.filters @@ -2,28 +2,28 @@ - {411090ac-87c8-425b-97ca-14662bbe3ee3} + {3aeaacf8-7493-4c96-8f1a-9673ddac1f5d} - {e4db1681-95c0-421e-a407-765c7195d5eb} + {daa2024a-089a-42b5-a663-da3f0639d0f4} - {5dbb5f11-3499-48e3-9ba1-2d19053d8f8d} + {61b7f196-c50f-47e6-988c-aac9ef7e82f9} - {e03c7aae-fc2e-4d57-a495-e1b2bc2f07c4} + {69cae38d-2f3b-40f7-b60f-da99cc071dd3} - {72c31131-9c21-4780-87b9-d0491cba5841} + {5f69ef8a-a115-47b5-a80e-9fd8b4d80c28} - {93dc2a5b-5530-4e3d-8972-aea76ca5d8a2} + {9bc41236-1ab4-46f7-8c5b-dbea3c9f184b} - {f444428e-fbdd-4915-8f02-101420510d80} + {64d2aa18-94d8-4421-8658-a10c53b175ff} - {da175fb8-6ef8-487c-b6d6-2a7777d18738} + {02a626fb-db8f-4055-8d87-d60277e16476} diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj b/Zip/testsuite/TestSuite_x64_vs110.vcxproj index 76d6bb560..bfa1e2475 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj @@ -148,6 +148,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -178,6 +179,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -206,9 +208,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcwd.lib;libcmtd.lib;%(IgnoreSpecificDefaultLibraries) + nafxcwd.lib;%(IgnoreSpecificDefaultLibraries) true true bin64\static_mt\TestSuited.pdb @@ -237,9 +240,10 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) - nafxcw.lib;libcmt.lib;%(IgnoreSpecificDefaultLibraries) + nafxcw.lib;%(IgnoreSpecificDefaultLibraries) false Console true @@ -266,6 +270,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -296,6 +301,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters index 49396f57b..487143879 100644 --- a/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs110.vcxproj.filters @@ -2,28 +2,28 @@ - {f870a422-f798-4906-9833-f5d01e072a7d} + {b9d84074-f8d1-42ab-a29d-1daf4aadfde5} - {5fc5dc74-9e61-4364-b693-5ff6335c9c8a} + {64352970-01eb-4eb7-8645-f1d33a40d50f} - {b1b8e262-c617-427d-b4ea-b305166a13d1} + {90c41b43-6362-4f73-9a68-7b05fe397bc4} - {6b9f6d4d-14c6-4810-aa74-fe4cc47a8951} + {53762a12-cbb6-4a4f-935a-edf1eb25fc56} - {228887c2-ecab-4c01-aea3-27993c140b77} + {20b28e16-8564-4628-9cdb-e576a79fd5ab} - {34c03c8a-3908-4281-9f27-159cf4de89db} + {944b4d05-e193-41c1-835d-dfb334962fb4} - {151be59f-3a29-42b3-ac74-17044a84f8a3} + {6a339b43-c20d-4c8c-9258-6d2cf024b59a} - {3bf91ee8-70e4-4e46-b1fa-f7838fdd7281} + {3f549546-7804-4c03-b0fc-f2419a52a2c4} diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj b/Zip/testsuite/TestSuite_x64_vs120.vcxproj index 121b7224a..1d3d9d440 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters index b052fdfbc..173ef8a4d 100644 --- a/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs120.vcxproj.filters @@ -2,28 +2,28 @@ - {c846a5d1-f70a-4936-b4f9-76ef2a9fdf8a} + {ec0505dd-ff15-4190-896a-815fad38fd26} - {95701a24-79fa-4895-9576-c32420775283} + {bcbaabd5-d3ab-4284-b7ef-a6d2b68f588f} - {39708ce9-b1c6-4a9a-9db0-32b4a426a401} + {bf1453d0-cb4c-402d-b161-d0f559de0003} - {69ab9214-4bde-4c90-b3f9-62d934f0e483} + {9cd6dad9-9d67-4283-a0e5-9e6c31ce3919} - {47d343d0-402a-47a7-92d7-0f4187c1d7f4} + {64172041-6ce4-401d-8e09-a9e0b706e393} - {e9c91556-264b-42f3-9f9d-eb459a349ac6} + {29dbad78-e00f-4e26-86cc-f8de0f767de3} - {26e1b5c2-a765-4595-88c1-a8d0720eb9eb} + {c604cd34-5e46-44d6-9f39-e4603a175939} - {e1cb6f8e-0408-43b8-8cb5-0d3d75f4f4a9} + {937c58f3-6c89-4d12-8da3-8df3ce455b81} diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj b/Zip/testsuite/TestSuite_x64_vs140.vcxproj index 37e1e9aa2..e0e6ac9f2 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters index caf7aba19..3bec30e29 100644 --- a/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {d14bf5a1-d590-4080-93eb-5815a23ea7f1} + {1b96c1ee-e10d-494a-a7a6-4eb3e6103207} - {186b94cd-1203-4d92-a5d0-5f3d54b3a81a} + {7e1bad30-f1c9-4944-8a86-4faa404bc6b1} - {aa7bed5c-dd51-468d-ab64-967edf5e9c1d} + {ce91d7ef-a868-4597-8df1-83a8f29cc456} - {cfd01fb9-1aba-4374-8004-8518326e0e11} + {1a18589f-13c6-42a0-9cec-ab2cdaadb397} - {3d2f2595-f144-4f52-bb25-72cc17550764} + {37a477a4-c919-4ed7-ae76-da5e6a3c67db} - {15fabc1e-eca3-4c30-8d52-d29601221b22} + {afedf1ff-fba9-468c-b9ff-577a0380ddb2} - {2c643ed9-ac80-412e-a1bb-30cd66e4a766} + {089d6cf8-ed25-4346-a6b4-66468a36b230} - {bf6327d1-f237-4321-97eb-c7318e5191ee} + {f41ee632-983b-4144-a2b9-47bba9aaed7b} diff --git a/Zip/testsuite/TestSuite_x64_vs150.vcxproj b/Zip/testsuite/TestSuite_x64_vs150.vcxproj index 3068d608b..882873564 100644 --- a/Zip/testsuite/TestSuite_x64_vs150.vcxproj +++ b/Zip/testsuite/TestSuite_x64_vs150.vcxproj @@ -142,6 +142,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -172,6 +173,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -200,6 +202,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -230,6 +233,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -258,6 +262,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -288,6 +293,7 @@ Default + iphlpapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters b/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters index 0fd2290f5..6550dc50e 100644 --- a/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters +++ b/Zip/testsuite/TestSuite_x64_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {c6f3a6d6-6517-44ce-a046-e9cc44b645a1} + {742b205b-d7bf-4eb3-92ff-3347fb9497f7} - {b4c5bebc-1186-4160-86a2-6e03b04e3a29} + {424d7ef4-5358-48d5-a84e-9c0c89f5ca85} - {80b1306f-6b18-412f-9536-963775714c18} + {11ce2a94-12c6-4003-a3ab-b4b2a80ecad4} - {f0263a5d-0351-4116-aa9b-fa83065ff3a1} + {967c5ed2-2712-4fe9-a523-d278383a2662} - {3e2ba1bd-1355-4218-a106-187137d2cfe0} + {531bfd55-51f9-4cd8-93e8-fd0e6fbb3b79} - {9dff3010-b037-40c6-8a76-f43ffbbf7594} + {b54cf89e-8174-452d-84a4-caa537f3a971} - {4d194834-a372-43fb-b4c4-e47c59b2217b} + {492b1f8b-f7a2-4b0c-8c0d-c68013430f8f} - {b9cb251f-5e8e-48ea-849c-1f8810ed5b0e} + {b84add50-e3eb-433d-8cf4-9365ff6ac38d} diff --git a/Zip/testsuite/TestSuite_x64_vs90.vcproj b/Zip/testsuite/TestSuite_x64_vs90.vcproj index 0719b6a63..c9e373348 100644 --- a/Zip/testsuite/TestSuite_x64_vs90.vcproj +++ b/Zip/testsuite/TestSuite_x64_vs90.vcproj @@ -57,7 +57,7 @@ Name="VCPreLinkEventTool"/> Date: Wed, 20 Jun 2018 20:16:21 +0200 Subject: [PATCH 14/21] Use PlatformToolset version PlatformToolset>v141 --- build.gradle.win | 12 ++++++------ ...x64.targets => Pocoproject.Poco.v141.x64.targets} | 0 ...x86.targets => Pocoproject.Poco.v141.x86.targets} | 0 3 files changed, 6 insertions(+), 6 deletions(-) rename packaging/Windows/NuGet/{Pocoproject.Poco.vs150.x64.targets => Pocoproject.Poco.v141.x64.targets} (100%) rename packaging/Windows/NuGet/{Pocoproject.Poco.vs150.x86.targets => Pocoproject.Poco.v141.x86.targets} (100%) diff --git a/build.gradle.win b/build.gradle.win index afa7cfcc6..e388fc8aa 100644 --- a/build.gradle.win +++ b/build.gradle.win @@ -960,12 +960,12 @@ ext.commonNuspecMetadata = [ task 'nugetSpec-x86'(type: NuGetSpec) { nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.vs150.x86", - title: "Pocoproject Poco vs150 $version x86", + id: "Pocoproject.Poco.v141.x86", + title: "Pocoproject Poco v141 $version x86", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x86", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.vs150.x86.targets", target: "build\\native") }, + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x86.targets", target: "build\\native") }, { file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, @@ -995,12 +995,12 @@ task 'nugetSpec-x86'(type: NuGetSpec) { task 'nugetSpec-x64'(type: NuGetSpec) { nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.vs150.x64", - title: "Pocoproject Poco vs150 $version x64", + id: "Pocoproject.Poco.v141.x64", + title: "Pocoproject Poco v141 $version x64", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x64", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.vs150.x64.targets", target: "build\\native") }, + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x64.targets", target: "build\\native") }, { file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, { file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.vs150.x64.targets b/packaging/Windows/NuGet/Pocoproject.Poco.v141.x64.targets similarity index 100% rename from packaging/Windows/NuGet/Pocoproject.Poco.vs150.x64.targets rename to packaging/Windows/NuGet/Pocoproject.Poco.v141.x64.targets diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.vs150.x86.targets b/packaging/Windows/NuGet/Pocoproject.Poco.v141.x86.targets similarity index 100% rename from packaging/Windows/NuGet/Pocoproject.Poco.vs150.x86.targets rename to packaging/Windows/NuGet/Pocoproject.Poco.v141.x86.targets From 95c3e7e245849256309aa4e97c4859de5c483b8b Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Wed, 20 Jun 2018 20:19:50 +0200 Subject: [PATCH 15/21] Move vswhere.exe to build\exe --- build/{script => exe}/vswhere.exe | Bin buildwin.cmd | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename build/{script => exe}/vswhere.exe (100%) diff --git a/build/script/vswhere.exe b/build/exe/vswhere.exe similarity index 100% rename from build/script/vswhere.exe rename to build/exe/vswhere.exe diff --git a/buildwin.cmd b/buildwin.cmd index 245aed5b7..d4420684c 100644 --- a/buildwin.cmd +++ b/buildwin.cmd @@ -35,7 +35,7 @@ set PATH=%POCO_BASE%\bin64;%POCO_BASE%\bin;%PATH% rem VS_VERSION {90 | 100 | 110 | 120 | 140 | 150} if "%1"=="" goto usage -set vswhere='build\script\vswhere.exe -property installationPath' +set vswhere='build\exe\vswhere.exe -property installationPath' for /f "delims=" %%a in (%vswhere%) do @set VS150COMNTOOLS=%%a set VS150COMNTOOLS=%VS150COMNTOOLS%\Common7\Tools\ From 9d0a1d1a7a28ee49de3df29bbc08c04430523e6f Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Wed, 27 Jun 2018 18:00:10 -0500 Subject: [PATCH 16/21] typo fix --- Data/include/Poco/Data/SessionImpl.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Data/include/Poco/Data/SessionImpl.h b/Data/include/Poco/Data/SessionImpl.h index 8875eebcb..2312e7554 100644 --- a/Data/include/Poco/Data/SessionImpl.h +++ b/Data/include/Poco/Data/SessionImpl.h @@ -172,7 +172,7 @@ public: protected: void setConnectionString(const std::string& connectionString); /// Sets the connection string. Should only be called on - /// disconnetced sessions. Throws InvalidAccessException when called on + /// disconnected sessions. Throws InvalidAccessException when called on /// a connected session. private: From 2f8f131f8e1b5f3a401b0ee6ad7f8be88e74e9bd Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 29 Jun 2018 08:11:12 +0200 Subject: [PATCH 17/21] Add VisualStudio selection for building poco --- CppUnit/build.gradle | 2 +- build.gradle.win | 204 ++++++++++++++++++++++++--------- gradle.properties | 72 ++++++------ packaging/Windows/WiX/Poco.wxs | 7 +- 4 files changed, 192 insertions(+), 93 deletions(-) diff --git a/CppUnit/build.gradle b/CppUnit/build.gradle index cca7aa5b7..bb46e83a9 100644 --- a/CppUnit/build.gradle +++ b/CppUnit/build.gradle @@ -16,7 +16,7 @@ model { exportedHeaders { srcDir 'include' } - lib project: ':Foundation', library: 'Foundation' + //lib project: ':Foundation', library: 'Foundation' } } } diff --git a/build.gradle.win b/build.gradle.win index e388fc8aa..519bc8701 100644 --- a/build.gradle.win +++ b/build.gradle.win @@ -199,6 +199,46 @@ class SliceTasksPlugin extends RuleSource { } } +def getSelectedVisualStudioToolChain() { + String selector = System.properties["VS"] + + if (selector == null) { + selector = "VS2017" + } + + String installDir = null + String toolset = null; + String vsvers = null; + switch (selector) { + case "VS2008": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio 9.0";vsvers="vs90";toolset = "v90"; + break; + case "VS2010": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio 10.0";vsvers="vs100";toolset = "v100"; + break; + case "VS2012": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio 11.0";vsvers="vs110";toolset = "v110"; + break; + case "VS2013": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio 12.0";vsvers="vs120";toolset = "v120"; + break; + case "VS2015": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio 14.0";vsvers="vs140";toolset = "v140"; + break; + case "VS2017": + installDir = "file://C:/Program Files (x86)/Microsoft Visual Studio/2017/Community";vsvers="vs150";toolset = "v141"; + break; + default: + throw new IllegalArgumentException() + } + + return [ + vsyear: selector, + vsvers: vsvers, + toolset: toolset, + installDir: installDir, + ] +} allprojects { buildDir = new File('guild') // DO NOT REMOVE OR CHANGE to 'build' since 'build' is a Poco directory @@ -229,13 +269,36 @@ subprojects { release debug } + toolChains { + def vsToolChain = getSelectedVisualStudioToolChain() + create(vsToolChain.vsyear, VisualCpp) { + installDir vsToolChain.installDir + } + } -/* - toolChains { - visualCpp(VisualCpp) { - // Specify the installDir if Visual Studio cannot be located -// installDir "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community" -// installDir "C:/Program Files (x86)/Microsoft Visual Studio 14.0" +/* toolChains { + VS2008(VisualCpp) { + installDir = VS2008installDir + } + VS2010(VisualCpp) { + installDir = VS2010installDir + } + VS2012(VisualCpp) { + installDir = VS2012installDir + } + VS2013(VisualCpp) { + installDir = VS2013installDir + } + VS2015(VisualCpp) { + installDir = VS2015installDir + } + VS2017(VisualCpp) { + installDir "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community" + eachPlatform { + cppCompiler.withArguments { args -> + args << "-DFRENCH" + } + } } gcc(Gcc) { @@ -243,8 +306,9 @@ subprojects { // path "/usr/bin/gcc" } clang(Clang) + } -*/ +*/ platforms { win32 { operatingSystem "windows" @@ -957,72 +1021,98 @@ ext.commonNuspecMetadata = [ copyright: 'Copyright 2018', releaseNotes: 'releaseNotes' ] +task nugetCopyx86Target(type: Copy) { + def vsToolChain = getSelectedVisualStudioToolChain() + String toolset = vsToolChain.toolset + from file("$rootDir/packaging/Windows/NuGet/Pocoproject.Poco.x86.targets") + rename { String filename -> + int insert = filename.indexOf("x86") + return filename[0..insert - 1] + toolset + "." + filename.substring(insert) + } + into file("$rootDir/packaging/Windows/NuGet") +} +task nugetCopyx64Target(type: Copy) { + def vsToolChain = getSelectedVisualStudioToolChain() + String toolset = vsToolChain.toolset + from file("$rootDir/packaging/Windows/NuGet/Pocoproject.Poco.x64.targets") + rename { String filename -> + int insert = filename.indexOf("x64") + return filename[0..insert - 1] + toolset + "." + filename.substring(insert) + } + into file("$rootDir/packaging/Windows/NuGet") +} task 'nugetSpec-x86'(type: NuGetSpec) { + dependsOn 'nugetCopyx86Target' + def vsToolChain = getSelectedVisualStudioToolChain() + String toolset = vsToolChain.toolset nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.v141.x86", - title: "Pocoproject Poco v141 $version x86", + id: "Pocoproject.Poco.${toolset}.x86", + title: "Pocoproject Poco ${toolset} $version x86", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x86", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x86.targets", target: "build\\native") }, - { file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib\\Poco*d.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**",target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.${vsToolChain["toolset"]}.x86.targets", target: "build\\native") }, + { file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\lib\\Poco*d.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\PostgreSQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } ] ] outputs.file(nuspecFile) } task 'nugetSpec-x64'(type: NuGetSpec) { + dependsOn 'nugetCopyx64Target' + def vsToolChain = getSelectedVisualStudioToolChain() + String toolset = vsToolChain.toolset nuspec = [ metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.v141.x64", - title: "Pocoproject Poco v141 $version x64", + id: "Pocoproject.Poco.${toolset}.x64", + title: "Pocoproject Poco ${toolset} $version x64", dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x64", version: "1.1.0") } ] ], files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.v141.x64.targets", target: "build\\native") }, - { file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib64\\Poco*d.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**",target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.${vsToolChain["toolset"]}.x64.targets", target: "build\\native") }, + { file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\lib64\\Poco*d.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\PostgreSQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } ] ] outputs.file(nuspecFile) diff --git a/gradle.properties b/gradle.properties index 516aa53a6..bf22e730d 100644 --- a/gradle.properties +++ b/gradle.properties @@ -2,81 +2,87 @@ # Windows Customization ############################################################################### # https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.19-win32.zip -mysql32Home=C:/mysql-5.6.37-win32 +# mysql32Home=C:/mysql-5.6.37-win32 # https://cdn.mysql.com//Downloads/MySQL-5.7/mysql-5.7.19-winx64.zip -mysql64Home=C:/mysql-5.6.37-winx64 +# mysql64Home=C:/mysql-5.6.37-winx64 # https://get.enterprisedb.com/postgresql/postgresql-9.6.3-2-windows-binaries.zip -postgres32Home=C:/postgresql-9.6.3-2-win32/pgsql +# postgres32Home=C:/postgresql-9.6.3-2-win32/pgsql # https://get.enterprisedb.com/postgresql/postgresql-9.6.3-2-windows-x64-binaries.zip -postgres64Home=C:/postgresql-9.6.3-2-win64/pgsql +# postgres64Home=C:/postgresql-9.6.3-2-win64/pgsql # Windows Development Kit -WDKHome=C:/Program Files (x86)/Windows Kits/10 -WDKVers=10.0.16299.0 +# WDKHome=C:/Program Files (x86)/Windows Kits/10 +# WDKVers=10.0.16299.0 #C:\Program Files (x86)\Windows Kits\10\Include\10.0.16299.0\ucrt # C:\Program Files (x86)\Windows Kits\10\Lib\10.0.16299.0\um\x86 # VisualStudio 2015 -#VCHome=C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC +# VCHome=C:/Program Files (x86)/Microsoft Visual Studio 14.0/VC # VisualStudio 2017 # c:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.11.25503 -VCHome=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.13.26128 +# VCHome=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.14.26428 # C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Tools\MSVC\114.13.26128\bin\HostX86\x86\cl.exe -CLPath=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.13.26128/bin/HostX86/x86 +# CLPath=C:/Program Files (x86)/Microsoft Visual Studio/2017/Community/VC/Tools/MSVC/14.14.26428/bin/Hostx86/x86 +VS2008installDir = "C:/Program Files (x86)/Microsoft Visual Studio 9.0" +VS2010installDir = "C:/Program Files (x86)/Microsoft Visual Studio 10.0" +VS2012installDir = "C:/Program Files (x86)/Microsoft Visual Studio 11.0" +VS2013installDir = "C:/Program Files (x86)/Microsoft Visual Studio 12.0" +VS2015installDir = "C:/Program Files (x86)/Microsoft Visual Studio 14.0" +VS2017installDir = "C:/Program Files (x86)/Microsoft Visual Studio/2017/Community" + # https://github.com/wixtoolset/wix3/releases/download/wix311rtm/wix311.exe -WiXHome=C:/Program Files (x86)/WiX Toolset v3.11 +# WiXHome=C:/Program Files (x86)/WiX Toolset v3.11 # https://dist.nuget.org/win-x86-commandline/v4.3.0/nuget.exe -NuGetHome=C:/Program Files (x86)/NuGet +# NuGetHome=C:/Program Files (x86)/NuGet #https://github.com/OpenCppCoverage/OpenCppCoverage/releases -OpenCppCoverageHome=C:/Program Files/OpenCppCoverage +# OpenCppCoverageHome=C:/Program Files/OpenCppCoverage #https://github.com/danielpalme/ReportGenerator/releases -#ReportGeneratorHome=C:/ProgramFiles/ReportGenerator -ReportGeneratorHome=C:/ProgramFiles/ReportGenerator +# ReportGeneratorHome=C:/ProgramFiles/ReportGenerator -openSSLWindowsHome = openssl/build +# openSSLWindowsHome = openssl/build ############################################################################### # Linux Customization ############################################################################### -openSSL32LinuxLib = /usr/local/lib -openSSL32LinuxInc = /usr/local/include/openssl +# openSSL32LinuxLib = /usr/local/lib +# openSSL32LinuxInc = /usr/local/include/openssl -openSSL64LinuxLib = /usr/local/lib -openSSL64LinuxInc = /usr/local/include/openssl +# openSSL64LinuxLib = /usr/local/lib +# openSSL64LinuxInc = /usr/local/include/openssl -mysql32LinuxLib = -mysql32LinuxInc = /usr/local +# mysql32LinuxLib = +# mysql32LinuxInc = /usr/local -mysql64LinuxLib = -mysql64LinuxInc = /usr/local +# mysql64LinuxLib = +# mysql64LinuxInc = /usr/local -postgres32LinuxLib = /usr/lib/x86-linux-gnu/ -postgres32LinuxInc = /usr/local/postgresql/ +# postgres32LinuxLib = /usr/lib/x86-linux-gnu/ +# postgres32LinuxInc = /usr/local/postgresql/ -postgres64LinuxLib = /usr/lib/x86_64-linux-gnu/ -postgres64LinuxInc = /usr/include/postgresql/ +# postgres64LinuxLib = /usr/lib/x86_64-linux-gnu/ +# postgres64LinuxInc = /usr/include/postgresql/ ############################################################################### # Mac OSX Customization ############################################################################### -openSSLBrewHome = /usr/local/opt/openssl +# openSSLBrewHome = /usr/local/opt/openssl -postgres32OSXHome = -postgres32OSXLib = -postgres32OSXInc = /usr/local +# postgres32OSXHome = +# postgres32OSXLib = +# postgres32OSXInc = /usr/local -postgres64OSXLib = /usr/lib/x86_64-linux-gnu/ -postgres64OSXInc = /usr/include/postgresql/ +# postgres64OSXLib = /usr/lib/x86_64-linux-gnu/ +# postgres64OSXInc = /usr/include/postgresql/ ############################################################################### # Common diff --git a/packaging/Windows/WiX/Poco.wxs b/packaging/Windows/WiX/Poco.wxs index 0b76602b8..2ee42ff84 100644 --- a/packaging/Windows/WiX/Poco.wxs +++ b/packaging/Windows/WiX/Poco.wxs @@ -7,6 +7,9 @@ + + + @@ -83,8 +86,8 @@ - - + + From d6f5cc226fb84fd84b9d527307499a32299565fe Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Fri, 29 Jun 2018 16:28:56 +0200 Subject: [PATCH 18/21] Add targets MSBuild file for x86 & x64 --- .../Windows/NuGet/Pocoproject.Poco.x64.targets | 10 ++++++++++ .../Windows/NuGet/Pocoproject.Poco.x86.targets | 13 +++++++++++++ 2 files changed, 23 insertions(+) create mode 100644 packaging/Windows/NuGet/Pocoproject.Poco.x64.targets create mode 100644 packaging/Windows/NuGet/Pocoproject.Poco.x86.targets diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.x64.targets b/packaging/Windows/NuGet/Pocoproject.Poco.x64.targets new file mode 100644 index 000000000..25ec1c217 --- /dev/null +++ b/packaging/Windows/NuGet/Pocoproject.Poco.x64.targets @@ -0,0 +1,10 @@ + + + + $(MSBuildThisFileDirectory)inc;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)lib64;%(AdditionalLibraryDirectories) + + + \ No newline at end of file diff --git a/packaging/Windows/NuGet/Pocoproject.Poco.x86.targets b/packaging/Windows/NuGet/Pocoproject.Poco.x86.targets new file mode 100644 index 000000000..e9d00eeb1 --- /dev/null +++ b/packaging/Windows/NuGet/Pocoproject.Poco.x86.targets @@ -0,0 +1,13 @@ + + + + $(MSBuildThisFileDirectory)inc;%(AdditionalIncludeDirectories) + + + $(MSBuildThisFileDirectory)lib;%(AdditionalLibraryDirectories) + + + $(MSBuildThisFileDirectory)lib;%(AdditionalLibraryDirectories) + + + \ No newline at end of file From bad9b65822a4efcb20bf170b1f6dda0d92ca384e Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 30 Jun 2018 12:34:23 +0200 Subject: [PATCH 19/21] Add Data/PostgreSQL --- packaging/Windows/WiX/Poco.wxs | 157 ++++++++++++++------------------- 1 file changed, 66 insertions(+), 91 deletions(-) diff --git a/packaging/Windows/WiX/Poco.wxs b/packaging/Windows/WiX/Poco.wxs index 2ee42ff84..58c62e113 100644 --- a/packaging/Windows/WiX/Poco.wxs +++ b/packaging/Windows/WiX/Poco.wxs @@ -7,9 +7,7 @@ - - - + @@ -97,14 +95,7 @@ - - - - - - - - + @@ -139,6 +130,13 @@ + + + + + + + @@ -259,14 +257,7 @@ - - - - - - - - + @@ -301,6 +292,13 @@ + + + + + + + @@ -403,16 +401,6 @@ - - - - - - - - - - @@ -453,6 +441,16 @@ + + + + + + + + + + @@ -574,16 +572,6 @@ - - - - - - - - - - @@ -624,6 +612,16 @@ + + + + + + + + + + @@ -682,14 +680,6 @@ - - - - - - - - @@ -730,6 +720,14 @@ + + + + + + + + @@ -867,14 +865,6 @@ - - - - - - - - @@ -915,6 +905,14 @@ + + + + + + + + @@ -1236,28 +1234,6 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -3145,12 +3121,12 @@ - + @@ -3162,12 +3138,12 @@ - + @@ -3179,13 +3155,13 @@ - + @@ -3196,13 +3172,13 @@ - + @@ -3217,13 +3193,13 @@ - + @@ -3235,13 +3211,13 @@ - + @@ -3260,7 +3236,6 @@ - @@ -3281,12 +3256,12 @@ - + @@ -3298,12 +3273,12 @@ - + @@ -3315,13 +3290,13 @@ - + @@ -3332,13 +3307,13 @@ - + @@ -3353,13 +3328,13 @@ - + @@ -3371,13 +3346,13 @@ - - + + From abc7c39ac502809a44d7c94537f4dcde79dffeeb Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 30 Jun 2018 12:34:50 +0200 Subject: [PATCH 20/21] Refactor packaging tasks --- build.gradle.win | 234 ++++++++++++++++++----------------------------- 1 file changed, 91 insertions(+), 143 deletions(-) diff --git a/build.gradle.win b/build.gradle.win index 519bc8701..353b7a764 100644 --- a/build.gradle.win +++ b/build.gradle.win @@ -939,31 +939,33 @@ task zipDoc(type: Zip) { dependsOn pocoDoc } -def candle(VSYEAR, VERSION, target, os) { - return tasks.create("Candle-${VSYEAR}-${VERSION}-${target}", Exec) { +def candle(vsyear, toolset, version, arch, os) { + return tasks.create("Candle-${vsyear}-${toolset}-${version}-${arch}", Exec) { def Set pocos = project.getTasksByName('poco', true) setDependsOn(pocos) - dependsOn ':pocoDoc' +// dependsOn ':pocoDoc' workingDir "packaging/Windows/WiX" + String wixobj = "Poco-$toolset-$arch-${version}.wixobj" executable "${WiXHome}/bin/Candle.exe" - args "-arch", "${target}" - args "-dVSYEAR=${VSYEAR}" - args "-dVERSION=${VERSION}" + args "-arch", "${arch}" + args "-dVSYEAR=${vsyear}" + args "-dVERSION=${version}" args "-dPOCO=${rootDir}" - args "-dPlatform=${target}" + args "-dPlatform=${arch}" + args "-dToolset=${toolset}" args "-ext", "${WiXHome}/bin/WixUIExtension.dll" - args "-out", "${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.wixobj" + args "-out", "${vsyear}/${wixobj}" args "Poco.wxs" - def File index = new File("$rootDir/releases/poco-$VERSION-all-doc/index.html") + def File index = new File("$rootDir/releases/poco-$version-all-doc/index.html") inputs.file(index) inputs.files(pocos.inputs.files) inputs.file(new File(workingDir, "Poco.wxs")) inputs.files(project.getTasksByName('poco', true).outputs.files) - def File output = new File(workingDir,"${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.wixobj") + def File output = new File(workingDir,"${vsyear}/${vsyear}-Poco-$version-${arch}.wixobj") outputs.file(output) onlyIf(new Spec() { @@ -973,21 +975,22 @@ def candle(VSYEAR, VERSION, target, os) { }); } } -def light(VSYEAR, VERSION, target, os) { - return tasks.create("Light-${VSYEAR}-${VERSION}-${target}", Exec) { - dependsOn candle(VSYEAR, VERSION, target, os) +def light(vsyear, toolset, version, arch, os) { + return tasks.create("Light-${vsyear}-${toolset}-${version}-${arch}", Exec) { + dependsOn candle(vsyear, toolset, version, arch, os) workingDir "packaging/Windows/WiX" - + String msi = "Poco-$toolset-$arch-${version}.msi" + String wixobj = "Poco-$toolset-$arch-${version}.wixobj" + executable "${WiXHome}/bin/Light.exe" args "-cultures:null" args "-ext", "${WiXHome}/bin/WixUIExtension.dll" - args "-out" - args "${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.msi" - args "${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.wixobj" + args "-out", "${vsyear}/${msi}" + args "${vsyear}/${wixobj}" - def File input = new File(workingDir, "${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.wixobj") + def File input = new File(workingDir, "${vsyear}/${wixobj}") inputs.file(input) - def File output = new File(workingDir, "${VSYEAR}/${VSYEAR}-Poco-$VERSION-${target}.msi") + def File output = new File(workingDir, "${vsyear}/${msi}") outputs.file(output) onlyIf(new Spec() { @@ -998,8 +1001,10 @@ def light(VSYEAR, VERSION, target, os) { } } task wix() { - dependsOn light('VS2017', version, 'x86', os) - dependsOn light('VS2017', version, 'x64', os) + String vsyear = getSelectedVisualStudioToolChain().vsyear + String toolset = getSelectedVisualStudioToolChain().toolset + dependsOn light(vsyear, toolset, version, 'x86', os) + dependsOn light(vsyear, toolset, version, 'x64', os) onlyIf(new Spec() { boolean isSatisfiedBy(Task task) { return os.windows; @@ -1007,7 +1012,7 @@ task wix() { }); } -ext.commonNuspecMetadata = [ +ext.commoNuspecMetadata = [ version: "1.9.1", owners: 'Guenter Obiltschnig & Aleksandar Fabijanic', authors: 'Applied Informatics & Contributors', @@ -1017,137 +1022,80 @@ ext.commonNuspecMetadata = [ copyright: 'Applied Informatics copyright 2018', requireLicenseAcceptance: false, description: 'Modern, powerful open source C++ class libraries for building network- and internet-based applications that run on desktop, server, mobile and embedded systems.', - tags: 'natif string filesystem thread date log event regex uri uuid cache native nativepackage sockets mime http ftp mail pop3 smtp html sax sax2 dom xml', + tags: 'native string filesystem thread date log event regex uri uuid cache native nativepackage sockets mime http ftp mail pop3 smtp html sax sax2 dom xml', copyright: 'Copyright 2018', releaseNotes: 'releaseNotes' ] -task nugetCopyx86Target(type: Copy) { - def vsToolChain = getSelectedVisualStudioToolChain() - String toolset = vsToolChain.toolset - from file("$rootDir/packaging/Windows/NuGet/Pocoproject.Poco.x86.targets") - rename { String filename -> - int insert = filename.indexOf("x86") - return filename[0..insert - 1] + toolset + "." + filename.substring(insert) - } - into file("$rootDir/packaging/Windows/NuGet") -} -task nugetCopyx64Target(type: Copy) { - def vsToolChain = getSelectedVisualStudioToolChain() - String toolset = vsToolChain.toolset - from file("$rootDir/packaging/Windows/NuGet/Pocoproject.Poco.x64.targets") - rename { String filename -> - int insert = filename.indexOf("x64") - return filename[0..insert - 1] + toolset + "." + filename.substring(insert) - } - into file("$rootDir/packaging/Windows/NuGet") -} -task 'nugetSpec-x86'(type: NuGetSpec) { - dependsOn 'nugetCopyx86Target' - def vsToolChain = getSelectedVisualStudioToolChain() - String toolset = vsToolChain.toolset - nuspec = [ - metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.${toolset}.x86", - title: "Pocoproject Poco ${toolset} $version x86", - dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x86", version: "1.1.0") } ] - ], - files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.${vsToolChain["toolset"]}.x86.targets", target: "build\\native") }, - { file(src: "$rootDir\\bin\\Poco*.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib\\Poco*.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\bin\\Poco*d.*", target: "build\\native\\bin", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib\\Poco*d.*", target: "build\\native\\lib", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\PostgreSQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } - ] - ] - outputs.file(nuspecFile) -} -task 'nugetSpec-x64'(type: NuGetSpec) { - dependsOn 'nugetCopyx64Target' - def vsToolChain = getSelectedVisualStudioToolChain() - String toolset = vsToolChain.toolset - nuspec = [ - metadata: commonNuspecMetadata + [ - id: "Pocoproject.Poco.${toolset}.x64", - title: "Pocoproject Poco ${toolset} $version x64", - dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.x64", version: "1.1.0") } ] - ], - files: [ - { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.${vsToolChain["toolset"]}.x64.targets", target: "build\\native") }, - { file(src: "$rootDir\\bin64\\Poco*64.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib64\\Poco*.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\bin64\\Poco*64d.*", target: "build\\native\\bin64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\lib64\\Poco*d.*", target: "build\\native\\lib64", exclude: "$rootDir\\bin\\*CppParser*.*") }, - { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\PostgreSQL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, - { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } - ] - ] - outputs.file(nuspecFile) -} - -task 'nugetPack-x86'(type: NuGetPack) { - def Set pocos = project.getTasksByName('poco', true) - setDependsOn(pocos) - destinationDir "$rootDir/packaging/Windows/Nuget" - dependsOn 'nugetSpec-x86' - nuspecFile = project.tasks.findByPath('nugetSpec-x86').nuspecFile - onlyIf(new Spec() { - boolean isSatisfiedBy(Exec task) { - return os.windows; +def nugetCopyTarget(arch) { + return tasks.create("nugetCopyTarget-${arch}", Copy) { + String toolset = getSelectedVisualStudioToolChain().toolset + from file("$rootDir/packaging/Windows/NuGet/Pocoproject.Poco.${arch}.targets") + rename { String filename -> + int insert = filename.indexOf(arch) + return filename[0..insert - 1] + toolset + "." + filename.substring(insert) } - }); + into file("$rootDir/packaging/Windows/NuGet") + } } -task 'nugetPack-x64'(type: NuGetPack) { - def Set pocos = project.getTasksByName('poco', true) - setDependsOn(pocos) - destinationDir "$rootDir/packaging/Windows/Nuget" - dependsOn 'nugetSpec-x64' - nuspecFile = project.tasks.findByPath('nugetSpec-x64').nuspecFile - onlyIf(new Spec() { - boolean isSatisfiedBy(Exec task) { - return os.windows; +def pocoNugetSpec(arch) { + return tasks.create("pocoNugetSpec-${arch}", NuGetSpec) { + dependsOn nugetCopyTarget(arch) + String toolset = getSelectedVisualStudioToolChain().toolset + String bin = "bin" + String lib = "lib" + String suffix = "" + if (arch == 'x64') { + bin += "64";lib += "64";suffix = "64"; } - }); + nuspec = [ + metadata: commoNuspecMetadata + [ + id: "Pocoproject.Poco.${toolset}.${arch}", + title: "Pocoproject Poco ${toolset} $version ${arch}", + dependencies: [ { dependency(id: "Pocoproject.OpenSSL.vs120.${arch}", version: "1.1.0") } ] + ], + files: [ + { file(src: "$rootDir\\packaging\\Windows\\NuGet\\Pocoproject.Poco.${toolset}.${arch}.targets", target: "build\\native") }, + { file(src: "$rootDir\\${bin}\\Poco*${suffix}.*", target: "build\\native\\${bin}", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\${lib}\\Poco*.*", target: "build\\native\\${lib}", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\${bin}\\Poco*${suffix}d.*", target: "build\\native\\${bin}", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\${lib}\\Poco*d.*", target: "build\\native\\${lib}", exclude: "$rootDir\\bin\\*CppParser*.*") }, + { file(src: "$rootDir\\CppUnit\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Foundation\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Encodings\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Crypto\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\MySQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\ODBC\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\SQLite\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Data\\PostgreSQL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\JSON\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\MongoDB\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Net\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_OpenSSL\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\NetSSL_Win\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\PDF\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Util\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\XML\\include\\**", target: "build\\native\\inc") }, + { file(src: "$rootDir\\Zip\\include\\**", target: "build\\native\\inc") } + ] + ] + outputs.file(nuspecFile) + } +} +def pocoNugetPack(arch) { + return tasks.create("pocoNugetPack-${arch}", NuGetPack) { + def Set pocos = project.getTasksByName('poco', true) + setDependsOn(pocos) + destinationDir "$rootDir/packaging/Windows/Nuget" + dependsOn pocoNugetSpec(arch) + nuspecFile = project.tasks.findByPath("pocoNugetSpec-$arch").nuspecFile + } } - task packaging() { if (os.windows) { - dependsOn 'nugetPack-x86' - dependsOn 'nugetPack-x64' + dependsOn pocoNugetPack('x86') + dependsOn pocoNugetPack('x64') dependsOn wix } } From a9fe2c481c1b2e3c742537ca28b57ac1bc1dc099 Mon Sep 17 00:00:00 2001 From: Francis ANDRE Date: Sat, 30 Jun 2018 19:14:55 +0200 Subject: [PATCH 21/21] readd pocoDoc dependency --- build.gradle.win | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle.win b/build.gradle.win index 353b7a764..bc1b4a6ae 100644 --- a/build.gradle.win +++ b/build.gradle.win @@ -943,7 +943,7 @@ def candle(vsyear, toolset, version, arch, os) { return tasks.create("Candle-${vsyear}-${toolset}-${version}-${arch}", Exec) { def Set pocos = project.getTasksByName('poco', true) setDependsOn(pocos) -// dependsOn ':pocoDoc' + dependsOn ':pocoDoc' workingDir "packaging/Windows/WiX" String wixobj = "Poco-$toolset-$arch-${version}.wixobj"