diff --git a/.gitignore b/.gitignore index bfccd1eb5e..152101e6fc 100644 --- a/.gitignore +++ b/.gitignore @@ -131,6 +131,8 @@ lib/ lib64/ pocomsg.h **/UpgradeLog*.XML +.vs/ +vcpkg_installed/ # Eclipse generated files # ########################### @@ -163,3 +165,7 @@ node_modules *_vs1[45]0.sln *_vs1[45]0.vcxproj *_vs1[45]0.vcxproj.filters + +# Debug files # +############## +*.core diff --git a/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h b/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h index c8d2860f7a..be932c5722 100644 --- a/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h +++ b/ActiveRecord/include/Poco/ActiveRecord/ActiveRecord.h @@ -240,23 +240,24 @@ template IDType ActiveRecord::lastInsertID(Poco::Data::Session& session) { using namespace Poco::Data::Keywords; + using namespace std::string_literals; IDType id; - if (session.connector() == "sqlite") + if (Poco::icompare(session.connector(), "sqlite"s) == 0) { session << "SELECT last_insert_rowid()", into(id), now; } - else if (session.connector() == "PostgreSQL") + else if (Poco::icompare(session.connector(), "postgresql"s) == 0) { session - << "SELECT currval('id_seq')", + << "SELECT lastval()", into(id), now; } - else if (session.connector() == "MySQL") + else if (Poco::icompare(session.connector(), "mysql"s) == 0) { session << "SELECT LAST_INSERT_ID()", diff --git a/ActiveRecord/src/Context.cpp b/ActiveRecord/src/Context.cpp index 499ba090e2..d3231a337b 100644 --- a/ActiveRecord/src/Context.cpp +++ b/ActiveRecord/src/Context.cpp @@ -15,6 +15,9 @@ #include "Poco/ActiveRecord/Context.h" +using namespace std::string_literals; + + namespace Poco { namespace ActiveRecord { @@ -33,7 +36,7 @@ Context::Context(const std::string& connector, const std::string& connectionStri StatementPlaceholderProvider::Ptr Context::statementPlaceholderProvider() const { - if (_session.connector() == "postgresql") + if (Poco::icompare(_session.connector(), "postgresql"s) == 0) return std::make_unique(); else return std::make_unique(); diff --git a/CHANGELOG b/CHANGELOG index 813c862c12..d390d946d0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,37 @@ This is the changelog file for the POCO C++ Libraries. +Release 1.13.3 (2024-04-04) +=========================== + +Summary of Changes: + +This is a bugfix release. + +Security Fixes: + +- GH #4496 Upgrade bundled libexpat to 2.6.2 + +Features, Enhancements and Third Party Updates: + +- GH #4488 Add Poco::Util::Timer::idle() method to check if timer has any tasks scheduled +- GH #3807 DNS.resolve() should not be sorted in HostEntry::removeDuplicates() +- GH #4515 Upgrade bundled SQLite to 3.45.2 +- PR #4517 Optimize Net module for Android + +Bug Fixes and Improvements: + +- GH #4505 ODBC Unicode wrappers do not check for null length pointers +- GH #4492 Poco::BasicMemoryStreamBuf is missing seekpos() +- GH #4486 DateTimeFormat RFC1036 Sunday name is short (should be long) +- GH #4468 Poco::URI: don't lowercase host part if it's a Unix domain socket +- GH #4450 Error between Poco::ActiveRecord and Poco::Data::PostgreSQL +- GH #4435 SecureStreamSocket is not thread-safe +- GH #4415 SecureSocketImpl::reset shouldn't close socket +- GH #3857 Thread_POSIX.cpp shouldn't convert thread IDs to long +- GH #3725 secure socket receiveTimeout throwing after configured timeout * 2 + + Release 1.13.2 (2024-02-19) =========================== @@ -38,7 +69,7 @@ Features and Enhancements: Bug Fixes and Improvements: -- GH #4443 Upgrade libexpat to 2.6.0 +- GH #4443 Upgrade libexpat to 2.6.0 - GH #4425 Unit tests: optional testing of deprecated functionality - GH #4421 Multiple calls to initializeSSL/uninitializeSSL cause assert failure during certificate validation - GH #4411 NULL pointer: strategy when setting rotation never in FileChannel diff --git a/CMakeLists.txt b/CMakeLists.txt index f561791622..af6af03591 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -424,8 +424,8 @@ if(EXISTS ${PROJECT_SOURCE_DIR}/Data/MySQL AND ENABLE_DATA_MYSQL) list(APPEND Poco_COMPONENTS "Data/MySQL") endif() -if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgresSQL AND ENABLE_DATA_POSTGRESQL) - list(APPEND Poco_COMPONENTS "Data/PostgresSQL") +if(EXISTS ${PROJECT_SOURCE_DIR}/Data/PostgreSQL AND ENABLE_DATA_POSTGRESQL) + list(APPEND Poco_COMPONENTS "Data/PostgreSQL") endif() if(EXISTS ${PROJECT_SOURCE_DIR}/ActiveRecord AND ENABLE_ACTIVERECORD) diff --git a/CONTRIBUTORS b/CONTRIBUTORS index 3b226c0048..bc0497c0fc 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -65,3 +65,4 @@ Andrew Auclair Jochen Sprickerhof Jesse Hoogervorst Aron Budea +zhuzeitou diff --git a/CppParser/CppParser.progen b/CppParser/CppParser.progen index c45badd30c..2cbd38aed5 100644 --- a/CppParser/CppParser.progen +++ b/CppParser/CppParser.progen @@ -11,5 +11,6 @@ vc.project.compiler.include = ..\\Foundation\\include 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/CppParser/CppParser_vs160.vcxproj b/CppParser/CppParser_vs160.vcxproj index 49aa7b2ad2..2be5a403d9 100644 --- a/CppParser/CppParser_vs160.vcxproj +++ b/CppParser/CppParser_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoCppParserd PocoCppParsermdd PocoCppParsermtd @@ -241,6 +241,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -276,6 +277,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -309,6 +311,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -337,6 +340,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -362,6 +366,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -390,6 +395,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +421,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +457,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -483,6 +491,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -511,6 +520,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -536,6 +546,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -564,6 +575,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppParser/CppParser_vs160.vcxproj.filters b/CppParser/CppParser_vs160.vcxproj.filters index 095f79d79a..fbf012188a 100644 --- a/CppParser/CppParser_vs160.vcxproj.filters +++ b/CppParser/CppParser_vs160.vcxproj.filters @@ -2,31 +2,31 @@ - {78ecda8b-38b1-4bed-932f-02ebe18f2b52} + {3f6c284e-682e-4160-b268-c5e241a22f53} - {b38335e1-d932-4eec-ba2a-4a50fb8eef30} + {4a314797-3b7a-4be6-a2d2-d6affc8f8ba4} - {2415ef0b-be5f-4f5e-a150-f6e13a8d2a02} + {f173d6f4-7788-4167-9d72-12304345efe9} - {0d1aa205-1f5e-48d3-8f67-71125f193a0c} + {5ad87ecc-a1e5-4089-b431-dba34da5ddd0} - {406ad7af-4bef-4dbb-acc7-9abc8d0977cc} + {b8da7b3a-2d02-4d3c-8999-043e3e9ec721} - {41388393-2d90-46aa-90de-24d4186cc3af} + {83dbfcbd-3d03-41d9-bc4b-fb5702eb9409} - {8afc7c3a-be7c-460c-9d74-8af0fab90754} + {d2f1ddcc-5e75-412d-b53c-8d2206a696ca} - {36ac1f5a-6d4c-46e6-be3e-16cadb0a20dc} + {a95afa6a-d706-456f-96b3-204bdc2b865b} - {e31474cf-8e07-4bbe-8bb1-d3a4a6156cfe} + {4577fd4b-16d1-46f6-9e0c-2602534ff286} diff --git a/CppParser/CppParser_vs170.vcxproj b/CppParser/CppParser_vs170.vcxproj index 398da6b049..1884a725b5 100644 --- a/CppParser/CppParser_vs170.vcxproj +++ b/CppParser/CppParser_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoCppParserA64d PocoCppParsermdd PocoCppParsermtd @@ -345,6 +345,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -380,6 +381,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -413,6 +415,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -441,6 +444,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -466,6 +470,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -494,6 +499,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -519,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -554,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -587,6 +595,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -615,6 +624,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -640,6 +650,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -668,6 +679,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -693,6 +705,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -728,6 +741,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -761,6 +775,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -789,6 +804,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -814,6 +830,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -842,6 +859,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppParser/CppParser_vs170.vcxproj.filters b/CppParser/CppParser_vs170.vcxproj.filters index dad5daabb2..e31aafd6cf 100644 --- a/CppParser/CppParser_vs170.vcxproj.filters +++ b/CppParser/CppParser_vs170.vcxproj.filters @@ -2,31 +2,31 @@ - {04fc4f1d-2274-4331-b73a-983236125a2f} + {6ca16aa0-955f-41fa-a40d-bff5722bb2ce} - {48da727d-3925-4adb-8128-8e371873b418} + {0086c8e1-9cce-4089-89e1-bad5f30af052} - {5f42528e-6e34-4c9d-98f4-c561a87e3b98} + {533a0e3e-4254-4c2e-bac6-07a4549d17c9} - {72e542a3-5ed5-4549-a8f0-84b07832a5d8} + {6ebbc55b-7730-4080-9e88-55d0e1176230} - {5a1e3cc6-6a35-4b0f-b6d1-987a4516b114} + {8b5aa02a-f826-414c-a9d8-9a5bef65eb2a} - {abed0e17-015a-49f0-acdf-9c68f3a5f7ea} + {15eb3a06-013d-4271-a6c6-cdcc90347110} - {206c3f3b-04d2-4444-ab00-5a291ae2500d} + {22ecd62e-5ad5-44b2-9a8b-d067ea643bd4} - {703de990-b5f5-404b-beaa-82c6f1cf3b03} + {1a9dc9e6-f23b-4d3a-b1be-f67762da02aa} - {a3ca1499-f56c-41b3-bb6d-962492907f62} + {96bb7189-8670-400f-a37d-a770f1b322cd} diff --git a/CppParser/include/Poco/CppParser/CppToken.h b/CppParser/include/Poco/CppParser/CppToken.h index 5338d4c8c5..0d592d6a80 100644 --- a/CppParser/include/Poco/CppParser/CppToken.h +++ b/CppParser/include/Poco/CppParser/CppToken.h @@ -60,6 +60,7 @@ class CppParser_API OperatorToken: public CppToken OP_GE, // >= OP_SHR, // >> OP_SHR_ASSIGN, // >>= + OP_SPACESHIP, // <=> OP_ASSIGN, // = OP_EQ, // == OP_NOT, // ! diff --git a/CppParser/include/Poco/CppParser/Symbol.h b/CppParser/include/Poco/CppParser/Symbol.h index 035eef6479..8e9c77f9cb 100644 --- a/CppParser/include/Poco/CppParser/Symbol.h +++ b/CppParser/include/Poco/CppParser/Symbol.h @@ -125,6 +125,14 @@ class CppParser_API Symbol const std::string& getLibrary() const; /// Returns the symbol's library. + void setOrder(std::size_t order); + /// Sets the order of the symbol within its container. + /// + /// Currently only used for struct/class members. + + std::size_t getOrder() const; + /// Returns the order of the symbol within its container. + const Attributes& attrs() const; /// Returns the symbol's attributes. @@ -175,6 +183,7 @@ class CppParser_API Symbol int _line; std::string _package; std::string _library; + std::size_t _order; Attributes _attrs; std::string _attributeList; @@ -245,6 +254,12 @@ inline const std::string& Symbol::getLibrary() const } +inline std::size_t Symbol::getOrder() const +{ + return _order; +} + + inline const Attributes& Symbol::attrs() const { return _attrs; diff --git a/CppParser/src/CppToken.cpp b/CppParser/src/CppToken.cpp index 7bb6c7b897..342da95e41 100644 --- a/CppParser/src/CppToken.cpp +++ b/CppParser/src/CppToken.cpp @@ -66,6 +66,7 @@ OperatorToken::OperatorToken() _opMap[">="] = i++; _opMap[">>"] = i++; _opMap[">>="] = i++; + _opMap["<=>"] = i++; _opMap["="] = i++; _opMap["=="] = i++; _opMap["!"] = i++; @@ -194,8 +195,14 @@ void OperatorToken::finish(std::istream& istr) { _value += (char) istr.get(); next = (char) istr.peek(); + if (next == '=') _value += (char) istr.get(); + } + else if (next == '=') + { + _value += (char) istr.get(); + next = (char) istr.peek(); + if (next == '>') _value += (char) istr.get(); } - if (next == '=') _value += (char) istr.get(); break; case '>': if (next == '>') diff --git a/CppParser/src/NameSpace.cpp b/CppParser/src/NameSpace.cpp index 65f62eb4b1..08862a066b 100644 --- a/CppParser/src/NameSpace.cpp +++ b/CppParser/src/NameSpace.cpp @@ -49,7 +49,8 @@ NameSpace::~NameSpace() void NameSpace::addSymbol(Symbol* pSymbol) { poco_check_ptr (pSymbol); - + + pSymbol->setOrder(_symbols.size()); _symbols.insert(SymbolTable::value_type(pSymbol->name(), pSymbol)); } @@ -65,7 +66,7 @@ void NameSpace::importSymbol(const std::string& fullName) } } - + void NameSpace::importNameSpace(const std::string& nameSpace) { _importedNameSpaces.push_back(nameSpace); @@ -94,7 +95,7 @@ Symbol* NameSpace::lookup(const std::string& name) const Symbol* NameSpace::lookup(const std::string& name, std::set& alreadyVisited) const { Symbol* pSymbol = 0; - + if (name.empty()) return pSymbol; @@ -104,11 +105,11 @@ Symbol* NameSpace::lookup(const std::string& name, std::set& a std::string head; std::string tail; splitName(name, head, tail); - + alreadyVisited.insert(this); bool currentNSInserted = true; - if (head.empty()) + if (head.empty()) { alreadyVisited.insert(this); return root()->lookup(tail, alreadyVisited); @@ -161,13 +162,13 @@ void NameSpace::nameSpaces(SymbolTable& table) const extract(Symbol::SYM_NAMESPACE, table); } - + void NameSpace::typeDefs(SymbolTable& table) const { extract(Symbol::SYM_TYPEDEF, table); } - + void NameSpace::typeAliases(SymbolTable& table) const { extract(Symbol::SYM_TYPEALIAS, table); @@ -179,19 +180,19 @@ void NameSpace::enums(SymbolTable& table) const extract(Symbol::SYM_ENUM, table); } - + void NameSpace::classes(SymbolTable& table) const { extract(Symbol::SYM_STRUCT, table); } - + void NameSpace::functions(SymbolTable& table) const { extract(Symbol::SYM_FUNCTION, table); } - + void NameSpace::variables(SymbolTable& table) const { extract(Symbol::SYM_VARIABLE, table); @@ -226,7 +227,7 @@ void NameSpace::splitName(const std::string& name, std::string& head, std::strin head.assign(name, 0, pos); pos += 2; poco_assert (pos < name.length()); - tail.assign(name, pos, name.length() - pos); + tail.assign(name, pos, name.length() - pos); } else head = name; } diff --git a/CppParser/src/Symbol.cpp b/CppParser/src/Symbol.cpp index 50c436b14a..d6280e260b 100644 --- a/CppParser/src/Symbol.cpp +++ b/CppParser/src/Symbol.cpp @@ -31,7 +31,8 @@ Symbol::Symbol(): _id(_nextId++), _pNameSpace(0), _access(ACC_PUBLIC), - _line(-1) + _line(-1), + _order(0) { } @@ -41,7 +42,8 @@ Symbol::Symbol(const std::string& name, NameSpace* pNameSpace): _name(name), _pNameSpace(pNameSpace), _access(ACC_PUBLIC), - _line(-1) + _line(-1), + _order(0) { if (_pNameSpace) _pNameSpace->addSymbol(this); @@ -103,6 +105,12 @@ void Symbol::setLibrary(const std::string& library) } +void Symbol::setOrder(std::size_t order) +{ + _order = order; +} + + std::string Symbol::fullName() const { std::string fullName; diff --git a/CppParser/testsuite/TestSuite.progen b/CppParser/testsuite/TestSuite.progen index 67d728c5d3..b98b54a01c 100644 --- a/CppParser/testsuite/TestSuite.progen +++ b/CppParser/testsuite/TestSuite.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/CppParser/testsuite/TestSuite_vs160.vcxproj b/CppParser/testsuite/TestSuite_vs160.vcxproj index d03e101380..bbd7132397 100644 --- a/CppParser/testsuite/TestSuite_vs160.vcxproj +++ b/CppParser/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppParser/testsuite/TestSuite_vs160.vcxproj.filters b/CppParser/testsuite/TestSuite_vs160.vcxproj.filters index 17cb47b9fb..d58929477b 100644 --- a/CppParser/testsuite/TestSuite_vs160.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,37 +2,37 @@ - {b7eb186c-6d98-44ea-88d9-7ba64f2c2cbd} + {36d34a5b-6861-4e21-8e8c-b08b37812b3f} - {cac83a53-c5c1-49a5-ab07-1f5d017b8373} + {765c39e3-b3bd-49fd-acca-3b2bfabb605e} - {327f4385-9f15-4f53-9dc8-de2f33c439ba} + {04776c66-6a29-4525-862d-7b05b04fb2d3} - {2d41c3cf-92ca-492a-a07c-dc9cbd0b4d3a} + {8468adcc-1bed-469b-a540-329cf187ba4f} - {dd772fd7-0956-4f15-ac7c-e8fe40f3795e} + {dde4541a-d7d6-4f21-ab7c-e1a70971fbbd} - {bd3f5103-bafb-46cb-a7be-f7c309546832} + {9d27c2de-2f50-4695-b87e-2779d306031f} - {59eb86f0-e471-45e2-87da-5da5830e3876} + {093eb397-89b0-498a-9314-e736d9ee9987} - {118b9dc2-cd9e-4a7a-9ffd-087058609b65} + {ae6105de-05f6-4c61-9f69-db79f8286d4e} - {20a55dfe-ea8e-4f16-8768-3805893a4f02} + {c156feaf-000a-41fb-b1c8-13f5bda1cd87} - {e01c68ae-0ee9-497d-9bc3-5b6ca974a267} + {ca3d8960-58dc-4cc7-8fe4-47283cb2543f} - {c733f92c-ef7d-4467-8011-a7001a719bec} + {e893df61-86c4-425d-ba85-6cafffe34963} diff --git a/CppParser/testsuite/TestSuite_vs170.vcxproj b/CppParser/testsuite/TestSuite_vs170.vcxproj index 8ddceef309..35387d71cc 100644 --- a/CppParser/testsuite/TestSuite_vs170.vcxproj +++ b/CppParser/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -898,18 +970,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/CppParser/testsuite/TestSuite_vs170.vcxproj.filters b/CppParser/testsuite/TestSuite_vs170.vcxproj.filters index f1ab44ce51..fec39e7308 100644 --- a/CppParser/testsuite/TestSuite_vs170.vcxproj.filters +++ b/CppParser/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,37 +2,37 @@ - {32b5b8b3-f611-46b3-897a-4550a2515f92} + {e2591d17-d2e7-4a9b-bae1-c2003ef870fc} - {58743500-0848-494f-a502-b68f27b3256c} + {2d233585-c0b3-4cac-9e97-f35f3ec824e6} - {a1f073e1-dc90-4eab-945f-182686ed6128} + {7c49a868-5f4f-4883-95ab-836de448c09e} - {bfc413dd-7df1-44ab-b7b3-b41c2cbaecca} + {a77776c1-e2ba-4fe5-8d3d-605b0437a2ef} - {bc042bae-b97a-4782-8493-849b8e686ade} + {ab184a02-309b-483a-b78c-f1847f913542} - {50afe903-da52-4eba-b6d3-e9e9616dad86} + {1e9f0827-4344-498a-b393-d7c2e67a9e04} - {0240b864-f514-4091-acda-d84086cac637} + {18cd2fd9-f4ba-40ca-b230-5438a31f8154} - {061dd92e-31b4-44ff-907e-4a7d7bdb6ab3} + {7d9f1882-c3ff-46bd-97c2-fc9f9c5f1389} - {c4f20879-a8ef-4a7f-adc3-987a0924f24e} + {9c7e8070-1756-4658-9341-7e67aec24b3c} - {c1031026-be95-4244-9610-21ee3abcd573} + {39372d27-1a12-4ad7-9ee7-ca0a0827e792} - {2c59e42b-60d9-4375-9501-4f8a179dbebc} + {692bde1d-9cbc-412e-a18e-51dd80077264} diff --git a/CppParser/testsuite/src/CppParserTest.cpp b/CppParser/testsuite/src/CppParserTest.cpp index c63f4c60a8..220d10caef 100644 --- a/CppParser/testsuite/src/CppParserTest.cpp +++ b/CppParser/testsuite/src/CppParserTest.cpp @@ -33,7 +33,7 @@ std::string options("/I \"C:\\Program Files\\Microsoft Visual Studio 8\\VC\\INCL "/D \"_WINDOWS\", " "/D \"_MBCS\", " "/C, /P, /TP"); -std::string path("C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools\\bin"); +std::string path("C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\IDE;C:\\Program Files\\Microsoft Visual Studio 8\\VC\\BIN;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools;;C:\\Program Files\\Microsoft Visual Studio 8\\Common7\\Tools\\bin"); CppParserTest::CppParserTest(const std::string& name): CppUnit::TestCase(name) @@ -77,7 +77,7 @@ void CppParserTest::testExtractName() decl = "void func(int arg1, int arg2)"; name = Symbol::extractName(decl); assertTrue (name == "func"); - + decl = "std::function func"; name = Symbol::extractName(decl); assertTrue (name == "func"); diff --git a/CppUnit/CppUnit.progen b/CppUnit/CppUnit.progen index fe4a5976c3..33490e4459 100644 --- a/CppUnit/CppUnit.progen +++ b/CppUnit/CppUnit.progen @@ -12,5 +12,6 @@ vc.project.compiler.defines = POCO_NO_AUTOMATIC_LIBS 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = diff --git a/CppUnit/CppUnit_vs160.vcxproj b/CppUnit/CppUnit_vs160.vcxproj index e64bd703bf..9c4b22cff6 100644 --- a/CppUnit/CppUnit_vs160.vcxproj +++ b/CppUnit/CppUnit_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 CppUnitd CppUnitmdd CppUnitmtd @@ -241,6 +241,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -276,6 +277,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -309,6 +311,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -337,6 +340,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -362,6 +366,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -390,6 +395,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +421,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +457,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -483,6 +491,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -511,6 +520,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -536,6 +546,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -564,6 +575,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppUnit/CppUnit_vs160.vcxproj.filters b/CppUnit/CppUnit_vs160.vcxproj.filters index c8054ab99e..60896f5b51 100644 --- a/CppUnit/CppUnit_vs160.vcxproj.filters +++ b/CppUnit/CppUnit_vs160.vcxproj.filters @@ -2,11 +2,11 @@ - {f9027807-6f7f-40c0-a1cd-9416954a6f21} + {ca70f98e-1a36-46ac-8544-d3386b2f4a90} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {600d9ce8-b49c-402b-b4d8-f975f907ebcf} + {77424702-3d25-45eb-b9d0-df780b9c03d5} *.h diff --git a/CppUnit/CppUnit_vs170.vcxproj b/CppUnit/CppUnit_vs170.vcxproj index ac2aa93ebc..5ed86c62ac 100644 --- a/CppUnit/CppUnit_vs170.vcxproj +++ b/CppUnit/CppUnit_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 CppUnitA64d CppUnitmdd CppUnitmtd @@ -345,6 +345,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -380,6 +381,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -413,6 +415,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -441,6 +444,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -466,6 +470,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -494,6 +499,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -519,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -554,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -587,6 +595,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -615,6 +624,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -640,6 +650,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -668,6 +679,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -693,6 +705,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -728,6 +741,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -761,6 +775,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -789,6 +804,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -814,6 +830,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -842,6 +859,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/CppUnit/CppUnit_vs170.vcxproj.filters b/CppUnit/CppUnit_vs170.vcxproj.filters index f8d4549ecf..7facd0f1cb 100644 --- a/CppUnit/CppUnit_vs170.vcxproj.filters +++ b/CppUnit/CppUnit_vs170.vcxproj.filters @@ -2,11 +2,11 @@ - {7b3be91a-acf5-44e5-a39b-e503d6ed15c1} + {76648889-30d9-4b57-9288-0c2f9b1d08c1} cpp;c;cxx;rc;def;r;odl;idl;hpj;bat - {d207b5fb-1df4-4147-a39c-38e5ca4cf7d1} + {585eccaa-a8a3-4670-b8a0-eb9d3d2b23b2} *.h diff --git a/Crypto/CMakeLists.txt b/Crypto/CMakeLists.txt index 5a69cf83e0..d804f45c25 100644 --- a/Crypto/CMakeLists.txt +++ b/Crypto/CMakeLists.txt @@ -30,8 +30,7 @@ target_include_directories(Crypto ${CMAKE_CURRENT_SOURCE_DIR}/src ) -if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL) - target_compile_definitions(Crypto PUBLIC POCO_EXTERNAL_OPENSSL) +if(MSVC) if(OPENSSL_USE_STATIC_LIBS) target_link_libraries(Crypto PUBLIC ws2_32.lib Crypt32.lib) endif() diff --git a/Crypto/Crypto.progen b/Crypto/Crypto.progen index f3492c130f..55b4ae4a18 100644 --- a/Crypto/Crypto.progen +++ b/Crypto/Crypto.progen @@ -5,6 +5,7 @@ vc.project.type = library vc.project.pocobase = .. vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 +vc.project.vcpkg = true 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.pocobase}\\Foundation\\include @@ -12,6 +13,7 @@ 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/Crypto/Crypto_vs160.vcxproj b/Crypto/Crypto_vs160.vcxproj index df5276d6af..74bac19212 100644 --- a/Crypto/Crypto_vs160.vcxproj +++ b/Crypto/Crypto_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoCryptod PocoCryptomdd PocoCryptomtd @@ -224,6 +224,57 @@ ..\lib64\ obj64\Crypto\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled @@ -241,6 +292,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -277,6 +329,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -311,6 +364,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -339,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -364,6 +419,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -392,6 +448,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +475,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -454,6 +512,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -488,6 +547,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -516,6 +576,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -541,6 +602,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -569,6 +631,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Crypto/Crypto_vs160.vcxproj.filters b/Crypto/Crypto_vs160.vcxproj.filters index 66b23d62e6..77b56fa8fc 100644 --- a/Crypto/Crypto_vs160.vcxproj.filters +++ b/Crypto/Crypto_vs160.vcxproj.filters @@ -2,58 +2,58 @@ - {1b341421-b0a6-41ba-b9e7-23a78d22e64e} + {7ec7d017-2087-4cab-ab62-d02541d2d5f4} - {3410e096-721e-4bbb-95a9-c3399e4bc916} + {58b81a77-7cad-4804-9eaa-40ec31d03ebf} - {fe6936eb-e9ca-4766-aaa4-844dc49f49f9} + {2534c66f-04ee-4cd7-acbf-bd3a98ef819a} - {0c0e5ba2-303f-47bd-8050-60d8624ad54b} + {9b063aba-0929-45c6-baa5-d442074d5cb0} - {deac82b6-db04-432c-9529-e509ba29ce3c} + {54f88eb3-1cde-481d-84e0-81e4a1d67e4b} - {73b6588c-1b71-4876-8688-3fef4d5d50f5} + {8368bfcd-cc44-4847-a44a-957c407b774d} - {a176bed7-cbc3-43b5-9bad-5d141f68bcad} + {402c4aaf-1ba8-43ad-b4e9-4a23413bcbd7} - {a3119f32-061e-49cb-8add-e43f347dca70} + {1f5db190-12b1-4b27-8dc1-e3bf85ffe6c0} - {c2343031-10e4-42c1-9588-5f9a5465fcff} + {9013ce1e-bd7d-4f90-aacb-6687204f85ea} - {f60a6df2-2e50-4bd6-aa93-a10781df4a63} + {bfb5e21c-dec9-4188-8c63-9eabb34fe2ec} - {bd3c3a14-025d-473f-ab7d-caa706137c9c} + {72b0e738-c9af-42ed-85ae-b2a1dbb9e836} - {16e91055-e1a0-43ec-b101-278c3cc10e01} + {6c480334-2096-408b-aa98-8f33a8591f75} - {0c9aa960-60a9-4878-8944-397b68d63fbd} + {014b9b52-fef6-4032-b3a8-6320e6491a46} - {3001a9e0-0691-4be4-acac-14c6e7e44c60} + {09c1c0ba-51f0-43e7-885d-6bd47548aaea} - {de5ddc8e-00be-40a3-823f-f1a0392c609c} + {b6a0e3b6-7970-4e72-a30a-ca28be2cf38a} - {b0fec04d-de08-48ec-ac41-87a5ddebfb09} + {bf344795-f073-4b3a-a07f-eb3a951d422f} - {d204272f-6c1d-4190-81e1-bc53453ef186} + {fa9df45d-39b0-4fe9-9a8c-fde4f7dfc6df} - {169dabef-3127-4621-a773-c1cf094f877c} + {49602098-3c29-47ec-821b-9c2d54b14127} diff --git a/Crypto/Crypto_vs170.vcxproj b/Crypto/Crypto_vs170.vcxproj index e84fc60594..2d85884a78 100644 --- a/Crypto/Crypto_vs170.vcxproj +++ b/Crypto/Crypto_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoCryptoA64d PocoCryptomdd PocoCryptomtd @@ -328,6 +328,81 @@ ..\lib64\ obj64\Crypto\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled @@ -345,6 +420,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -381,6 +457,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +492,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -443,6 +521,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -468,6 +547,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -496,6 +576,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -521,6 +602,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -557,6 +639,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -591,6 +674,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +703,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -644,6 +729,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -672,6 +758,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -698,6 +785,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -734,6 +822,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -768,6 +857,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -796,6 +886,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -821,6 +912,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -849,6 +941,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Crypto/Crypto_vs170.vcxproj.filters b/Crypto/Crypto_vs170.vcxproj.filters index f19c718f4a..8bb91b36fe 100644 --- a/Crypto/Crypto_vs170.vcxproj.filters +++ b/Crypto/Crypto_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {3aae1caa-ecff-4053-a81d-977e521e5c87} + {a0dc8b7b-38f7-4623-9019-f7130a3a6ce0} - {7510a388-fc23-42a7-a7c2-2a3d242c4211} + {bfe6fcc0-522b-4d94-b949-9cc5bfea9d0b} - {50900110-d23e-4374-90fd-36e48e4dad99} + {2a652e17-94a2-485e-91ec-4e5a17dfbf01} - {9c32ff7b-5d5d-46a5-922a-5f128ea342dd} + {7db6eb1b-90fb-47b6-8a43-e37adb9cf2a9} - {4fa8cb3b-5503-4f61-acb1-57a11d94e1c5} + {6a869444-f769-4341-996d-7de660cb8d03} - {a71b5463-8361-4c0e-bd16-fbfbd4921d2b} + {76076160-7da5-4393-9e4b-2e311882fbf6} - {6bf61ee7-c315-4e69-a6ab-bfe72f4c1c4c} + {22541380-d031-4be3-b860-cf417cd84c21} - {0b2114f5-7795-4ede-b999-bf08d948e997} + {2e05a054-5e2f-4d7b-8118-e09a3c0bf6eb} - {20af4346-6482-44f6-b813-ac75a0ed1820} + {de7a7106-6adc-4538-98dd-0fd5dd69236c} - {2f05d665-ed8c-4bda-b51e-a4c53c266f4e} + {c672a00f-586d-4fd4-83c9-bb505d7f387a} - {d0dac58b-8d74-47b3-80bc-f53c4f42648d} + {7fd42147-9e58-400f-a041-8461fcb33313} - {09b4b347-f640-43f1-a5d8-a6b994207d6f} + {5a64e6d4-4c9f-4b44-a0ec-723351d0ba4b} - {50c81c4e-471d-4104-a199-1b31e2f32df2} + {43b61065-24ef-435a-bfdf-342c427be87e} - {317f8dd4-bb89-4cf3-8128-3ff84add12e2} + {043257e5-1335-4361-acf2-126c9ba8052b} - {f2c312ee-ce71-4529-b3d8-a180bfa87baa} + {cc94dfbc-0754-468b-888e-5bdeab07db14} - {d67ab044-b6f3-4600-a233-0f78eb68f451} + {11974999-de8e-4c00-9ab0-1d5506e3723f} - {149a748e-cdab-4694-ae93-cc8d0f7b6cf0} + {369c5ad3-a15d-419f-a207-132a35532fb2} - {27a7c180-9724-416f-a98f-c7ba2fc44b38} + {9fec950f-f8af-485e-9387-3f854719c3aa} diff --git a/Crypto/include/Poco/Crypto/Crypto.h b/Crypto/include/Poco/Crypto/Crypto.h index 7b857cf31b..7b842c85e9 100644 --- a/Crypto/include/Poco/Crypto/Crypto.h +++ b/Crypto/include/Poco/Crypto/Crypto.h @@ -20,10 +20,6 @@ #define Crypto_Crypto_INCLUDED -#define POCO_EXTERNAL_OPENSSL_DEFAULT 1 -#define POCO_EXTERNAL_OPENSSL_SLPRO 2 - - // // Temporarily suppress deprecation warnings coming // from OpenSSL 3.0, until we have updated our code. @@ -104,70 +100,6 @@ enum RSAPaddingMode // #if defined(_MSC_VER) #if !defined(POCO_NO_AUTOMATIC_LIBS) - #if defined(POCO_INTERNAL_OPENSSL_MSVC_VER) - #if defined(POCO_EXTERNAL_OPENSSL) - #pragma message("External OpenSSL defined but internal headers used - possible mismatch!") - #endif // POCO_EXTERNAL_OPENSSL - #if !defined(_DEBUG) - #define POCO_DEBUG_SUFFIX "" - #if !defined (_DLL) - #define POCO_STATIC_SUFFIX "mt" - #else // _DLL - #define POCO_STATIC_SUFFIX "" - #endif - #else // _DEBUG - #define POCO_DEBUG_SUFFIX "d" - #if !defined (_DLL) - #define POCO_STATIC_SUFFIX "mt" - #else // _DLL - #define POCO_STATIC_SUFFIX "" - #endif - #endif - #pragma comment(lib, "libcrypto" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib") - #pragma comment(lib, "libssl" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib") - #if !defined(_WIN64) && !defined (_DLL) && \ - (POCO_INTERNAL_OPENSSL_MSVC_VER == 120) && \ - (POCO_MSVC_VERSION < POCO_INTERNAL_OPENSSL_MSVC_VER) - #pragma comment(lib, "libPreVS2013CRT" POCO_STATIC_SUFFIX POCO_DEBUG_SUFFIX ".lib") - #endif - #if !defined (_DLL) && (POCO_MSVS_VERSION >= 2015) - #pragma comment(lib, "legacy_stdio_definitions.lib") - #pragma comment(lib, "legacy_stdio_wide_specifiers.lib") - #endif - #elif defined(POCO_EXTERNAL_OPENSSL) - #if POCO_EXTERNAL_OPENSSL == POCO_EXTERNAL_OPENSSL_SLPRO - #if defined(POCO_DLL) - #if OPENSSL_VERSION_PREREQ(1,1) - #pragma comment(lib, "libcrypto.lib") - #pragma comment(lib, "libssl.lib") - #else - #pragma comment(lib, "libeay32.lib") - #pragma comment(lib, "ssleay32.lib") - #endif - #else - #if OPENSSL_VERSION_PREREQ(1,1) - #if defined(_WIN64) - #pragma comment(lib, "libcrypto64" POCO_LIB_SUFFIX) - #pragma comment(lib, "libssl64" POCO_LIB_SUFFIX) - #else - #pragma comment(lib, "libcrypto32" POCO_LIB_SUFFIX) - #pragma comment(lib, "libssl32" POCO_LIB_SUFFIX) - #endif - #else - #pragma comment(lib, "libeay32" POCO_LIB_SUFFIX) - #pragma comment(lib, "ssleay32" POCO_LIB_SUFFIX) - #endif - #endif - #elif POCO_EXTERNAL_OPENSSL == POCO_EXTERNAL_OPENSSL_DEFAULT - #if OPENSSL_VERSION_PREREQ(1,1) - #pragma comment(lib, "libcrypto.lib") - #pragma comment(lib, "libssl.lib") - #else - #pragma comment(lib, "libeay32.lib") - #pragma comment(lib, "ssleay32.lib") - #endif - #endif - #endif // POCO_INTERNAL_OPENSSL_MSVC_VER #if !defined(Crypto_EXPORTS) #pragma comment(lib, "PocoCrypto" POCO_LIB_SUFFIX) #endif diff --git a/Crypto/samples/genrsakey/genrsakey.progen b/Crypto/samples/genrsakey/genrsakey.progen index 6b42329a81..c24c6e0fee 100644 --- a/Crypto/samples/genrsakey/genrsakey.progen +++ b/Crypto/samples/genrsakey/genrsakey.progen @@ -4,9 +4,11 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Crypto\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib vc.project.linker.dependencies.debug_shared = vc.project.linker.dependencies.release_shared = diff --git a/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj index 228a38fa06..fa9ebe6100 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj +++ b/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 genrsakeyd genrsakeyd genrsakeyd @@ -232,6 +232,57 @@ obj64\genrsakey\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled @@ -249,6 +300,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +336,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +369,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +405,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +438,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +474,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +507,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +543,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +576,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +612,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +645,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +681,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters index 59fff50643..ddbe11607d 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters +++ b/Crypto/samples/genrsakey/genrsakey_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {57c66ce0-14be-41b6-9ac1-70ff5c861a0d} + {5ae73534-307f-4492-a162-920a9617c477} - {957962bc-87ba-4593-8c97-67ce38990384} + {97a2a690-e9ea-4f80-8b81-7adda93e17f6} diff --git a/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj b/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj index 41e3f2682f..9dc86a05dc 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj +++ b/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 genrsakey {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947} genrsakey @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + genrsakeyd + genrsakeyd + genrsakeyd + genrsakey + genrsakey + genrsakey genrsakeyd genrsakeyd genrsakeyd @@ -171,6 +250,36 @@ genrsakey genrsakey + + binA64\ + objA64\genrsakey\$(Configuration)\ + true + + + binA64\ + objA64\genrsakey\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\genrsakey\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\genrsakey\$(Configuration)\ + false + + + binA64\static_md\ + objA64\genrsakey\$(Configuration)\ + true + + + binA64\static_md\ + objA64\genrsakey\$(Configuration)\ + false + bin\ obj\genrsakey\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\genrsakey\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\genrsakey.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\genrsakeyd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\genrsakey.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\genrsakeyd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\genrsakeyd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +1039,8 @@ true + stdcpp17 + stdc11 diff --git a/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj.filters b/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj.filters index 3998bf9be3..1e7fd4392f 100644 --- a/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj.filters +++ b/Crypto/samples/genrsakey/genrsakey_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {23a8923d-3376-47f4-9a6f-19a3a66382c3} + {10ae105d-3d7f-4d58-9a46-72360fb5b29c} - {8fc78ac1-efab-4a1b-8e59-1b68d96f306a} + {2bc0c892-9e31-4d2a-842b-c1d093ab9a78} diff --git a/Crypto/samples/samples_vs170.sln b/Crypto/samples/samples_vs170.sln index a28401cf81..f569191f64 100644 --- a/Crypto/samples/samples_vs170.sln +++ b/Crypto/samples/samples_vs170.sln @@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "genrsakey", "genrsakey\genr EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -18,6 +24,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Build.0 = debug_shared|Win32 {D6BE1AD9-4CB6-3184-8DF8-5210AE7D6947}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Crypto/testsuite/TestSuite.progen b/Crypto/testsuite/TestSuite.progen index 242a68ec1c..6a5470dc06 100644 --- a/Crypto/testsuite/TestSuite.progen +++ b/Crypto/testsuite/TestSuite.progen @@ -4,14 +4,18 @@ vc.project.target = TestSuite vc.project.type = testsuite vc.project.pocobase = ..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ${vc.project.pocobase}\\Foundation\\include vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS +vc.project.compiler.defines.release_shared = OPENSSL_REQUIRE_APPLINK +vc.project.compiler.defines.debug_shared = OPENSSL_REQUIRE_APPLINK +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.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_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/Crypto/testsuite/TestSuite_vs160.vcxproj b/Crypto/testsuite/TestSuite_vs160.vcxproj index 11d9919878..7645c1b543 100644 --- a/Crypto/testsuite/TestSuite_vs160.vcxproj +++ b/Crypto/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -232,11 +232,62 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -249,6 +300,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -272,7 +324,7 @@ Speed true ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -284,6 +336,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +369,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +405,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,12 +438,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true @@ -418,12 +474,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -437,7 +494,7 @@ Disabled ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -450,6 +507,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -473,7 +531,7 @@ Speed true ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -485,6 +543,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +576,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +612,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,12 +645,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true @@ -619,12 +681,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Crypto/testsuite/TestSuite_vs160.vcxproj.filters b/Crypto/testsuite/TestSuite_vs160.vcxproj.filters index f8d2293056..c63bc91283 100644 --- a/Crypto/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {1c8c4bc2-2664-41f8-a5ce-337f1754dd6d} + {50148edb-93ca-4843-b4b9-236cd70aac12} - {507a694a-3f97-4615-b518-71a96c0f8af1} + {0a6f987c-fd08-48b4-89b9-5957ee1f9b7a} - {0805e26c-6eac-4d28-9535-56b09fffdac3} + {8da1505c-8515-464f-8cd5-e5258e377fc2} - {96c9803e-6512-48db-a9f6-2fc1d2b344de} + {0e9596c1-78c9-4457-a8a0-32393f4c404d} - {a884018a-76b4-44f4-a199-87c08d34040f} + {df3c17f6-ee1a-4f31-8b59-07769ac8278e} - {20122988-a0fc-42a9-89e7-5c9b0783a76f} + {22e74620-73dc-41aa-8f0d-5e63965e3d1a} - {e50bf5e7-1e0f-49cd-896c-32a553a84d75} + {61e8b45b-e3d7-4c7f-8d9a-2d0f332bb385} - {aa64f38d-2dfb-48b3-8495-904c8ace997d} + {0636633f-9515-4a00-b734-84bd8b5f7145} diff --git a/Crypto/testsuite/TestSuite_vs170.vcxproj b/Crypto/testsuite/TestSuite_vs170.vcxproj index 0cb17b77c2..43ffeb6423 100644 --- a/Crypto/testsuite/TestSuite_vs170.vcxproj +++ b/Crypto/testsuite/TestSuite_vs170.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -75,6 +75,7 @@ + 17.0 TestSuite {C1B1BB96-5198-48EB-AB48-9A0A0B54FB15} TestSuite @@ -229,7 +230,7 @@ - <_ProjectFileVersion>16.0.32629.160 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -339,11 +340,86 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -355,15 +431,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -376,7 +456,7 @@ Speed true ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -387,11 +467,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -416,15 +500,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -448,11 +536,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -477,15 +569,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -509,11 +605,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -526,7 +626,7 @@ Disabled ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -538,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -546,7 +650,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -559,7 +663,7 @@ Speed true ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -570,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -599,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -607,7 +719,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -631,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -660,15 +776,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -692,10 +812,14 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\lib;%(AdditionalLibraryDirectories) false @@ -709,7 +833,7 @@ Disabled ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -721,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -729,7 +857,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -742,7 +870,7 @@ Speed true ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;OPENSSL_REQUIRE_APPLINK;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -753,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -782,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -790,7 +926,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -814,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) @@ -843,15 +983,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -875,10 +1019,14 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\lib64;%(AdditionalLibraryDirectories) false @@ -901,30 +1049,48 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Crypto/testsuite/TestSuite_vs170.vcxproj.filters b/Crypto/testsuite/TestSuite_vs170.vcxproj.filters index ffa5b9bc9d..dde3f0e4d3 100644 --- a/Crypto/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {acf5407e-78f8-481f-aede-24ca7504422d} + {fc682fad-9c82-4f6e-9a39-f41debc58c6c} - {ed75d974-1e6e-4d97-83fb-7111122dba8b} + {f67ff7e9-ef0d-4880-8acc-a366e90acaf8} - {0271bc10-a0c8-408a-8b2b-64e557c63f32} + {a6aab612-49f8-4f3e-bc60-9835b1ce1577} - {30319608-5ad4-43c1-af6e-84729e9e9aa6} + {4c3b6d06-0b59-4e36-871b-4aefd739f7b8} - {aa5fc0e5-cee3-4f44-8a6a-7f64fbbda341} + {3a4e2391-cffc-4fcf-9104-02756baf645f} - {d2e3ae91-4bc3-4259-ab5d-9bc19d47d37c} + {17cfbc11-5720-422d-88eb-6da3499d0e61} - {9e497b70-abc5-4962-8853-36eb7d61b4ba} + {d6d053ef-8aa5-4cc0-8f86-9a6d656db719} - {d16fc517-f3ee-4181-acac-c11efb90d9e8} + {45590105-2b7f-49c4-8b3b-85d9706749d1} diff --git a/Crypto/testsuite/src/CryptoTestSuite.cpp b/Crypto/testsuite/src/CryptoTestSuite.cpp index 0e3a166362..3435b3ed55 100644 --- a/Crypto/testsuite/src/CryptoTestSuite.cpp +++ b/Crypto/testsuite/src/CryptoTestSuite.cpp @@ -11,7 +11,7 @@ #include "Poco/Platform.h" // see https://www.openssl.org/docs/faq.html // and https://github.com/openssl/openssl/blob/master/doc/man3/OPENSSL_Applink.pod -#if defined(POCO_OS_FAMILY_WINDOWS) +#if defined(POCO_OS_FAMILY_WINDOWS) && defined(OPENSSL_REQUIRE_APPLINK) #include "openssl/applink.c" #endif #include "CryptoTestSuite.h" diff --git a/Crypto/vcpkg-configuration.json b/Crypto/vcpkg-configuration.json new file mode 100644 index 0000000000..c540ec736f --- /dev/null +++ b/Crypto/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/Crypto/vcpkg.json b/Crypto/vcpkg.json new file mode 100644 index 0000000000..3ed9a36b23 --- /dev/null +++ b/Crypto/vcpkg.json @@ -0,0 +1,5 @@ +{ + "dependencies": [ + "openssl" + ] +} diff --git a/DLLVersion.rc b/DLLVersion.rc index 6fe40d346c..141634483f 100644 --- a/DLLVersion.rc +++ b/DLLVersion.rc @@ -5,7 +5,7 @@ #include "winres.h" #define POCO_VERSION 1,13,2,0 -#define POCO_VERSION_STR "1.13.2" +#define POCO_VERSION_STR "1.13.3" VS_VERSION_INFO VERSIONINFO FILEVERSION POCO_VERSION diff --git a/Data/DataTest/DataTest_vs160.vcxproj b/Data/DataTest/DataTest_vs160.vcxproj index 190616b18a..fae676f2a9 100644 --- a/Data/DataTest/DataTest_vs160.vcxproj +++ b/Data/DataTest/DataTest_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataTestd PocoDataTestmdd PocoDataTestmtd diff --git a/Data/DataTest/DataTest_vs160.vcxproj.filters b/Data/DataTest/DataTest_vs160.vcxproj.filters index 6a41fa9f12..de961e6456 100644 --- a/Data/DataTest/DataTest_vs160.vcxproj.filters +++ b/Data/DataTest/DataTest_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {3d0da798-3bb5-48a5-ae71-60141f2d3277} + {56caa2cd-ae1a-4459-b9ce-a8dc045e7691} - {ea627452-9089-42dc-b0ae-54afbbeb03d0} + {f0823160-eebe-4631-9475-232500d96a91} diff --git a/Data/DataTest/DataTest_vs170.vcxproj b/Data/DataTest/DataTest_vs170.vcxproj index d6060dd092..d54cccaab3 100644 --- a/Data/DataTest/DataTest_vs170.vcxproj +++ b/Data/DataTest/DataTest_vs170.vcxproj @@ -77,7 +77,7 @@ 17.0 DataTest - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3} + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8} DataTest Win32Proj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataTestA64d PocoDataTestmdd PocoDataTestmtd diff --git a/Data/DataTest/DataTest_vs170.vcxproj.filters b/Data/DataTest/DataTest_vs170.vcxproj.filters index 01b99e2939..d138cc0313 100644 --- a/Data/DataTest/DataTest_vs170.vcxproj.filters +++ b/Data/DataTest/DataTest_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {36d78e00-e4f2-41ae-bcb6-d7d39d78bf92} + {099ff819-cf2e-47e3-9c06-4d355f25db99} - {80b2c411-135b-4310-8fbe-edd927cc0cf9} + {aeb2a344-5b8d-49fa-9ec3-3450d2c5edc9} diff --git a/Data/Data_vs160.vcxproj b/Data/Data_vs160.vcxproj index 873d052d95..1201bee991 100644 --- a/Data/Data_vs160.vcxproj +++ b/Data/Data_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDatad PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs160.vcxproj.filters b/Data/Data_vs160.vcxproj.filters index 5b887e994a..b354150427 100644 --- a/Data/Data_vs160.vcxproj.filters +++ b/Data/Data_vs160.vcxproj.filters @@ -2,67 +2,67 @@ - {cb2cff8d-df03-460e-a8e8-5f75df6de03e} + {1a4916a5-5650-4fcc-a100-a73ec175a363} - {39dacf38-8a48-41b9-b90d-741f627fb1d0} + {04dc1d18-86bc-4c11-8558-4ce2a2c90141} - {21eb13dd-d633-4c58-8172-e0046ad24c31} + {702a6bd6-d14f-40a5-ac76-6c0c2cff102e} - {8fb3827f-33be-4daf-8c14-ebed3bea96e5} + {570a8764-2355-4b3d-ad5b-d6b9696f9a9f} - {b39da8b5-3345-4522-8fcd-56ea15c0741f} + {de8267c0-5622-4ca3-8168-57c7de59cf28} - {540b4b42-d82d-4005-9abd-f4a5bd346235} + {87c2d7cb-d0ea-4784-8adb-c96497b24acf} - {33e2aebf-4bf2-4651-a6fb-4597ee963a73} + {c1e26b08-ccbd-4f1a-9e33-0489e3a188e6} - {6d62c21e-e848-4c39-9199-2f5e594b546c} + {ebae8f05-c32b-472f-9212-6f4a0babed38} - {1e38adcb-f0b8-4ef7-abd2-4eb14baa1297} + {b399406d-1edc-4263-9cc0-9fa137d06784} - {23886b0c-0b0f-4c73-8d1a-ae976d5e83bb} + {a1991eae-15de-4da4-987e-95f62340637c} - {f22290d4-2b0b-46db-ac61-446e3a361a9a} + {739a92e7-5837-41d4-af62-a9e29b31d254} - {92ca4fbe-77c6-4945-915f-fa8f8d71102e} + {d506878f-fc91-4498-9993-b66252a02ab5} - {62e6a21d-b3a0-43b8-90b8-5a3d1a578da9} + {f8a09432-669d-4b70-b17a-e312ad315302} - {85432299-06a5-4a73-a5f6-77381c344d85} + {a37f8c62-bbfc-4c97-8090-5556db7a176c} - {40d59c41-5827-4244-a4b6-88c639f6cffe} + {151655d6-2fea-4c65-9ff8-fdd3687c2aac} - {0e840ec2-9c51-4a6f-93d5-9546cb005cdb} + {9ec177c5-9b00-40d6-b15e-425599bcc5f2} - {202c598f-56ed-463d-a534-871d3c7eadb6} + {4971c36d-8e78-4b43-adcc-7f3ce4705780} - {d5f36096-6a9a-4641-8292-a5858bb1f1d5} + {de726bfe-e573-4383-8840-a9065936d58c} - {490544d2-114b-41e4-836f-e0a902a40642} + {9bea8865-1830-4bdb-a8d4-da6782d8d7c0} - {6067c6e1-a29d-41f2-bfe9-14ae03d2d7aa} + {4f88c74d-6d4d-42c1-a08a-49e786c4ad6b} - {50f23d3b-3f56-41fa-b043-002d8c64b3b5} + {8eaa9239-ac11-48ff-9e9b-9197f9677aae} diff --git a/Data/Data_vs170.sln b/Data/Data_vs170.sln index 2d47a84713..a368b40189 100644 --- a/Data/Data_vs170.sln +++ b/Data/Data_vs170.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 -VisualStudioVersion = 17.9.34607.119 +VisualStudioVersion = 17.9.34723.18 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs170.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\Test {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "DataTest\DataTest_vs170.vcxproj", "{989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "DataTest\DataTest_vs170.vcxproj", "{7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}" ProjectSection(ProjectDependencies) = postProject {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} = {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} @@ -145,42 +145,42 @@ Global {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Build.0 = release_static_mt|x64 {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_shared|x64.Build.0 = debug_shared|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|ARM64.Build.0 = release_shared|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|Win32.Build.0 = release_shared|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|x64.ActiveCfg = release_shared|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_shared|x64.Build.0 = release_shared|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_md|x64.Build.0 = release_static_md|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 - {989B2F6B-2F8A-43DA-A9F2-A675EC341AD3}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_shared|x64.Build.0 = debug_shared|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|Win32.Build.0 = release_shared|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|x64.ActiveCfg = release_shared|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_shared|x64.Build.0 = release_shared|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_md|x64.Build.0 = release_static_md|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {7BD2F7AA-48F0-4A81-95F8-D1554EA63FD8}.release_static_mt|x64.Build.0 = release_static_mt|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/Data_vs170.vcxproj b/Data/Data_vs170.vcxproj index 0cc1814d65..57940d43ab 100644 --- a/Data/Data_vs170.vcxproj +++ b/Data/Data_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoDataA64d PocoDatamdd PocoDatamtd diff --git a/Data/Data_vs170.vcxproj.filters b/Data/Data_vs170.vcxproj.filters index b49c64254d..07e9981916 100644 --- a/Data/Data_vs170.vcxproj.filters +++ b/Data/Data_vs170.vcxproj.filters @@ -2,67 +2,67 @@ - {c111f2b8-0fe5-45cf-bcf5-6717f913f4d1} + {5a42d476-c359-4703-9452-139a0f8fcb37} - {a429278e-282a-48ad-a6e9-4673ad994ef6} + {6f9350be-27cb-463e-a66e-3767a3891ac6} - {34cb5ff3-8959-4b44-b06a-6a371e903043} + {8f43717e-cf88-4991-a4e3-2ed3cfbf60ae} - {56b9dadb-359a-44e8-af9d-67dd5d8cadd2} + {6a736fab-7470-4a80-a746-4b06aed3f840} - {d775c737-421f-45a3-ba6e-a47034ca0c93} + {43973543-7ccc-437e-9e40-d24a4db65f77} - {c282924f-b59d-4fee-b202-c6c567572666} + {23f244b7-0946-43dd-9f59-fc2196900f50} - {fcca3d29-3bf5-47f1-be8a-2fe1a0773a9e} + {5ea73b4a-3057-4923-b5b7-84a9d9f4e0f4} - {ce5fcae6-0135-4453-9d16-acf8ce133fff} + {024dd280-3450-4f10-84d5-c7bcedecb484} - {51152c9c-3e67-47f2-965d-4f8b5528df0f} + {0351bd80-24fa-4570-8dc3-ac1cfe3e1b63} - {6886ee17-8a9c-4cf4-820f-cd96ed915c74} + {50cf4604-f24f-49c5-9269-a36b9d755d02} - {4c76e1c2-dbd6-4090-9c9f-d09fcc8521c4} + {6c147273-fff3-4294-91be-2b1bc74a6d91} - {85d4c9a3-827b-450b-a4f0-56db8cf5da12} + {28a2cd19-1892-45b9-bb6d-d36aed1a15a9} - {903ed189-9ddf-44c6-b600-ea212371ea3c} + {78cbeb64-2302-44dd-aeae-07fea8281335} - {b2f5f062-3106-4301-8e49-7b242ae66efe} + {6413ab24-5e95-4972-a75f-c065019f1a12} - {2dda7dbb-8a31-4869-87d3-374c7effd007} + {78edc960-2779-46bb-940e-b21f467e5097} - {574a99ce-a7ea-4221-bdcb-318456d50f0e} + {37607d86-0041-455b-a059-66b6d2ca20b5} - {e07a89d7-c43c-425f-8bb0-eec2ef4c5763} + {846bcd17-0c26-4a7a-9fb5-2822360986af} - {c9455486-7d6c-4732-a11f-513a24cb954e} + {2d58d30a-8d85-42ca-8571-f9250ca3a9a9} - {6d03dc65-89e5-4dac-a6be-0ad2e761adc1} + {e8da8ccf-9ae6-411c-bb9a-3c07133231ec} - {2fc9ede0-fc29-4e59-ba50-a587575c2cc2} + {49d8d42b-0d10-484d-aeae-d9fbac199b6c} - {b5c53c80-25ce-4a87-8634-2808040e62ab} + {dfd7dfc2-81a0-4d21-8d65-6d0b2975b5d2} diff --git a/Data/MySQL/MySQL.progen b/Data/MySQL/MySQL.progen index 1eea490ae4..1c8c107c66 100644 --- a/Data/MySQL/MySQL.progen +++ b/Data/MySQL/MySQL.progen @@ -5,6 +5,7 @@ vc.project.type = library vc.project.pocobase = ..\\.. vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 +vc.project.vcpkg = true 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.pocobase}\\Foundation\\include; \ @@ -13,6 +14,7 @@ vc.project.compiler.defines = THREADSAFE;__LCC__ 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Data/MySQL/MySQL_vs160.vcxproj b/Data/MySQL/MySQL_vs160.vcxproj index c225474812..d12fc175f6 100644 --- a/Data/MySQL/MySQL_vs160.vcxproj +++ b/Data/MySQL/MySQL_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataMySQLd PocoDataMySQLmdd PocoDataMySQLmtd @@ -224,6 +224,57 @@ ..\..\lib64\ obj64\MySQL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled @@ -241,6 +292,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -276,6 +328,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -309,6 +362,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -337,6 +391,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -362,6 +417,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -390,6 +446,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +472,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +508,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -483,6 +542,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -511,6 +571,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -536,6 +597,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -564,6 +626,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/MySQL/MySQL_vs170.vcxproj b/Data/MySQL/MySQL_vs170.vcxproj index 8bd706e34d..1b7ae7f124 100644 --- a/Data/MySQL/MySQL_vs170.vcxproj +++ b/Data/MySQL/MySQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoDataMySQLA64d PocoDataMySQLmdd PocoDataMySQLmtd @@ -328,6 +328,81 @@ ..\..\lib64\ obj64\MySQL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled @@ -345,6 +420,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -380,6 +456,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -413,6 +490,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -441,6 +519,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -466,6 +545,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -494,6 +574,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -519,6 +600,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -554,6 +636,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -587,6 +670,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -615,6 +699,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -640,6 +725,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -668,6 +754,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -693,6 +780,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -728,6 +816,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -761,6 +850,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -789,6 +879,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -814,6 +905,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -842,6 +934,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/MySQL/src/StatementExecutor.cpp b/Data/MySQL/src/StatementExecutor.cpp index b7e8dbcd8d..28d7b2f4d8 100644 --- a/Data/MySQL/src/StatementExecutor.cpp +++ b/Data/MySQL/src/StatementExecutor.cpp @@ -80,8 +80,13 @@ void StatementExecutor::bindParams(MYSQL_BIND* params, std::size_t count) if (count == 0) return; +#if LIBMYSQL_VERSION_ID >= 80300 + if (mysql_stmt_bind_named_param(_pHandle, params, count, nullptr) != 0) + throw StatementException("mysql_stmt_bind_named_param() error ", _pHandle, _query); +#else if (mysql_stmt_bind_param(_pHandle, params) != 0) throw StatementException("mysql_stmt_bind_param() error ", _pHandle, _query); +#endif } diff --git a/Data/MySQL/testsuite/TestSuite.progen b/Data/MySQL/testsuite/TestSuite.progen index a4fc8c077f..db36ec6930 100644 --- a/Data/MySQL/testsuite/TestSuite.progen +++ b/Data/MySQL/testsuite/TestSuite.progen @@ -4,9 +4,17 @@ vc.project.target = TestSuite vc.project.type = testsuite vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 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.Win32 = iphlpapi.lib +vc.project.compiler.additionalOptions = /Zc:__cplusplus +vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib +vc.project.linker.dependencies.debug_shared = +vc.project.linker.dependencies.release_shared = +vc.project.linker.dependencies.debug_static_md = Crypt32.lib Secur32.lib shlwapi.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib Secur32.lib shlwapi.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib Secur32.lib shlwapi.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib Secur32.lib shlwapi.lib diff --git a/Data/MySQL/testsuite/TestSuite_vs160.vcxproj b/Data/MySQL/testsuite/TestSuite_vs160.vcxproj index 607396d8f5..5d88c7fc74 100644 --- a/Data/MySQL/testsuite/TestSuite_vs160.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -232,6 +232,57 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled @@ -249,12 +300,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -284,12 +336,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -316,12 +369,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -351,12 +405,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -383,12 +438,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -418,12 +474,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -450,12 +507,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -485,12 +543,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -517,12 +576,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -552,12 +612,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -584,12 +645,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -619,12 +681,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters index 33a59fa972..f408211535 100644 --- a/Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {924ec557-1753-4799-8cbe-7476a5c6999e} + {c5e8f041-6699-45b4-87cd-7a00a8b202b9} - {97dd25a6-a0be-4f11-b2ca-2a0b10c1a351} + {50ab9365-9a51-4d04-8fde-42fa7ca554b2} - {f37345d3-ebb6-4297-a469-386dfe2c1fa1} + {1b0c82eb-4adb-4770-b398-5e51d722de33} - {77a30e71-b38c-4bf3-8f28-f011cc06cb06} + {c845c39b-67cb-477f-bb19-f1d7bb934396} - {e51ffe32-6130-4da7-98d2-8a29d8c2246b} + {23031c0a-48a7-483c-b624-585e829f536b} - {aaa4bd68-f97f-4928-9740-3a601a4c5940} + {716d5be8-be75-4591-86b0-7bc2fe369efc} - {b4712375-ae85-470c-a63d-327b37c16b71} + {6e6235ce-6910-4741-9188-7604a9a3ba47} - {8254a402-3a54-49c2-83ed-7b7ab307d980} + {4e3363bf-3207-40a8-8e6e-3ea7d26b0543} diff --git a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj index 083638b4e5..45c10a3256 100644 --- a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj +++ b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -340,10 +340,85 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,10 +432,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -377,7 +455,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -390,10 +468,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -406,7 +487,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -420,10 +501,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -440,7 +524,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -453,10 +537,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -469,7 +556,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -483,10 +570,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -503,7 +593,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -516,10 +606,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -532,7 +625,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -546,10 +639,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -566,7 +662,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -579,10 +675,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -595,7 +694,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -609,10 +708,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -629,7 +731,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -642,10 +744,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -658,7 +763,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -672,10 +777,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -692,7 +800,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -705,10 +813,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -721,7 +832,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -735,10 +846,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -755,7 +869,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -768,10 +882,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -784,7 +901,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -798,10 +915,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -818,7 +938,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -831,10 +951,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -847,7 +970,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -861,10 +984,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -881,7 +1007,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\mysql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -894,10 +1020,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;Secur32.lib;shlwapi.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -915,15 +1044,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters index d9b8002a88..b2650a5023 100644 --- a/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/MySQL/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {70e207d1-df25-48bb-876d-ef409138f1b3} + {6a9693fe-6efa-4827-b38f-2368f27d20f4} - {3fb6fff1-8b74-414a-b207-21b52d944f4a} + {77182c3b-b22c-4fc2-9b36-4a22697f0f9e} - {1f7bf169-8c4a-4916-a4b6-cedca1de05a7} + {0f7570e1-dbb4-43b5-8dd5-ebcc2beb06b9} - {5a5a5709-5023-48fb-b5ef-04f278c3a373} + {efed7e55-380c-43d7-b824-1fa1dfc59501} - {655df9d6-25b9-40f6-a676-774a9b7a68ed} + {5581720a-facb-4535-9226-9e59fa563107} - {fb215f7b-16a4-4636-8be4-8ad05620a751} + {2d6d1c6b-91ec-4a46-a4c0-929e6234f48a} - {1884265a-eeaa-40ce-a482-88db43b1a781} + {a4eac270-2ba7-46b0-bd74-34545689fa26} - {2d93157c-bbe0-4314-b051-48ed6db6ca30} + {fa41ee1d-5f5a-431f-8d14-0ebe3557992c} diff --git a/Data/MySQL/testsuite/src/SQLExecutor.cpp b/Data/MySQL/testsuite/src/SQLExecutor.cpp index 6e822cf500..9d5f0a3ac2 100644 --- a/Data/MySQL/testsuite/src/SQLExecutor.cpp +++ b/Data/MySQL/testsuite/src/SQLExecutor.cpp @@ -205,7 +205,12 @@ void SQLExecutor::bareboneMySQLTest(const char* host, const char* user, const ch bind_param[4].buffer = &fifth; bind_param[4].buffer_type = MYSQL_TYPE_FLOAT; +#if LIBMYSQL_VERSION_ID >= 80300 + rc = mysql_stmt_bind_named_param(hstmt, bind_param, 5, nullptr); +#else rc = mysql_stmt_bind_param(hstmt, bind_param); +#endif + assertTrue (rc == 0); rc = mysql_stmt_execute(hstmt); diff --git a/Data/MySQL/vcpkg-configuration.json b/Data/MySQL/vcpkg-configuration.json new file mode 100644 index 0000000000..c540ec736f --- /dev/null +++ b/Data/MySQL/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/Data/MySQL/vcpkg.json b/Data/MySQL/vcpkg.json new file mode 100644 index 0000000000..b967585991 --- /dev/null +++ b/Data/MySQL/vcpkg.json @@ -0,0 +1,5 @@ +{ + "dependencies": [ + "libmariadb" + ] +} diff --git a/Data/ODBC/ODBC.progen b/Data/ODBC/ODBC.progen index c4f142f672..c8b2b36281 100644 --- a/Data/ODBC/ODBC.progen +++ b/Data/ODBC/ODBC.progen @@ -12,6 +12,7 @@ vc.project.compiler.defines = THREADSAFE 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = odbc32.lib odbccp32.lib vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Data/ODBC/ODBC_vs160.vcxproj b/Data/ODBC/ODBC_vs160.vcxproj index 76778d6e45..26e6baf752 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj +++ b/Data/ODBC/ODBC_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd @@ -241,6 +241,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -277,6 +278,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -311,6 +313,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -339,6 +342,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -364,6 +368,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -392,6 +397,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +424,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -454,6 +461,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -488,6 +496,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -516,6 +525,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -541,6 +551,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -569,6 +580,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/ODBC/ODBC_vs160.vcxproj.filters b/Data/ODBC/ODBC_vs160.vcxproj.filters index 56e4c624f3..8adf377eaf 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj.filters +++ b/Data/ODBC/ODBC_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {8b004104-3ffd-4dc8-8ac0-4ae84e742459} + {a414528e-316e-4633-a23d-84464ab68d14} - {37f249ab-fbe6-4178-9a6b-165b109834b4} + {940723bd-f1dd-487b-b887-c3796424c101} - {1320226b-aa76-40c8-88ee-737825fa5f8d} + {03c28cd4-fde4-4ab0-bd06-fc7edeb8a0c3} diff --git a/Data/ODBC/ODBC_vs170.vcxproj b/Data/ODBC/ODBC_vs170.vcxproj index 4e215a5e98..7a9fd6731a 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj +++ b/Data/ODBC/ODBC_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoDataODBCA64d PocoDataODBCmdd PocoDataODBCmtd @@ -345,6 +345,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -381,6 +382,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +417,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -443,6 +446,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -468,6 +472,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -496,6 +501,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -521,6 +527,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -557,6 +564,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -591,6 +599,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +628,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -644,6 +654,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -672,6 +683,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -698,6 +710,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -734,6 +747,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -768,6 +782,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -796,6 +811,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -821,6 +837,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -849,6 +866,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/ODBC/ODBC_vs170.vcxproj.filters b/Data/ODBC/ODBC_vs170.vcxproj.filters index 5de0c0fe3b..8c6bba930a 100644 --- a/Data/ODBC/ODBC_vs170.vcxproj.filters +++ b/Data/ODBC/ODBC_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {ed003841-e8ed-440a-a5b3-5a9b10309562} + {2d088157-7ba9-47f7-bd9a-deac6a212652} - {1b16d4be-a98c-4712-b31e-2aefeb5cf438} + {83b0e7ce-68ed-45c5-bc44-9b5ed0bbcde1} - {9a908646-f5af-43bf-b294-2628e33b38cd} + {71b01243-4c1f-4450-86ae-8a8f872c7157} diff --git a/Data/ODBC/src/Unicode_UNIXODBC.cpp b/Data/ODBC/src/Unicode_UNIXODBC.cpp index 1f671fed50..f5810b0c7c 100644 --- a/Data/ODBC/src/Unicode_UNIXODBC.cpp +++ b/Data/ODBC/src/Unicode_UNIXODBC.cpp @@ -14,6 +14,7 @@ #include "Poco/Data/ODBC/ODBC.h" #include "Poco/Data/ODBC/Unicode_UNIXODBC.h" +#include "Poco/Data/ODBC/Utility.h" #include "Poco/TextConverter.h" #include "Poco/UTF8Encoding.h" #include "Poco/UTF16Encoding.h" @@ -73,6 +74,12 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, SQLSMALLINT* pcbCharAttr, NumAttrPtrType pNumAttr) { + SQLSMALLINT cbCharAttr = 0; + if (!pcbCharAttr) pcbCharAttr = &cbCharAttr; + + SQLSMALLINT cbCharAttr; + if (!pcbCharAttr) pcbCharAttr = &cbCharAttr; + if (isString(pCharAttr, cbCharAttrMax)) { Buffer buffer(stringLength(pCharAttr, cbCharAttrMax)); @@ -85,7 +92,9 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, pcbCharAttr, pNumAttr); - makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax); + return rc; } @@ -107,6 +116,11 @@ SQLRETURN SQLColAttributes(SQLHSTMT hstmt, SQLSMALLINT* pcbDesc, SQLLEN* pfDesc) { + SQLSMALLINT cbDesc = 0; + if (!pcbDesc) pcbDesc = &cbDesc; + SQLLEN fDesc = 0; + if (!pfDesc) pfDesc = &fDesc; + return SQLColAttribute(hstmt, icol, fDescType, @@ -151,6 +165,17 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt, SQLSMALLINT* pibScale, SQLSMALLINT* pfNullable) { + SQLSMALLINT cbColName = 0; + if (!pcbColName) pcbColName = &cbColName; + SQLSMALLINT fSqlType = 0; + if (!pfSqlType) pfSqlType = &fSqlType; + SQLULEN cbColDef = 0; + if (!pcbColDef) pcbColDef = &cbColDef; + SQLSMALLINT ibScale = 0; + if (!pibScale) pibScale = &ibScale; + SQLSMALLINT fNullable = 0; + if (!pfNullable) pfNullable = &fNullable; + Buffer buffer(cbColNameMax); SQLRETURN rc = SQLDescribeColW(hstmt, icol, @@ -162,7 +187,9 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt, pibScale, pfNullable); - makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbColName * sizeof(SQLWCHAR), szColName, cbColNameMax); + return rc; } @@ -198,6 +225,9 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -208,7 +238,8 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, (SQLINTEGER) buffer.sizeBytes(), pcbValue); - makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); return rc; } @@ -263,6 +294,9 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -274,7 +308,8 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, (SQLINTEGER) buffer.sizeBytes(), pcbValue); - makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); return rc; } @@ -312,6 +347,9 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType, SQLSMALLINT cbDiagInfoMax, SQLSMALLINT* pcbDiagInfo) { + SQLSMALLINT cbDiagInfo = 0; + if (!pcbDiagInfo) pcbDiagInfo = &cbDiagInfo; + if (isString(rgbDiagInfo, cbDiagInfoMax)) { Buffer buffer(stringLength(rgbDiagInfo, cbDiagInfoMax)); @@ -324,7 +362,8 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType, (SQLSMALLINT) buffer.sizeBytes(), pcbDiagInfo); - makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); return rc; } @@ -348,6 +387,11 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, SQLSMALLINT cbErrorMsgMax, SQLSMALLINT* pcbErrorMsg) { + SQLINTEGER fNativeError = 0; + if (!pfNativeError) pfNativeError = &fNativeError; + SQLSMALLINT cbErrorMsg = 0; + if (!pcbErrorMsg) pcbErrorMsg = &cbErrorMsg; + const SQLINTEGER stateLen = SQL_SQLSTATE_SIZE + 1; Buffer bufState(stateLen); Buffer bufErr(cbErrorMsgMax); @@ -361,8 +405,11 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, (SQLSMALLINT) bufErr.size(), pcbErrorMsg); - makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen); - makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufState, stateLen * sizeof(SQLWCHAR), szSqlState, stateLen); + makeUTF8(bufErr, *pcbErrorMsg * sizeof(SQLWCHAR), szErrorMsg, cbErrorMsgMax); + } return rc; } @@ -433,6 +480,9 @@ SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -476,6 +526,9 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, SQLSMALLINT cbInfoValueMax, SQLSMALLINT* pcbInfoValue) { + SQLSMALLINT cbInfoValue = 0; + if (!pcbInfoValue) pcbInfoValue = &cbInfoValue; + if (cbInfoValueMax) { Buffer buffer(cbInfoValueMax); @@ -486,7 +539,8 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, (SQLSMALLINT) buffer.sizeBytes(), pcbInfoValue); - makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); return rc; } @@ -561,6 +615,10 @@ SQLRETURN SQLDataSources(SQLHENV henv, SQLSMALLINT cbDescMax, SQLSMALLINT* pcbDesc) { + SQLSMALLINT cbDSN = 0, cbDesc = 0; + if (!pcbDSN) pcbDSN = &cbDSN; + if (!pcbDesc) pcbDesc = &cbDesc; + Buffer bufDSN(cbDSNMax); Buffer bufDesc(cbDescMax); @@ -573,8 +631,11 @@ SQLRETURN SQLDataSources(SQLHENV henv, (SQLSMALLINT) bufDesc.size(), pcbDesc); - makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax); - makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufDSN, *pcbDSN * sizeof(SQLWCHAR), szDSN, cbDSNMax); + makeUTF8(bufDesc, *pcbDesc * sizeof(SQLWCHAR), szDesc, cbDescMax); + } return rc; } @@ -589,6 +650,9 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc, SQLSMALLINT* pcbConnStrOut, SQLUSMALLINT fDriverCompletion) { + SQLSMALLINT cbConnStrOut = 0; + if (!pcbConnStrOut) pcbConnStrOut = &cbConnStrOut; + SQLSMALLINT len = cbConnStrIn; if (SQL_NTS == len) len = (SQLSMALLINT) std::strlen((const char*) szConnStrIn) + 1; @@ -606,7 +670,8 @@ SQLRETURN SQLDriverConnect(SQLHDBC hdbc, pcbConnStrOut, fDriverCompletion); - makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax); + if (!Utility::isError(rc)) + makeUTF8(out, *pcbConnStrOut * sizeof(SQLWCHAR), pcbConnStrOut, cbConnStrOutMax); return rc; } @@ -619,6 +684,9 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc, SQLSMALLINT cbConnStrOutMax, SQLSMALLINT* pcbConnStrOut) { + SQLSMALLINT cbConnStrOut = 0; + if (!pcbConnStrOut) pcbConnStrOut = &cbConnStrOut; + std::string str; makeUTF16(szConnStrIn, cbConnStrIn, str); @@ -631,7 +699,8 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc, (SQLSMALLINT) bufConnStrOut.size(), pcbConnStrOut); - makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax); + if (!Utility::isError(rc)) + makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(SQLWCHAR), szConnStrOut, cbConnStrOutMax); return rc; } @@ -676,6 +745,9 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc, SQLINTEGER cbSqlStrMax, SQLINTEGER* pcbSqlStr) { + SQLINTEGER cbSqlStr = 0; + if (!pcbSqlStr) pcbSqlStr = &cbSqlStr; + std::string str; makeUTF16(szSqlStrIn, cbSqlStrIn, str); @@ -688,7 +760,8 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc, (SQLINTEGER) bufSQLOut.size(), pcbSqlStr); - makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax); + if (!Utility::isError(rc)) + makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(SQLWCHAR), szSqlStr, cbSqlStrMax); return rc; } @@ -753,6 +826,10 @@ SQLRETURN SQLDrivers(SQLHENV henv, SQLSMALLINT cbDrvrAttrMax, SQLSMALLINT* pcbDrvrAttr) { + SQLSMALLINT cbDriverDesc = 0, cbDrvrAttr = 0; + if (!pcbDriverDesc) pcbDriverDesc = &cbDriverDesc; + if (!pcbDrvrAttr) pcbDrvrAttr = &cbDrvrAttr; + Buffer bufDriverDesc(cbDriverDescMax); Buffer bufDriverAttr(cbDrvrAttrMax); @@ -765,8 +842,11 @@ SQLRETURN SQLDrivers(SQLHENV henv, (SQLSMALLINT) bufDriverAttr.size(), pcbDrvrAttr); - makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax); - makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(SQLWCHAR), szDriverDesc, cbDriverDescMax); + makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(SQLWCHAR), szDriverAttributes, cbDrvrAttrMax); + } return rc; } diff --git a/Data/ODBC/src/Unicode_WIN32.cpp b/Data/ODBC/src/Unicode_WIN32.cpp index ed472115a5..cbc57331ac 100644 --- a/Data/ODBC/src/Unicode_WIN32.cpp +++ b/Data/ODBC/src/Unicode_WIN32.cpp @@ -49,7 +49,9 @@ SQLRETURN SQLColAttribute(SQLHSTMT hstmt, pcbCharAttr, pNumAttr); - makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbCharAttr, pCharAttr, cbCharAttrMax); + return rc; } @@ -129,7 +131,9 @@ SQLRETURN SQLDescribeCol(SQLHSTMT hstmt, pibScale, pfNullable); - makeUTF8(buffer, *pcbColName * sizeof(wchar_t), szColName, cbColNameMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbColName * sizeof(wchar_t), szColName, cbColNameMax); + return rc; } @@ -167,6 +171,9 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -177,7 +184,9 @@ SQLRETURN SQLGetConnectAttr(SQLHDBC hdbc, (SQLINTEGER) buffer.sizeBytes(), pcbValue); - makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + return rc; } @@ -234,6 +243,9 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -245,7 +257,9 @@ SQLRETURN SQLGetDescField(SQLHDESC hdesc, (SQLINTEGER) buffer.sizeBytes(), pcbValue); - makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbValue, rgbValue, cbValueMax); + return rc; } @@ -294,7 +308,8 @@ SQLRETURN SQLGetDiagField(SQLSMALLINT fHandleType, (SQLSMALLINT) buffer.sizeBytes(), pcbDiagInfo); - makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbDiagInfo, rgbDiagInfo, cbDiagInfoMax); return rc; } @@ -317,6 +332,12 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, SQLSMALLINT cbErrorMsgMax, SQLSMALLINT* pcbErrorMsg) { + SQLINTEGER nativeError = 0; + SQLSMALLINT cbErrorMsg = 0; + + if (!pfNativeError) pfNativeError = &nativeError; + if (!pcbErrorMsg) pcbErrorMsg = &cbErrorMsg; + const SQLINTEGER stateLen = SQL_SQLSTATE_SIZE + 1; Buffer bufState(stateLen); Buffer bufErr(cbErrorMsgMax); @@ -330,8 +351,11 @@ SQLRETURN SQLGetDiagRec(SQLSMALLINT fHandleType, (SQLSMALLINT) bufErr.size(), pcbErrorMsg); - makeUTF8(bufState, stateLen * sizeof(wchar_t), szSqlState, stateLen); - makeUTF8(bufErr, *pcbErrorMsg * sizeof(wchar_t), szErrorMsg, cbErrorMsgMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufState, stateLen * sizeof(wchar_t), szSqlState, stateLen); + makeUTF8(bufErr, *pcbErrorMsg * sizeof(wchar_t), szErrorMsg, cbErrorMsgMax); + } return rc; } @@ -410,6 +434,9 @@ SQLRETURN SQLGetStmtAttr(SQLHSTMT hstmt, SQLINTEGER cbValueMax, SQLINTEGER* pcbValue) { + SQLINTEGER cbValue = 0; + if (!pcbValue) pcbValue = &cbValue; + if (isString(rgbValue, cbValueMax)) { Buffer buffer(stringLength(rgbValue, cbValueMax)); @@ -457,6 +484,9 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, SQLSMALLINT cbInfoValueMax, SQLSMALLINT* pcbInfoValue) { + SQLSMALLINT cbValue = 0; + if (!pcbInfoValue) pcbInfoValue = &cbValue; + if (cbInfoValueMax) { Buffer buffer(cbInfoValueMax); @@ -467,7 +497,8 @@ SQLRETURN SQLGetInfo(SQLHDBC hdbc, (SQLSMALLINT) buffer.sizeBytes(), pcbInfoValue); - makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); + if (!Utility::isError(rc)) + makeUTF8(buffer, *pcbInfoValue, rgbInfoValue, cbInfoValueMax); return rc; } @@ -558,8 +589,11 @@ SQLRETURN SQLDataSources(SQLHENV henv, (SQLSMALLINT) bufDesc.size(), pcbDesc); - makeUTF8(bufDSN, *pcbDSN * sizeof(wchar_t), szDSN, cbDSNMax); - makeUTF8(bufDesc, *pcbDesc * sizeof(wchar_t), szDesc, cbDescMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufDSN, *pcbDSN * sizeof(wchar_t), szDSN, cbDSNMax); + makeUTF8(bufDesc, *pcbDesc * sizeof(wchar_t), szDesc, cbDescMax); + } return rc; } @@ -617,7 +651,8 @@ SQLRETURN SQLBrowseConnect(SQLHDBC hdbc, (SQLSMALLINT) bufConnStrOut.size(), pcbConnStrOut); - makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax); + if (!Utility::isError(rc)) + makeUTF8(bufConnStrOut, *pcbConnStrOut * sizeof(wchar_t), szConnStrOut, cbConnStrOutMax); return rc; } @@ -674,7 +709,8 @@ SQLRETURN SQLNativeSql(SQLHDBC hdbc, (SQLINTEGER) bufSQLOut.size(), pcbSqlStr); - makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(wchar_t), szSqlStr, cbSqlStrMax); + if (!Utility::isError(rc)) + makeUTF8(bufSQLOut, *pcbSqlStr * sizeof(wchar_t), szSqlStr, cbSqlStrMax); return rc; } @@ -751,8 +787,11 @@ SQLRETURN SQLDrivers(SQLHENV henv, (SQLSMALLINT) bufDriverAttr.size(), pcbDrvrAttr); - makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(wchar_t), szDriverDesc, cbDriverDescMax); - makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(wchar_t), szDriverAttributes, cbDrvrAttrMax); + if (!Utility::isError(rc)) + { + makeUTF8(bufDriverDesc, *pcbDriverDesc * sizeof(wchar_t), szDriverDesc, cbDriverDescMax); + makeUTF8(bufDriverAttr, *pcbDrvrAttr * sizeof(wchar_t), szDriverAttributes, cbDrvrAttrMax); + } return rc; } diff --git a/Data/ODBC/testsuite/TestSuite.progen b/Data/ODBC/testsuite/TestSuite.progen index 1096655681..91879ce419 100644 --- a/Data/ODBC/testsuite/TestSuite.progen +++ b/Data/ODBC/testsuite/TestSuite.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\CppUnit\\include;..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\DataTest\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = odbc32.lib odbccp32.lib iphlpapi.lib diff --git a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj index 23fd5587a6..3983cb445c 100644 --- a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters index 6f786c73c6..bc534b7a8d 100644 --- a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {48efde3e-262d-4a9f-a880-85060871285d} + {5832f28d-34cc-447b-8e36-37a6b185bcec} - {e1d04e08-1065-4d23-9ed3-08e0f7326fb4} + {3d5d8beb-e181-4b36-b8b3-5fe995b6d765} - {99f9a720-5b72-4ca1-9bb3-383414de1651} + {687496b9-15fb-4b9b-9056-3871734ea408} - {8740d7a4-5d7e-4921-a24e-ae4ae1214918} + {9d963e94-58bd-4618-98a9-7046ebf158b1} - {2e457954-e262-47b4-8c7d-b2d453de1d5d} + {afe39e55-5da8-42c7-99c6-5c23c9f5b317} - {b7934d67-65aa-4c86-9932-113feec23869} + {890e9d82-1c03-4a54-849d-1c347858923f} - {94642818-83b0-4347-a2e1-c2015c8d2850} + {155fff95-bb0e-4aa8-bfa3-8daf7def46d2} - {d3f9ac9e-ef3c-4fcc-9e32-e1dc36b22432} + {a7726191-1f79-4492-be06-020813203022} diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj index ea4315f5bd..800b795f84 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters index d299a0b1f1..31a1baaf89 100644 --- a/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {c7e9a1ea-73f4-4226-b310-b265201e0be9} + {adeefd40-d7d9-410e-be1b-5f150fb11f3f} - {2348173e-2e62-4809-99ea-676ebb4198c0} + {e5523990-fe95-4772-a02f-8c5eef8391be} - {8926ceae-a008-4b2d-accb-ff1e4f4a1b77} + {25fe5a5c-d3c0-47a6-95a9-780ce0019c12} - {30658ecd-cf47-42ec-8568-5acc3a624a78} + {f83c3560-2df6-4db6-b908-d0832ae0cf8a} - {5192786d-b801-40d6-a989-f7fdc825f525} + {0a043398-2df9-400a-8ff1-52abf00d279b} - {4a23e42f-ef34-4ab0-b282-21cf3de054b9} + {aaf1db69-ca71-479a-9a25-0aa925bae38d} - {90adb98e-9140-4322-88ba-3ed19efe888c} + {887a2058-1c26-4a81-84ba-4f996bb76a55} - {099c216f-5416-41a0-b28d-fb3156debbcd} + {e6bd0ab8-aac9-42e8-ab2b-2a5c9f1e8e5b} diff --git a/Data/PostgreSQL/PostgreSQL.progen b/Data/PostgreSQL/PostgreSQL.progen index 9a124e9df3..b1d64a4b76 100644 --- a/Data/PostgreSQL/PostgreSQL.progen +++ b/Data/PostgreSQL/PostgreSQL.progen @@ -5,6 +5,7 @@ vc.project.type = library vc.project.pocobase = ..\\.. vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 +vc.project.vcpkg = true 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.pocobase}\\postgresql\\include; \ @@ -13,6 +14,7 @@ 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Data/PostgreSQL/PostgreSQL_vs160.vcxproj b/Data/PostgreSQL/PostgreSQL_vs160.vcxproj index fde08f4d4f..081e3d1ff9 100644 --- a/Data/PostgreSQL/PostgreSQL_vs160.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataPostgreSQLd PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -224,6 +224,57 @@ ..\..\lib64\ obj64\PostgreSQL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled @@ -241,6 +292,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -276,6 +328,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -309,6 +362,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -337,6 +391,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -362,6 +417,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -390,6 +446,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +472,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +508,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -483,6 +542,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -511,6 +571,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -536,6 +597,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -564,6 +626,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj index 69299df540..2da07dce7a 100644 --- a/Data/PostgreSQL/PostgreSQL_vs170.vcxproj +++ b/Data/PostgreSQL/PostgreSQL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoDataPostgreSQLA64d PocoDataPostgreSQLmdd PocoDataPostgreSQLmtd @@ -328,6 +328,81 @@ ..\..\lib64\ obj64\PostgreSQL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled @@ -345,6 +420,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -380,6 +456,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -413,6 +490,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -441,6 +519,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -466,6 +545,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -494,6 +574,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -519,6 +600,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -554,6 +636,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -587,6 +670,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -615,6 +699,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -640,6 +725,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -668,6 +754,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -693,6 +780,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -728,6 +816,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -761,6 +850,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -789,6 +879,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -814,6 +905,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -842,6 +934,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/PostgreSQL/testsuite/TestSuite.progen b/Data/PostgreSQL/testsuite/TestSuite.progen index cc4c94765c..293ee5124f 100644 --- a/Data/PostgreSQL/testsuite/TestSuite.progen +++ b/Data/PostgreSQL/testsuite/TestSuite.progen @@ -4,16 +4,18 @@ vc.project.target = TestSuite vc.project.type = testsuite vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 postgresql = ${vc.project.pocobase}\\postgresql vc.project.compiler.include = ${postgresql}\\include;${vc.project.pocobase}\\Foundation\\include; \ - ${vc.project.pocobase}\\Data\\include + ${vc.project.pocobase}\\Data\\include;..\\..\\..\\Data\\DataTest\\include vc.project.compiler.defines = _CRT_SECURE_NO_WARNINGS -vc.project.linker.dependencies = iphlpapi.lib +vc.project.compiler.additionalOptions = /Zc:__cplusplus +vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib wldap32.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 Secur32.lib +vc.project.linker.dependencies.release_static_md = Crypt32.lib Secur32.lib +vc.project.linker.dependencies.debug_static_mt = Crypt32.lib Secur32.lib +vc.project.linker.dependencies.release_static_mt = Crypt32.lib Secur32.lib diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj index 899989a042..053d5fc2b2 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -232,10 +232,61 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -249,12 +300,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -271,7 +323,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -284,12 +336,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -302,7 +355,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -316,12 +369,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -338,7 +392,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -351,12 +405,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -369,7 +424,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -383,12 +438,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -405,7 +461,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -418,12 +474,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -436,7 +493,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,12 +507,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -472,7 +530,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -485,12 +543,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -503,7 +562,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -517,12 +576,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -539,7 +599,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -552,12 +612,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -570,7 +631,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -584,12 +645,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -606,7 +668,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -619,12 +681,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters index 9501451863..838720991e 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {a15667a0-1722-49f7-9028-3c5af817f80e} + {70dc1e4c-0466-4104-903e-bf91906e2930} - {c010c8ca-541a-4f25-8c8f-69be6a00d7d3} + {bca05848-efb5-4e97-96a5-d9bfb8ff8ba4} - {dfafa03d-5c73-406e-b7ab-d6095d97164b} + {50f21831-9739-442c-9b1d-7d8975785c4d} - {114b0949-48ab-4ecd-88a5-71ba581ed275} + {208cfbaf-3ede-48cc-86a4-ab107c4f0c8f} - {79b8207a-fa47-4422-a6e1-be62752f430a} + {2d293009-e303-458d-bbb4-596da27ee68f} - {df66b67c-1082-49d8-aa77-9652854e79ce} + {1ad46b79-9ddf-42b8-b885-5a5baeb37bca} - {30018351-b2f8-45c4-b081-9855cf69a73d} + {1090d015-6cdd-4134-926d-f1b06caba6c3} - {9ca506c9-d65c-4ec0-b544-96a7f2e1ff11} + {d2a4fcf9-bb67-4b4b-a651-f88801d4118e} diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj index 1aed740d96..48dab921da 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj +++ b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -340,10 +340,85 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,10 +432,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -377,7 +455,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -390,10 +468,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -406,7 +487,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -420,10 +501,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -440,7 +524,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -453,10 +537,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -469,7 +556,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -483,10 +570,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) true @@ -503,7 +593,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -516,10 +606,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) $(OutDir)$(TargetName).exe ..\..\..\libA64;%(AdditionalLibraryDirectories) false @@ -532,7 +625,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -546,10 +639,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -566,7 +662,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -579,10 +675,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -595,7 +694,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -609,10 +708,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_mt\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -629,7 +731,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -642,10 +744,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_mt\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -658,7 +763,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -672,10 +777,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_md\TestSuited.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true @@ -692,7 +800,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -705,10 +813,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin\static_md\TestSuite.exe ..\..\..\lib;%(AdditionalLibraryDirectories) false @@ -721,7 +832,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -735,10 +846,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin64\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -755,7 +869,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -768,10 +882,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnit.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;%(AdditionalDependencies) bin64\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -784,7 +901,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -798,10 +915,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -818,7 +938,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreaded @@ -831,10 +951,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_mt\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -847,7 +970,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true EnableFastChecks @@ -861,10 +984,13 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_md\TestSuited.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true @@ -881,7 +1007,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\postgresql\include;..\..\..\Foundation\include; ..\..\..\Data\include;..\..\..\Data\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -894,10 +1020,13 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 - CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;wldap32.lib;Crypt32.lib;Secur32.lib;%(AdditionalDependencies) bin64\static_md\TestSuite.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) false @@ -915,15 +1044,23 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters index 5303c4ea61..fe3e34a292 100644 --- a/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/PostgreSQL/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {1426fa27-35d9-4513-9f66-3537ff2d94b1} + {22847672-160d-45cb-a716-ad080868436d} - {e4285a23-6fb3-43b1-889a-f81db867e93f} + {6fc501e2-a07d-42bf-b9d8-9b080fa79655} - {d3c8e624-61b1-4faa-af37-a0f9fd08317a} + {70e76688-ecc6-4e87-aaa1-a7ebe0e87f93} - {27f4b44e-ac77-4131-837e-5af866de11f0} + {66f9ec00-a164-4228-8451-6c44ec246f0e} - {1a05011d-353f-46d1-9945-9b5fe29aa160} + {a43f7616-02f6-4e22-8b58-151d7e12b82b} - {d0b4c31a-b0ce-497c-bf78-831d6886c8f7} + {bb8d1439-0675-428c-b132-8cb9fa478980} - {37f759f0-f214-4e79-a169-5636af2ddf90} + {d41730af-a25c-4eaf-a1a2-1e3cc2d8e6be} - {c54bd706-4bc9-4fa0-b5eb-8a8c12540b09} + {bf6052d0-2361-42cf-afb8-223b3869f4cf} diff --git a/Data/PostgreSQL/vcpkg-configuration.json b/Data/PostgreSQL/vcpkg-configuration.json new file mode 100644 index 0000000000..c540ec736f --- /dev/null +++ b/Data/PostgreSQL/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/Data/PostgreSQL/vcpkg.json b/Data/PostgreSQL/vcpkg.json new file mode 100644 index 0000000000..e15e58b8f0 --- /dev/null +++ b/Data/PostgreSQL/vcpkg.json @@ -0,0 +1,5 @@ +{ + "dependencies": [ + "libpq" + ] +} diff --git a/Data/SQLite/SQLite.progen b/Data/SQLite/SQLite.progen index 48d7f5f4d4..eed02321fa 100644 --- a/Data/SQLite/SQLite.progen +++ b/Data/SQLite/SQLite.progen @@ -13,5 +13,6 @@ 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.project.compiler.disableWarnings = 4996;4244;4018 +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Data/SQLite/SQLite_vs160.vcxproj b/Data/SQLite/SQLite_vs160.vcxproj index 47c5029a1a..003ebb6657 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj +++ b/Data/SQLite/SQLite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoDataSQLited PocoDataSQLitemdd PocoDataSQLitemtd @@ -242,6 +242,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -278,6 +279,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -312,6 +314,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -341,6 +344,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -367,6 +371,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -396,6 +401,7 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -422,6 +428,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -458,6 +465,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -492,6 +500,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -521,6 +530,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -547,6 +557,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -576,6 +587,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/SQLite/SQLite_vs160.vcxproj.filters b/Data/SQLite/SQLite_vs160.vcxproj.filters index c229d36286..0f681d58d2 100644 --- a/Data/SQLite/SQLite_vs160.vcxproj.filters +++ b/Data/SQLite/SQLite_vs160.vcxproj.filters @@ -2,22 +2,22 @@ - {fd9f7cd4-cb33-4153-9bfb-100f86c6fdc7} + {eb99b850-d32d-4376-93e0-0dda2dd238fa} - {ff6535b5-a1e2-451f-82c2-bbfe316ddb2a} + {87339597-ba46-4bdb-bd08-8192e82a94dc} - {d7b22751-409b-4cb7-ab78-c89745c2a70a} + {46b1d84b-8f42-4272-9ca7-73e73d3eb79d} - {0ee9caef-0389-4cd4-85f0-1a6f20f6c6a1} + {2515b638-790d-4235-bb14-9102bab148b8} - {e0cc3d83-d99c-49cb-8cfd-c8002fe1ddc8} + {78fd0bd0-5676-4af7-b813-772df97224bf} - {be54820d-54b5-411d-9c18-1451dba024d7} + {ff403849-6155-45f0-b79a-e3442942471b} diff --git a/Data/SQLite/SQLite_vs170.vcxproj b/Data/SQLite/SQLite_vs170.vcxproj index d81239abdb..5c07da8eff 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj +++ b/Data/SQLite/SQLite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoDataSQLiteA64d PocoDataSQLitemdd PocoDataSQLitemtd @@ -346,6 +346,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -382,6 +383,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -416,6 +418,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -445,6 +448,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -471,6 +475,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -500,6 +505,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -526,6 +532,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -562,6 +569,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -596,6 +604,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -625,6 +634,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -651,6 +661,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -680,6 +691,7 @@ Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -706,6 +718,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -742,6 +755,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -776,6 +790,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -805,6 +820,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -831,6 +847,7 @@ ProgramDatabase Default 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -860,6 +877,7 @@ Default $(OutDir)$(TargetName).pdb 4996;4244;4018;%(DisableSpecificWarnings) + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/SQLite/SQLite_vs170.vcxproj.filters b/Data/SQLite/SQLite_vs170.vcxproj.filters index 6a4ab8b3ec..277534c162 100644 --- a/Data/SQLite/SQLite_vs170.vcxproj.filters +++ b/Data/SQLite/SQLite_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {cd53f9bd-a54e-471b-baca-7dc9c716d85e} + {8c622089-d316-45fa-b379-dc8ed1192c0b} - {e55c2057-b0a9-40c5-bdab-2a4f4dee0ed4} + {41d7d1fb-59a1-4f03-accc-494b8da18e46} - {00217a54-1806-4de4-8266-1cfbd2981e70} + {257ea916-a742-4bbf-b1c6-1e9761b058e1} - {429811b8-9994-460a-af2b-b615a938fa8d} + {9e645dfc-b71f-4023-b1a3-66bfda48c65f} - {beefb226-4ea2-4e1a-a948-8c03473ce75a} + {e15343da-4ec5-4f0e-a229-ce23b9cd919d} - {a3482cc4-c21d-40bd-9f65-e1678f03aeb9} + {271ab28e-6bdb-41b9-a80a-fc0812f7ff5b} diff --git a/Data/SQLite/src/sqlite3.c b/Data/SQLite/src/sqlite3.c index 139ee46a6a..55ca309401 100644 --- a/Data/SQLite/src/sqlite3.c +++ b/Data/SQLite/src/sqlite3.c @@ -1,6 +1,6 @@ /****************************************************************************** ** This file is an amalgamation of many separate C source files from SQLite -** version 3.45.1. By combining all the individual C code files into this +** version 3.45.2. By combining all the individual C code files into this ** single large file, the entire code can be compiled as a single translation ** unit. This allows many compilers to do optimizations that would not be ** possible if the files were compiled separately. Performance improvements @@ -18,7 +18,7 @@ ** separate file. This file contains only code for the core SQLite library. ** ** The content in this amalgamation comes from Fossil check-in -** e876e51a0ed5c5b3126f52e532044363a014. +** d8cd6d49b46a395b13955387d05e9e1a2a47. */ #define SQLITE_CORE 1 #define SQLITE_AMALGAMATION 1 @@ -459,9 +459,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.1" -#define SQLITE_VERSION_NUMBER 3045001 -#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" +#define SQLITE_VERSION "3.45.2" +#define SQLITE_VERSION_NUMBER 3045002 +#define SQLITE_SOURCE_ID "2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -733,6 +733,8 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** the 1st parameter to sqlite3_exec() while sqlite3_exec() is running. **
  • The application must not modify the SQL statement text passed into ** the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running. +**
  • The application must not dereference the arrays or string pointers +** passed as the 3rd and 4th callback parameters after it returns. ** */ SQLITE_API int sqlite3_exec( @@ -15097,6 +15099,7 @@ SQLITE_PRIVATE u32 sqlite3TreeTrace; ** 0x00010000 Beginning of DELETE/INSERT/UPDATE processing ** 0x00020000 Transform DISTINCT into GROUP BY ** 0x00040000 SELECT tree dump after all code has been generated +** 0x00080000 NOT NULL strength reduction */ /* @@ -19346,6 +19349,7 @@ struct NameContext { #define NC_InAggFunc 0x020000 /* True if analyzing arguments to an agg func */ #define NC_FromDDL 0x040000 /* SQL text comes from sqlite_schema */ #define NC_NoSelect 0x080000 /* Do not descend into sub-selects */ +#define NC_Where 0x100000 /* Processing WHERE clause of a SELECT */ #define NC_OrderAgg 0x8000000 /* Has an aggregate other than count/min/max */ /* @@ -19369,6 +19373,7 @@ struct Upsert { Expr *pUpsertWhere; /* WHERE clause for the ON CONFLICT UPDATE */ Upsert *pNextUpsert; /* Next ON CONFLICT clause in the list */ u8 isDoUpdate; /* True for DO UPDATE. False for DO NOTHING */ + u8 isDup; /* True if 2nd or later with same pUpsertIdx */ /* Above this point is the parse tree for the ON CONFLICT clauses. ** The next group of fields stores intermediate data. */ void *pToFree; /* Free memory when deleting the Upsert object */ @@ -21444,7 +21449,7 @@ SQLITE_PRIVATE With *sqlite3WithPush(Parse*, With*, u8); SQLITE_PRIVATE Upsert *sqlite3UpsertNew(sqlite3*,ExprList*,Expr*,ExprList*,Expr*,Upsert*); SQLITE_PRIVATE void sqlite3UpsertDelete(sqlite3*,Upsert*); SQLITE_PRIVATE Upsert *sqlite3UpsertDup(sqlite3*,Upsert*); -SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(Parse*,SrcList*,Upsert*); +SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget(Parse*,SrcList*,Upsert*,Upsert*); SQLITE_PRIVATE void sqlite3UpsertDoUpdate(Parse*,Upsert*,Table*,Index*,int); SQLITE_PRIVATE Upsert *sqlite3UpsertOfIndex(Upsert*,Index*); SQLITE_PRIVATE int sqlite3UpsertNextIsIPK(Upsert*); @@ -31309,6 +31314,7 @@ SQLITE_API void sqlite3_str_vappendf( if( xtype==etFLOAT ){ iRound = -precision; }else if( xtype==etGENERIC ){ + if( precision==0 ) precision = 1; iRound = precision; }else{ iRound = precision+1; @@ -35199,6 +35205,9 @@ SQLITE_PRIVATE int sqlite3AtoF(const char *z, double *pResult, int length, u8 en u64 s2; rr[0] = (double)s; s2 = (u64)rr[0]; +#if defined(_MSC_VER) && _MSC_VER<1700 + if( s2==0x8000000000000000LL ){ s2 = 2*(u64)(0.5*rr[0]); } +#endif rr[1] = s>=s2 ? (double)(s - s2) : -(double)(s2 - s); if( e>0 ){ while( e>=100 ){ @@ -35641,7 +35650,7 @@ SQLITE_PRIVATE void sqlite3FpDecode(FpDecode *p, double r, int iRound, int mxRou assert( p->n>0 ); assert( p->nzBuf) ); p->iDP = p->n + exp; - if( iRound<0 ){ + if( iRound<=0 ){ iRound = p->iDP - iRound; if( iRound==0 && p->zBuf[i+1]>='5' ){ iRound = 1; @@ -53262,6 +53271,14 @@ SQLITE_API unsigned char *sqlite3_serialize( pOut = 0; }else{ sz = sqlite3_column_int64(pStmt, 0)*szPage; + if( sz==0 ){ + sqlite3_reset(pStmt); + sqlite3_exec(db, "BEGIN IMMEDIATE; COMMIT;", 0, 0, 0); + rc = sqlite3_step(pStmt); + if( rc==SQLITE_ROW ){ + sz = sqlite3_column_int64(pStmt, 0)*szPage; + } + } if( piSize ) *piSize = sz; if( mFlags & SQLITE_SERIALIZE_NOCOPY ){ pOut = 0; @@ -77088,7 +77105,10 @@ static int fillInCell( n = nHeader + nPayload; testcase( n==3 ); testcase( n==4 ); - if( n<4 ) n = 4; + if( n<4 ){ + n = 4; + pPayload[nPayload] = 0; + } *pnSize = n; assert( nSrc<=nPayload ); testcase( nSrcpBt->nPreformatSize; - if( szNew<4 ) szNew = 4; + if( szNew<4 ){ + szNew = 4; + newCell[3] = 0; + } if( ISAUTOVACUUM(p->pBt) && szNew>pPage->maxLocal ){ CellInfo info; pPage->xParseCell(pPage, newCell, &info); @@ -88379,6 +88402,23 @@ static void serialGet( pMem->flags = IsNaN(x) ? MEM_Null : MEM_Real; } } +static int serialGet7( + const unsigned char *buf, /* Buffer to deserialize from */ + Mem *pMem /* Memory cell to write value into */ +){ + u64 x = FOUR_BYTE_UINT(buf); + u32 y = FOUR_BYTE_UINT(buf+4); + x = (x<<32) + y; + assert( sizeof(x)==8 && sizeof(pMem->u.r)==8 ); + swapMixedEndianFloat(x); + memcpy(&pMem->u.r, &x, sizeof(x)); + if( IsNaN(x) ){ + pMem->flags = MEM_Null; + return 1; + } + pMem->flags = MEM_Real; + return 0; +} SQLITE_PRIVATE void sqlite3VdbeSerialGet( const unsigned char *buf, /* Buffer to deserialize from */ u32 serial_type, /* Serial type to deserialize */ @@ -89058,7 +89098,7 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip( }else if( serial_type==0 ){ rc = -1; }else if( serial_type==7 ){ - sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1); + serialGet7(&aKey1[d1], &mem1); rc = -sqlite3IntFloatCompare(pRhs->u.i, mem1.u.r); }else{ i64 lhs = vdbeRecordDecodeInt(serial_type, &aKey1[d1]); @@ -89083,14 +89123,18 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip( }else if( serial_type==0 ){ rc = -1; }else{ - sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1); if( serial_type==7 ){ - if( mem1.u.ru.r ){ + if( serialGet7(&aKey1[d1], &mem1) ){ + rc = -1; /* mem1 is a NaN */ + }else if( mem1.u.ru.r ){ rc = -1; }else if( mem1.u.r>pRhs->u.r ){ rc = +1; + }else{ + assert( rc==0 ); } }else{ + sqlite3VdbeSerialGet(&aKey1[d1], serial_type, &mem1); rc = sqlite3IntFloatCompare(mem1.u.i, pRhs->u.r); } } @@ -89160,7 +89204,14 @@ SQLITE_PRIVATE int sqlite3VdbeRecordCompareWithSkip( /* RHS is null */ else{ serial_type = aKey1[idx1]; - rc = (serial_type!=0 && serial_type!=10); + if( serial_type==0 + || serial_type==10 + || (serial_type==7 && serialGet7(&aKey1[d1], &mem1)!=0) + ){ + assert( rc==0 ); + }else{ + rc = 1; + } } if( rc!=0 ){ @@ -94858,7 +94909,9 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ } } }else if( affinity==SQLITE_AFF_TEXT && ((flags1 | flags3) & MEM_Str)!=0 ){ - if( (flags1 & MEM_Str)==0 && (flags1&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){ + if( (flags1 & MEM_Str)!=0 ){ + pIn1->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal); + }else if( (flags1&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){ testcase( pIn1->flags & MEM_Int ); testcase( pIn1->flags & MEM_Real ); testcase( pIn1->flags & MEM_IntReal ); @@ -94867,7 +94920,9 @@ case OP_Ge: { /* same as TK_GE, jump, in1, in3 */ flags1 = (pIn1->flags & ~MEM_TypeMask) | (flags1 & MEM_TypeMask); if( NEVER(pIn1==pIn3) ) flags3 = flags1 | MEM_Str; } - if( (flags3 & MEM_Str)==0 && (flags3&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){ + if( (flags3 & MEM_Str)!=0 ){ + pIn3->flags &= ~(MEM_Int|MEM_Real|MEM_IntReal); + }else if( (flags3&(MEM_Int|MEM_Real|MEM_IntReal))!=0 ){ testcase( pIn3->flags & MEM_Int ); testcase( pIn3->flags & MEM_Real ); testcase( pIn3->flags & MEM_IntReal ); @@ -106212,6 +106267,8 @@ static void resolveAlias( assert( iCol>=0 && iColnExpr ); pOrig = pEList->a[iCol].pExpr; assert( pOrig!=0 ); + assert( !ExprHasProperty(pExpr, EP_Reduced|EP_TokenOnly) ); + if( pExpr->pAggInfo ) return; db = pParse->db; pDup = sqlite3ExprDup(db, pOrig, 0); if( db->mallocFailed ){ @@ -107097,6 +107154,19 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ ** resolved. This prevents "column" from being counted as having been ** referenced, which might prevent a SELECT from being erroneously ** marked as correlated. + ** + ** 2024-03-28: Beware of aggregates. A bare column of aggregated table + ** can still evaluate to NULL even though it is marked as NOT NULL. + ** Example: + ** + ** CREATE TABLE t1(a INT NOT NULL); + ** SELECT a, a IS NULL, a IS NOT NULL, count(*) FROM t1; + ** + ** The "a IS NULL" and "a IS NOT NULL" expressions cannot be optimized + ** here because at the time this case is hit, we do not yet know whether + ** or not t1 is being aggregated. We have to assume the worst and omit + ** the optimization. The only time it is safe to apply this optimization + ** is within the WHERE clause. */ case TK_NOTNULL: case TK_ISNULL: { @@ -107107,19 +107177,36 @@ static int resolveExprStep(Walker *pWalker, Expr *pExpr){ anRef[i] = p->nRef; } sqlite3WalkExpr(pWalker, pExpr->pLeft); - if( 0==sqlite3ExprCanBeNull(pExpr->pLeft) && !IN_RENAME_OBJECT ){ - testcase( ExprHasProperty(pExpr, EP_OuterON) ); - assert( !ExprHasProperty(pExpr, EP_IntValue) ); - pExpr->u.iValue = (pExpr->op==TK_NOTNULL); - pExpr->flags |= EP_IntValue; - pExpr->op = TK_INTEGER; + if( IN_RENAME_OBJECT ) return WRC_Prune; + if( sqlite3ExprCanBeNull(pExpr->pLeft) ){ + /* The expression can be NULL. So the optimization does not apply */ + return WRC_Prune; + } - for(i=0, p=pNC; p && ipNext, i++){ - p->nRef = anRef[i]; + for(i=0, p=pNC; p; p=p->pNext, i++){ + if( (p->ncFlags & NC_Where)==0 ){ + return WRC_Prune; /* Not in a WHERE clause. Unsafe to optimize. */ } - sqlite3ExprDelete(pParse->db, pExpr->pLeft); - pExpr->pLeft = 0; } + testcase( ExprHasProperty(pExpr, EP_OuterON) ); + assert( !ExprHasProperty(pExpr, EP_IntValue) ); +#if TREETRACE_ENABLED + if( sqlite3TreeTrace & 0x80000 ){ + sqlite3DebugPrintf( + "NOT NULL strength reduction converts the following to %d:\n", + pExpr->op==TK_NOTNULL + ); + sqlite3ShowExpr(pExpr); + } +#endif /* TREETRACE_ENABLED */ + pExpr->u.iValue = (pExpr->op==TK_NOTNULL); + pExpr->flags |= EP_IntValue; + pExpr->op = TK_INTEGER; + for(i=0, p=pNC; p && ipNext, i++){ + p->nRef = anRef[i]; + } + sqlite3ExprDelete(pParse->db, pExpr->pLeft); + pExpr->pLeft = 0; return WRC_Prune; } @@ -108019,7 +108106,9 @@ static int resolveSelectStep(Walker *pWalker, Select *p){ } if( sqlite3ResolveExprNames(&sNC, p->pHaving) ) return WRC_Abort; } + sNC.ncFlags |= NC_Where; if( sqlite3ResolveExprNames(&sNC, p->pWhere) ) return WRC_Abort; + sNC.ncFlags &= ~NC_Where; /* Resolve names in table-valued-function arguments */ for(i=0; ipSrc->nSrc; i++){ @@ -128947,13 +129036,13 @@ SQLITE_PRIVATE void sqlite3QuoteValue(StrAccum *pStr, sqlite3_value *pValue){ double r1, r2; const char *zVal; r1 = sqlite3_value_double(pValue); - sqlite3_str_appendf(pStr, "%!.15g", r1); + sqlite3_str_appendf(pStr, "%!0.15g", r1); zVal = sqlite3_str_value(pStr); if( zVal ){ sqlite3AtoF(zVal, &r2, pStr->nChar, SQLITE_UTF8); if( r1!=r2 ){ sqlite3_str_reset(pStr); - sqlite3_str_appendf(pStr, "%!.20e", r1); + sqlite3_str_appendf(pStr, "%!0.20e", r1); } } break; @@ -129255,7 +129344,7 @@ static void replaceFunc( } if( zPattern[0]==0 ){ assert( sqlite3_value_type(argv[1])!=SQLITE_NULL ); - sqlite3_result_value(context, argv[0]); + sqlite3_result_text(context, (const char*)zStr, nStr, SQLITE_TRANSIENT); return; } nPattern = sqlite3_value_bytes(argv[1]); @@ -133175,7 +133264,7 @@ SQLITE_PRIVATE void sqlite3Insert( pNx->iDataCur = iDataCur; pNx->iIdxCur = iIdxCur; if( pNx->pUpsertTarget ){ - if( sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx) ){ + if( sqlite3UpsertAnalyzeTarget(pParse, pTabList, pNx, pUpsert) ){ goto insert_cleanup; } } @@ -139474,31 +139563,7 @@ SQLITE_PRIVATE void sqlite3Pragma( int mxCol; /* Maximum non-virtual column number */ if( pObjTab && pObjTab!=pTab ) continue; - if( !IsOrdinaryTable(pTab) ){ -#ifndef SQLITE_OMIT_VIRTUALTABLE - sqlite3_vtab *pVTab; - int a1; - if( !IsVirtual(pTab) ) continue; - if( pTab->nCol<=0 ){ - const char *zMod = pTab->u.vtab.azArg[0]; - if( sqlite3HashFind(&db->aModule, zMod)==0 ) continue; - } - sqlite3ViewGetColumnNames(pParse, pTab); - if( pTab->u.vtab.p==0 ) continue; - pVTab = pTab->u.vtab.p->pVtab; - if( NEVER(pVTab==0) ) continue; - if( NEVER(pVTab->pModule==0) ) continue; - if( pVTab->pModule->iVersion<4 ) continue; - if( pVTab->pModule->xIntegrity==0 ) continue; - sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick); - pTab->nTabRef++; - sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF); - a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v); - integrityCheckResultRow(v); - sqlite3VdbeJumpHere(v, a1); -#endif - continue; - } + if( !IsOrdinaryTable(pTab) ) continue; if( isQuick || HasRowid(pTab) ){ pPk = 0; r2 = 0; @@ -139633,6 +139698,7 @@ SQLITE_PRIVATE void sqlite3Pragma( ** is REAL, we have to load the actual data using OP_Column ** to reliably determine if the value is a NULL. */ sqlite3VdbeAddOp3(v, OP_Column, p1, p3, 3); + sqlite3ColumnDefault(v, pTab, j, 3); jmp3 = sqlite3VdbeAddOp2(v, OP_NotNull, 3, labelOk); VdbeCoverage(v); } @@ -139823,6 +139889,38 @@ SQLITE_PRIVATE void sqlite3Pragma( } } } + +#ifndef SQLITE_OMIT_VIRTUALTABLE + /* Second pass to invoke the xIntegrity method on all virtual + ** tables. + */ + for(x=sqliteHashFirst(pTbls); x; x=sqliteHashNext(x)){ + Table *pTab = sqliteHashData(x); + sqlite3_vtab *pVTab; + int a1; + if( pObjTab && pObjTab!=pTab ) continue; + if( IsOrdinaryTable(pTab) ) continue; + if( !IsVirtual(pTab) ) continue; + if( pTab->nCol<=0 ){ + const char *zMod = pTab->u.vtab.azArg[0]; + if( sqlite3HashFind(&db->aModule, zMod)==0 ) continue; + } + sqlite3ViewGetColumnNames(pParse, pTab); + if( pTab->u.vtab.p==0 ) continue; + pVTab = pTab->u.vtab.p->pVtab; + if( NEVER(pVTab==0) ) continue; + if( NEVER(pVTab->pModule==0) ) continue; + if( pVTab->pModule->iVersion<4 ) continue; + if( pVTab->pModule->xIntegrity==0 ) continue; + sqlite3VdbeAddOp3(v, OP_VCheck, i, 3, isQuick); + pTab->nTabRef++; + sqlite3VdbeAppendP4(v, pTab, P4_TABLEREF); + a1 = sqlite3VdbeAddOp1(v, OP_IsNull, 3); VdbeCoverage(v); + integrityCheckResultRow(v); + sqlite3VdbeJumpHere(v, a1); + continue; + } +#endif } { static const int iLn = VDBE_OFFSET_LINENO(2); @@ -153460,7 +153558,8 @@ SQLITE_PRIVATE Upsert *sqlite3UpsertNew( SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget( Parse *pParse, /* The parsing context */ SrcList *pTabList, /* Table into which we are inserting */ - Upsert *pUpsert /* The ON CONFLICT clauses */ + Upsert *pUpsert, /* The ON CONFLICT clauses */ + Upsert *pAll /* Complete list of all ON CONFLICT clauses */ ){ Table *pTab; /* That table into which we are inserting */ int rc; /* Result code */ @@ -153563,6 +153662,14 @@ SQLITE_PRIVATE int sqlite3UpsertAnalyzeTarget( continue; } pUpsert->pUpsertIdx = pIdx; + if( sqlite3UpsertOfIndex(pAll,pIdx)!=pUpsert ){ + /* Really this should be an error. The isDup ON CONFLICT clause will + ** never fire. But this problem was not discovered until three years + ** after multi-CONFLICT upsert was added, and so we silently ignore + ** the problem to prevent breaking applications that might actually + ** have redundant ON CONFLICT clauses. */ + pUpsert->isDup = 1; + } break; } if( pUpsert->pUpsertIdx==0 ){ @@ -153589,9 +153696,13 @@ SQLITE_PRIVATE int sqlite3UpsertNextIsIPK(Upsert *pUpsert){ Upsert *pNext; if( NEVER(pUpsert==0) ) return 0; pNext = pUpsert->pNextUpsert; - if( pNext==0 ) return 1; - if( pNext->pUpsertTarget==0 ) return 1; - if( pNext->pUpsertIdx==0 ) return 1; + while( 1 /*exit-by-return*/ ){ + if( pNext==0 ) return 1; + if( pNext->pUpsertTarget==0 ) return 1; + if( pNext->pUpsertIdx==0 ) return 1; + if( !pNext->isDup ) return 0; + pNext = pNext->pNextUpsert; + } return 0; } @@ -204785,6 +204896,7 @@ static int jsonTranslateTextToBlob(JsonParse *pParse, u32 i){ case '[': { /* Parse array */ iThis = pParse->nBlob; + assert( i<=(u32)pParse->nJson ); jsonBlobAppendNode(pParse, JSONB_ARRAY, pParse->nJson - i, 0); iStart = pParse->nBlob; if( pParse->oom ) return -1; @@ -205183,6 +205295,10 @@ static void jsonReturnStringAsBlob(JsonString *pStr){ JsonParse px; memset(&px, 0, sizeof(px)); jsonStringTerminate(pStr); + if( pStr->eErr ){ + sqlite3_result_error_nomem(pStr->pCtx); + return; + } px.zJson = pStr->zBuf; px.nJson = pStr->nUsed; px.db = sqlite3_context_db_handle(pStr->pCtx); @@ -206508,8 +206624,9 @@ static JsonParse *jsonParseFuncArg( } p->zJson = (char*)sqlite3_value_text(pArg); p->nJson = sqlite3_value_bytes(pArg); + if( db->mallocFailed ) goto json_pfa_oom; if( p->nJson==0 ) goto json_pfa_malformed; - if( NEVER(p->zJson==0) ) goto json_pfa_oom; + assert( p->zJson!=0 ); if( jsonConvertTextToBlob(p, (flgs & JSON_KEEPERROR) ? 0 : ctx) ){ if( flgs & JSON_KEEPERROR ){ p->nErr = 1; @@ -206675,10 +206792,10 @@ static void jsonDebugPrintBlob( if( sz==0 && x<=JSONB_FALSE ){ sqlite3_str_append(pOut, "\n", 1); }else{ - u32 i; + u32 j; sqlite3_str_appendall(pOut, ": \""); - for(i=iStart+n; iaBlob[i]; + for(j=iStart+n; jaBlob[j]; if( c<0x20 || c>=0x7f ) c = '.'; sqlite3_str_append(pOut, (char*)&c, 1); } @@ -208086,6 +208203,9 @@ static int jsonEachColumn( case JEACH_VALUE: { u32 i = jsonSkipLabel(p); jsonReturnFromBlob(&p->sParse, i, ctx, 1); + if( (p->sParse.aBlob[i] & 0x0f)>=JSONB_ARRAY ){ + sqlite3_result_subtype(ctx, JSON_SUBTYPE); + } break; } case JEACH_TYPE: { @@ -208132,9 +208252,9 @@ static int jsonEachColumn( case JEACH_JSON: { if( p->sParse.zJson==0 ){ sqlite3_result_blob(ctx, p->sParse.aBlob, p->sParse.nBlob, - SQLITE_STATIC); + SQLITE_TRANSIENT); }else{ - sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_STATIC); + sqlite3_result_text(ctx, p->sParse.zJson, -1, SQLITE_TRANSIENT); } break; } @@ -209160,11 +209280,9 @@ static RtreeNode *nodeNew(Rtree *pRtree, RtreeNode *pParent){ ** Clear the Rtree.pNodeBlob object */ static void nodeBlobReset(Rtree *pRtree){ - if( pRtree->pNodeBlob && pRtree->inWrTrans==0 && pRtree->nCursor==0 ){ - sqlite3_blob *pBlob = pRtree->pNodeBlob; - pRtree->pNodeBlob = 0; - sqlite3_blob_close(pBlob); - } + sqlite3_blob *pBlob = pRtree->pNodeBlob; + pRtree->pNodeBlob = 0; + sqlite3_blob_close(pBlob); } /* @@ -209208,7 +209326,6 @@ static int nodeAcquire( &pRtree->pNodeBlob); } if( rc ){ - nodeBlobReset(pRtree); *ppNode = 0; /* If unable to open an sqlite3_blob on the desired row, that can only ** be because the shadow tables hold erroneous data. */ @@ -209268,6 +209385,7 @@ static int nodeAcquire( } *ppNode = pNode; }else{ + nodeBlobReset(pRtree); if( pNode ){ pRtree->nNodeRef--; sqlite3_free(pNode); @@ -209412,6 +209530,7 @@ static void nodeGetCoord( int iCoord, /* Which coordinate to extract */ RtreeCoord *pCoord /* OUT: Space to write result to */ ){ + assert( iCellzData[12 + pRtree->nBytesPerCell*iCell + 4*iCoord], pCoord); } @@ -209601,7 +209720,9 @@ static int rtreeClose(sqlite3_vtab_cursor *cur){ sqlite3_finalize(pCsr->pReadAux); sqlite3_free(pCsr); pRtree->nCursor--; - nodeBlobReset(pRtree); + if( pRtree->nCursor==0 && pRtree->inWrTrans==0 ){ + nodeBlobReset(pRtree); + } return SQLITE_OK; } @@ -210186,7 +210307,11 @@ static int rtreeRowid(sqlite3_vtab_cursor *pVtabCursor, sqlite_int64 *pRowid){ int rc = SQLITE_OK; RtreeNode *pNode = rtreeNodeOfFirstSearchPoint(pCsr, &rc); if( rc==SQLITE_OK && ALWAYS(p) ){ - *pRowid = nodeGetRowid(RTREE_OF_CURSOR(pCsr), pNode, p->iCell); + if( p->iCell>=NCELL(pNode) ){ + rc = SQLITE_ABORT; + }else{ + *pRowid = nodeGetRowid(RTREE_OF_CURSOR(pCsr), pNode, p->iCell); + } } return rc; } @@ -210204,6 +210329,7 @@ static int rtreeColumn(sqlite3_vtab_cursor *cur, sqlite3_context *ctx, int i){ if( rc ) return rc; if( NEVER(p==0) ) return SQLITE_OK; + if( p->iCell>=NCELL(pNode) ) return SQLITE_ABORT; if( i==0 ){ sqlite3_result_int64(ctx, nodeGetRowid(pRtree, pNode, p->iCell)); }else if( i<=pRtree->nDim2 ){ @@ -211685,8 +211811,7 @@ static int rtreeUpdate( */ static int rtreeBeginTransaction(sqlite3_vtab *pVtab){ Rtree *pRtree = (Rtree *)pVtab; - assert( pRtree->inWrTrans==0 ); - pRtree->inWrTrans++; + pRtree->inWrTrans = 1; return SQLITE_OK; } @@ -211700,6 +211825,9 @@ static int rtreeEndTransaction(sqlite3_vtab *pVtab){ nodeBlobReset(pRtree); return SQLITE_OK; } +static int rtreeRollback(sqlite3_vtab *pVtab){ + return rtreeEndTransaction(pVtab); +} /* ** The xRename method for rtree module virtual tables. @@ -211818,7 +211946,7 @@ static sqlite3_module rtreeModule = { rtreeBeginTransaction, /* xBegin - begin transaction */ rtreeEndTransaction, /* xSync - sync transaction */ rtreeEndTransaction, /* xCommit - commit transaction */ - rtreeEndTransaction, /* xRollback - rollback transaction */ + rtreeRollback, /* xRollback - rollback transaction */ 0, /* xFindFunction - function overloading */ rtreeRename, /* xRename - rename the table */ rtreeSavepoint, /* xSavepoint */ @@ -245377,23 +245505,26 @@ static void fts5IterSetOutputsTokendata(Fts5Iter *pIter){ static void fts5TokendataIterNext(Fts5Iter *pIter, int bFrom, i64 iFrom){ int ii; Fts5TokenDataIter *pT = pIter->pTokenDataIter; + Fts5Index *pIndex = pIter->pIndex; for(ii=0; iinIter; ii++){ Fts5Iter *p = pT->apIter[ii]; if( p->base.bEof==0 && (p->base.iRowid==pIter->base.iRowid || (bFrom && p->base.iRowidpIndex, p, bFrom, iFrom); + fts5MultiIterNext(pIndex, p, bFrom, iFrom); while( bFrom && p->base.bEof==0 && p->base.iRowidpIndex->rc==SQLITE_OK + && pIndex->rc==SQLITE_OK ){ - fts5MultiIterNext(p->pIndex, p, 0, 0); + fts5MultiIterNext(pIndex, p, 0, 0); } } } - fts5IterSetOutputsTokendata(pIter); + if( pIndex->rc==SQLITE_OK ){ + fts5IterSetOutputsTokendata(pIter); + } } /* @@ -250547,7 +250678,7 @@ static void fts5SourceIdFunc( ){ assert( nArg==0 ); UNUSED_PARAM2(nArg, apUnused); - sqlite3_result_text(pCtx, "fts5: 2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a", -1, SQLITE_TRANSIENT); + sqlite3_result_text(pCtx, "fts5: 2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77", -1, SQLITE_TRANSIENT); } /* diff --git a/Data/SQLite/src/sqlite3.h b/Data/SQLite/src/sqlite3.h index 4fdfde004e..c9fc77fb86 100644 --- a/Data/SQLite/src/sqlite3.h +++ b/Data/SQLite/src/sqlite3.h @@ -146,9 +146,9 @@ extern "C" { ** [sqlite3_libversion_number()], [sqlite3_sourceid()], ** [sqlite_version()] and [sqlite_source_id()]. */ -#define SQLITE_VERSION "3.45.1" -#define SQLITE_VERSION_NUMBER 3045001 -#define SQLITE_SOURCE_ID "2024-01-30 16:01:20 e876e51a0ed5c5b3126f52e532044363a014bc594cfefa87ffb5b82257cc467a" +#define SQLITE_VERSION "3.45.2" +#define SQLITE_VERSION_NUMBER 3045002 +#define SQLITE_SOURCE_ID "2024-03-12 11:06:23 d8cd6d49b46a395b13955387d05e9e1a2a47e54fb99f3c9b59835bbefad6af77" /* ** CAPI3REF: Run-Time Library Version Numbers @@ -420,6 +420,8 @@ typedef int (*sqlite3_callback)(void*,int,char**, char**); ** the 1st parameter to sqlite3_exec() while sqlite3_exec() is running. **
  • The application must not modify the SQL statement text passed into ** the 2nd parameter of sqlite3_exec() while sqlite3_exec() is running. +**
  • The application must not dereference the arrays or string pointers +** passed as the 3rd and 4th callback parameters after it returns. ** */ SQLITE_API int sqlite3_exec( diff --git a/Data/SQLite/testsuite/TestSuite.progen b/Data/SQLite/testsuite/TestSuite.progen index a156305a65..19c65fd01b 100644 --- a/Data/SQLite/testsuite/TestSuite.progen +++ b/Data/SQLite/testsuite/TestSuite.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/SQLite/testsuite/TestSuite_vs160.vcxproj b/Data/SQLite/testsuite/TestSuite_vs160.vcxproj index 3b2ab061cd..eceb262eea 100644 --- a/Data/SQLite/testsuite/TestSuite_vs160.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters index f58478d282..cefe83e42f 100644 --- a/Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {b947611c-9004-493c-967a-caa6ef15244e} + {1414d527-ff37-4455-86d7-0e530ea345c4} - {b389e350-8391-47f5-bbe8-c424caed3a2b} + {1f0ea563-c52e-4be3-a47d-ad6030d52c59} - {9fe973fd-eb8c-4fab-ad5f-f4486f206bd4} + {c3f7c8dd-b6f4-43ad-baf3-160539d1d321} - {cd5d0eff-85db-448b-85cf-ff5f3d1335bd} + {750b6f96-bf5a-4aae-8615-fdd5df74034c} - {c074c52b-4f61-4b3b-aafa-abdb99ad6835} + {1c657278-569b-401e-b8ed-343582b7235c} - {649c53dc-ceb0-46c9-af3d-59a860a9fb47} + {a8e4024b-247b-4baf-9841-f020aac2cb3e} - {58088a5d-56bd-4f0d-9dc1-cd96d01f8b50} + {216f5902-d6a1-4140-a5a5-4fb242aa8c0d} - {45b69f8d-ba6c-4a41-8398-3492c99da64a} + {3b2b3178-6031-4b4b-a939-b083e5f90bcc} diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj index 401b89f379..0572a4d560 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -343,7 +343,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters index 8bba61b527..f1f9bb67e0 100644 --- a/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/SQLite/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {62bc9434-578c-424b-af4b-838e351397f5} + {59ed3c55-bf68-4b68-a98a-acd123a18324} - {d11aa317-b999-454c-84af-0caae02b36f8} + {5128c3b9-5410-42bd-9007-c7446b9fac07} - {de477f36-0385-4527-afe6-2c344f867014} + {8a3c9c1e-7a11-4918-8729-b4a1e8f333dd} - {8f537ccd-f8fc-4079-8c37-5f0ac2c26436} + {bd03af55-dba5-47ca-8674-984ab9324387} - {836839b8-70df-4bf6-9130-447077a74d5c} + {2d24809a-cbc5-46dc-b4b5-d63eb6626b8e} - {c4807f6c-ac72-45f0-9230-4181bb2da4b5} + {316a4090-bc48-4c3a-8c81-bfe06fb04cd4} - {0503a1f8-53ab-4ddd-920c-bd3770f0b307} + {8030ed04-62bb-40a5-a5b8-aef6364acf49} - {6228e845-e29c-44cd-9347-0314b081373d} + {043beb69-6fc6-4165-8f0f-b98b8cbcd3c5} diff --git a/Data/samples/Binding/Binding.progen b/Data/samples/Binding/Binding.progen index 3d17f1e887..6781302a2a 100644 --- a/Data/samples/Binding/Binding.progen +++ b/Data/samples/Binding/Binding.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/Binding/Binding_vs160.vcxproj b/Data/samples/Binding/Binding_vs160.vcxproj index ecf0398caa..ff28fda513 100644 --- a/Data/samples/Binding/Binding_vs160.vcxproj +++ b/Data/samples/Binding/Binding_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Bindingd Bindingd Bindingd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/Binding/Binding_vs160.vcxproj.filters b/Data/samples/Binding/Binding_vs160.vcxproj.filters index 26d7f21fee..b0a29c768d 100644 --- a/Data/samples/Binding/Binding_vs160.vcxproj.filters +++ b/Data/samples/Binding/Binding_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7db63845-ddd9-4c1d-b0a4-2c8a8c496dee} + {6b6112cc-acd4-4fcf-b08e-a22685770402} - {a37b40b7-6e79-4d5a-8e48-8e89fc812af3} + {683d868c-e137-482f-bc16-084026ff7ecd} diff --git a/Data/samples/Binding/Binding_vs170.vcxproj b/Data/samples/Binding/Binding_vs170.vcxproj index bd6a2d0071..da63c08b3f 100644 --- a/Data/samples/Binding/Binding_vs170.vcxproj +++ b/Data/samples/Binding/Binding_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 Bindingd Bindingd Bindingd @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/Binding/Binding_vs170.vcxproj.filters b/Data/samples/Binding/Binding_vs170.vcxproj.filters index 66f7774f79..16ec747a43 100644 --- a/Data/samples/Binding/Binding_vs170.vcxproj.filters +++ b/Data/samples/Binding/Binding_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {b66be61f-2d0d-4620-9e29-36518c68c8bc} + {071123d3-d714-4209-a233-e210240c2494} - {65592551-377e-432a-9257-638f138d095e} + {6f4b9785-6ea6-4d0b-aa06-767cb18a7e8d} diff --git a/Data/samples/RecordSet/RecordSet.progen b/Data/samples/RecordSet/RecordSet.progen index 3d17f1e887..6781302a2a 100644 --- a/Data/samples/RecordSet/RecordSet.progen +++ b/Data/samples/RecordSet/RecordSet.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/RecordSet/RecordSet_vs160.vcxproj b/Data/samples/RecordSet/RecordSet_vs160.vcxproj index 5b8fdcb4f7..9679b443c5 100644 --- a/Data/samples/RecordSet/RecordSet_vs160.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 RecordSetd RecordSetd RecordSetd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters index d740377569..ba38660607 100644 --- a/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7f718ae4-4fd1-4a5f-9391-b91c85ffa2f5} + {04938792-58ee-4204-a859-d72787dcc251} - {f755562f-6ac5-45f7-ae41-291b683aa88a} + {64c96dba-8adb-4f50-82ad-813cec8621a7} diff --git a/Data/samples/RecordSet/RecordSet_vs170.vcxproj b/Data/samples/RecordSet/RecordSet_vs170.vcxproj index 08f11314a4..bf8aa1774d 100644 --- a/Data/samples/RecordSet/RecordSet_vs170.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 RecordSetd RecordSetd RecordSetd @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters index c7b587983e..498cafecef 100644 --- a/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {96e43d12-7f78-4b66-a8b9-c83d2ef4822d} + {7c5a6207-168e-483a-9178-137eb4fe7c94} - {ed7a2499-d73a-4049-9ea4-5c4a6219b25f} + {884e5fd3-c762-4005-9022-5cc9233e7ad2} diff --git a/Data/samples/RowFormatter/RowFormatter.progen b/Data/samples/RowFormatter/RowFormatter.progen index 3d17f1e887..6781302a2a 100644 --- a/Data/samples/RowFormatter/RowFormatter.progen +++ b/Data/samples/RowFormatter/RowFormatter.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj index c6ae0576a2..1a0994317d 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 RowFormatterd RowFormatterd RowFormatterd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters index 566c8c7ab3..38cea0cb87 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {e8fd3902-0f2e-4d24-8875-5b11fe24c9ad} + {3ad09d7d-b664-4e90-b3cd-4ce3bc9879d8} - {8156dfb2-7719-4cd6-bd37-6199d5212f10} + {c9843f4a-d7fb-4208-a263-27204ea46108} diff --git a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj index 42112adae8..81d43f7d43 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 RowFormatterd RowFormatterd RowFormatterd @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters index 206a6f1e6f..1e1728c2ec 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {abbe8f59-688c-4083-bb17-30afaf3b4078} + {d6dc0224-8e20-4448-a3f3-dbaa93fbb9d5} - {b1637afe-a5e1-4f7a-99c0-6b7a5c67fe2e} + {6d098bbb-45f3-485b-a03b-3acb96fa3990} diff --git a/Data/samples/Tuple/Tuple.progen b/Data/samples/Tuple/Tuple.progen index 3d17f1e887..6781302a2a 100644 --- a/Data/samples/Tuple/Tuple.progen +++ b/Data/samples/Tuple/Tuple.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = iphlpapi.lib diff --git a/Data/samples/Tuple/Tuple_vs160.vcxproj b/Data/samples/Tuple/Tuple_vs160.vcxproj index 5b40487521..4fa0822450 100644 --- a/Data/samples/Tuple/Tuple_vs160.vcxproj +++ b/Data/samples/Tuple/Tuple_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Tupled Tupled Tupled @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/Tuple/Tuple_vs160.vcxproj.filters b/Data/samples/Tuple/Tuple_vs160.vcxproj.filters index 1a9d7e6203..46a79dacd3 100644 --- a/Data/samples/Tuple/Tuple_vs160.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {eeca3f66-a5ab-47b5-b81c-5a44a5755bd3} + {1629429b-617e-4ea4-9f8d-06d323ebd83c} - {2cf46c17-bed9-41a6-b881-e9f675c62755} + {89922025-3617-4582-be31-9c3d974baad8} diff --git a/Data/samples/Tuple/Tuple_vs170.vcxproj b/Data/samples/Tuple/Tuple_vs170.vcxproj index 32c4718efd..5c70ef77d9 100644 --- a/Data/samples/Tuple/Tuple_vs170.vcxproj +++ b/Data/samples/Tuple/Tuple_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 Tupled Tupled Tupled @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/Tuple/Tuple_vs170.vcxproj.filters b/Data/samples/Tuple/Tuple_vs170.vcxproj.filters index 00933f38c3..2bde381b62 100644 --- a/Data/samples/Tuple/Tuple_vs170.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {3fa1093b-2e2f-48d3-91bc-1faed241dfe1} + {4a0a9b18-9645-417d-bb54-3aa78efa99e5} - {89e9f080-6f25-42e9-bce1-121f839d2d69} + {9e092e72-1bb3-4d44-9529-92320bf5cd89} diff --git a/Data/samples/TypeHandler/TypeHandler.progen b/Data/samples/TypeHandler/TypeHandler.progen index ca2cc01c4d..92d852fb24 100644 --- a/Data/samples/TypeHandler/TypeHandler.progen +++ b/Data/samples/TypeHandler/TypeHandler.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj index 484d3a5e41..5ff40103c0 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TypeHandlerd TypeHandlerd TypeHandlerd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters index 75c2f9f43b..21112be0ed 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {468a4d19-1e0e-469a-baac-389509a364a5} + {858bc554-37cf-4a46-b83d-1aa57ab9a570} - {c36a0c8d-a274-4923-9454-07ca18b37d2f} + {32d2fa8a-1436-4ed4-bb83-22ddbd10f0d5} diff --git a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj index c618031dc5..0d102ed251 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 TypeHandlerd TypeHandlerd TypeHandlerd @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters index d006adc3a6..ed92f1e2b4 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {2080fcd4-75d2-47d1-8901-b6e36837010c} + {dc49fefc-30d8-4f5d-bfb0-a60fae7fb9d1} - {7dd4895e-fb1b-409c-a507-df11d3dabf37} + {7a14e818-f414-467e-82d4-8a8880506e49} diff --git a/Data/samples/WebNotifier/WebNotifier.progen b/Data/samples/WebNotifier/WebNotifier.progen index d3a2dbca0b..7cd65de84b 100644 --- a/Data/samples/WebNotifier/WebNotifier.progen +++ b/Data/samples/WebNotifier/WebNotifier.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\Data\\include;..\\..\\..\\Data\\SQLParser;..\\Data\\SQLParser\\src;..\\..\\..\\Data\\SQLite\\include;..\\..\\..\\Net\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib diff --git a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj index 58c398994a..fa835a178a 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 WebNotifierd WebNotifierd WebNotifierd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters index 208b412fa6..6a5a94dc2d 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters +++ b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7801ba72-87aa-4baf-b29b-d48867a82522} + {049e693f-0ec0-4c5a-9374-e95be92b7233} - {c9a95d09-32e7-4f73-84ef-26cacd824aab} + {a7b7810e-e914-49db-bad9-3c31c6481a4c} diff --git a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj index 4fd1fc901b..a1af34077c 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 WebNotifierd WebNotifierd WebNotifierd @@ -343,7 +343,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -357,6 +357,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -379,7 +380,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -392,6 +393,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -410,7 +412,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -424,6 +426,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -446,7 +449,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -459,6 +462,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -477,7 +481,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +495,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -513,7 +518,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -526,6 +531,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -544,7 +550,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -558,6 +564,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -580,7 +587,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -593,6 +600,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -611,7 +619,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -625,6 +633,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -647,7 +656,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -660,6 +669,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -678,7 +688,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -692,6 +702,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -714,7 +725,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -727,6 +738,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -745,7 +757,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -759,6 +771,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -781,7 +794,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -794,6 +807,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -812,7 +826,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -826,6 +840,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -848,7 +863,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -861,6 +876,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -879,7 +895,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -893,6 +909,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -915,7 +932,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\..\..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLParser;..\Data\SQLParser\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -928,6 +945,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters index 4d9d98858c..a5e9750f75 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters +++ b/Data/samples/WebNotifier/WebNotifier_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {a0e05d21-ad87-4322-8c68-d9cfb15cbd85} + {2737cb61-240f-4139-ad99-d16245702349} - {265b8749-8202-4f8e-be5b-46ba0e742cb5} + {a8dc8deb-601e-498c-b7b7-dd9d13d30ab2} diff --git a/Data/samples/samples_vs170.sln b/Data/samples/samples_vs170.sln index 372d7d38ab..6f30352e87 100644 --- a/Data/samples/samples_vs170.sln +++ b/Data/samples/samples_vs170.sln @@ -14,6 +14,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WebNotifier", "WebNotifier\ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -28,6 +34,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Build.0 = debug_shared|Win32 {0F0DF069-83D1-378D-A949-8DF9A883B627}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -64,6 +88,24 @@ Global {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.ActiveCfg = release_static_md|x64 {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Build.0 = release_static_md|x64 {0F0DF069-83D1-378D-A949-8DF9A883B627}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Build.0 = debug_shared|Win32 {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -100,6 +142,24 @@ Global {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.ActiveCfg = release_static_md|x64 {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Build.0 = release_static_md|x64 {FEE20DCE-B9E3-30AB-A40C-B6A324997328}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {133C62C7-3301-3F43-9ABF-14DF094A042F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -136,6 +196,24 @@ Global {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.ActiveCfg = release_static_md|x64 {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Build.0 = release_static_md|x64 {133C62C7-3301-3F43-9ABF-14DF094A042F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {F143DA5A-221A-3737-BCBA-F5BFD977038F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -172,6 +250,24 @@ Global {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.ActiveCfg = release_static_md|x64 {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Build.0 = release_static_md|x64 {F143DA5A-221A-3737-BCBA-F5BFD977038F}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Build.0 = debug_shared|Win32 {65A12348-CA20-324E-9F5E-7F82753C2C65}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -208,6 +304,24 @@ Global {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.ActiveCfg = release_static_md|x64 {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Build.0 = release_static_md|x64 {65A12348-CA20-324E-9F5E-7F82753C2C65}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|Win32.Build.0 = debug_shared|Win32 {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Data/testsuite/TestSuite_NO_SQL_PARSER.progen b/Data/testsuite/TestSuite_NO_SQL_PARSER.progen index 069754a66f..d5d307e479 100644 --- a/Data/testsuite/TestSuite_NO_SQL_PARSER.progen +++ b/Data/testsuite/TestSuite_NO_SQL_PARSER.progen @@ -7,4 +7,5 @@ vc.project.pocobase = ..\\.. vc.project.platforms = Win32 vc.project.configurations = debug_shared, release_shared, debug_static_mt, release_static_mt, debug_static_md, release_static_md vc.project.compiler.include = ..\\src;..\\..\\Foundation\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = iphlpapi.lib diff --git a/Data/testsuite/TestSuite_vs160.vcxproj b/Data/testsuite/TestSuite_vs160.vcxproj index 723e4adf8a..a941a505f5 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj +++ b/Data/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Data/testsuite/TestSuite_vs160.vcxproj.filters b/Data/testsuite/TestSuite_vs160.vcxproj.filters index c6fde03c1b..7c6eb9a194 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,55 +2,55 @@ - {dfd921ee-f44a-4469-bd36-16e73a4782eb} + {42b922ac-f7ec-4cf3-89e5-71161b3188d9} - {44f79575-87b7-457c-b17f-5c95658db37e} + {2f2a033c-7fd0-4a84-b20c-2ebde73a877c} - {d4ccd324-3061-4bfe-99f5-5d59560d0b79} + {974359b2-cd44-411e-95ca-53453f48fe6d} - {be3313fc-81dc-4ac7-99f8-34af544d5b8d} + {8157a4ee-77b2-4869-aa32-24547cff53cb} - {5cbc6e2e-d7e9-4259-9099-df738908f69f} + {b3e1bbc6-2417-4448-86f3-40d76b5d9cca} - {678c9607-0589-4909-926b-acfbd4ee993e} + {0f425069-7575-436d-82f7-ead37fa62ce3} - {b4eba29e-60d4-4c15-a067-54f08f43bcee} + {00cddbc5-1cba-42b3-b568-e33c9f87f9ec} - {952418c0-8de9-4baa-9153-39e52c0bde8c} + {502b1ab4-d378-4442-8e42-cd4ffcf1f377} - {8ae57633-9c90-49ca-9573-0414c03dadf3} + {d60995fe-1c34-443e-9661-33447da8f2e9} - {1b49dc10-5b24-413e-bbe6-e9b20ece7cb6} + {8df73687-9f6d-43eb-a89f-70e7ed00f7d2} - {6a34879c-4503-407b-b114-4fce615298a3} + {d2b0dd1f-3c3c-4566-8eb5-888f1535913d} - {4b4d8d5c-4bf4-48de-8382-fa995ceed795} + {db472067-b6d1-4aaf-8215-639e5e61dc18} - {5e2fdca1-603b-43ba-8fb9-13d339bb4a13} + {1413b92f-3499-4f45-a996-407435fd694d} - {8f88f0b0-1765-44e6-8bb1-da8933cf1561} + {a3ef0da6-4143-4ce1-9547-60ec2b9f3554} - {f4c50fd9-392e-451f-bc9d-68888d5eab85} + {d8258f55-ef0e-4421-95cd-07496830f7fc} - {f59b0b24-007a-4a91-9b10-3183563e1c3d} + {3e20014c-0e66-4f19-9655-c7a64b3b1eb9} - {129e1247-b096-45d4-87fa-077f3f6433df} + {1db06b52-ddad-44fd-8d8d-9c4c3a23b738} diff --git a/Data/testsuite/TestSuite_vs170.vcxproj b/Data/testsuite/TestSuite_vs170.vcxproj index 498f42277f..d93f857c9b 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj +++ b/Data/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Data/testsuite/TestSuite_vs170.vcxproj.filters b/Data/testsuite/TestSuite_vs170.vcxproj.filters index 9c98b1403c..f0a367e3b7 100644 --- a/Data/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,55 +2,55 @@ - {2d95d7a3-3de5-4536-b35d-73126427acde} + {cd871ea3-0755-4ea0-b2ce-8a328b580404} - {1be5b99c-df18-4cf6-864c-4dfff3baace1} + {4abca3dc-759d-4036-a019-05df4081a3ce} - {dac6e4c4-bf63-44b7-a361-e52b028d8729} + {a8ec64a9-ce7e-4259-a8c3-f3c6fa1ca0b4} - {41739753-7509-4581-bc29-dcbd1d2c2b6d} + {a31797b5-b54d-4768-b9a9-c0cdb0aff79e} - {a4d172ec-3e50-4146-8ba6-91b5527eefd0} + {98836981-622b-4d5e-9298-6ffeb5168db2} - {d252092c-e433-431a-9237-88a3f9a0aa92} + {d5192e0d-778c-4dc1-b368-efac8628db51} - {8a7ff23d-a28d-4dd0-afd9-f60b5b8f337a} + {1344e041-38e3-4d66-8c53-7d6ea6596ea8} - {867d2910-998f-4057-82b4-b65bbcb1b6b9} + {589bc34b-11ed-4faa-83a0-fc54cabf2aa5} - {5693e2c5-1245-4cbe-953d-57f8e396d0d1} + {1f552062-33af-476c-8ef0-cc39c9815754} - {9b5cdfa0-e245-4da8-b190-6699d839b8b7} + {7a506331-3585-4fa4-b211-ecd3a4570db6} - {9fe6fa0d-437f-4bda-af9a-bcab22e9070e} + {c7fe6789-3193-4628-bde0-f7a0b03f8cdf} - {1437295f-7705-4bd6-bc74-50811f065598} + {1e108f03-426a-4a9d-9dfe-322106bd8de0} - {5a8b7cd1-b39c-497c-a84f-092ce8a2a7a9} + {ec40fa1c-6b0b-4280-a4df-13a38881c94e} - {8f9d6234-d59f-45c5-9272-ee297d9529c6} + {2a629c0c-c671-4a1a-aaec-07f8ff34ef73} - {4339971d-89a1-42e5-8572-3c8be078b693} + {68969b6b-b5e5-4a1a-95b6-791bf2dc9e6a} - {06452f5d-7f36-4d95-b1de-2c35381751ef} + {b23b6f14-3757-4d15-b92c-5a4be0769ccc} - {12079bde-b58f-46ef-8b78-e9479341c660} + {20bb4986-cc46-4329-97ab-2331222d5e9f} diff --git a/Encodings/Compiler/Compiler.progen b/Encodings/Compiler/Compiler.progen index 724d3e9c4f..e3fa8996a0 100644 --- a/Encodings/Compiler/Compiler.progen +++ b/Encodings/Compiler/Compiler.progen @@ -12,5 +12,6 @@ vc.project.compiler.defines = vc.project.compiler.defines.shared = vc.project.compiler.defines.debug_shared = ${vc.project.compiler.defines.shared} vc.project.compiler.defines.release_shared = ${vc.project.compiler.defines.shared} +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies = ws2_32.lib iphlpapi.lib vc.solution.create = true diff --git a/Encodings/Compiler/Compiler_vs170.sln b/Encodings/Compiler/Compiler_vs170.sln index ec86d9448b..fbcd50087d 100644 --- a/Encodings/Compiler/Compiler_vs170.sln +++ b/Encodings/Compiler/Compiler_vs170.sln @@ -4,12 +4,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Compiler", "Compiler_vs170. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution - debug_shared|ARM64 = debug_shared|ARM64 - release_shared|ARM64 = release_shared|ARM64 - debug_static_mt|ARM64 = debug_static_mt|ARM64 - release_static_mt|ARM64 = release_static_mt|ARM64 - debug_static_md|ARM64 = debug_static_md|ARM64 - release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -24,24 +18,6 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.Build.0 = release_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 - {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.Build.0 = debug_shared|Win32 {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Encodings/Compiler/Compiler_vs170.vcxproj b/Encodings/Compiler/Compiler_vs170.vcxproj index b5255def97..6e1c446941 100644 --- a/Encodings/Compiler/Compiler_vs170.vcxproj +++ b/Encodings/Compiler/Compiler_vs170.vcxproj @@ -1,10 +1,6 @@ - + - - debug_shared - ARM64 - debug_shared Win32 @@ -13,10 +9,6 @@ debug_shared x64 - - debug_static_md - ARM64 - debug_static_md Win32 @@ -25,10 +17,6 @@ debug_static_md x64 - - debug_static_mt - ARM64 - debug_static_mt Win32 @@ -37,10 +25,6 @@ debug_static_mt x64 - - release_shared - ARM64 - release_shared Win32 @@ -49,10 +33,6 @@ release_shared x64 - - release_static_md - ARM64 - release_static_md Win32 @@ -61,10 +41,6 @@ release_static_md x64 - - release_static_mt - ARM64 - release_static_mt Win32 @@ -75,7 +51,6 @@ - 17.0 Compiler {0AAD946B-C771-4ED2-BFAF-1D0DBE4A6710} Compiler @@ -112,36 +87,6 @@ MultiByte v143 - - Application - MultiByte - v143 - - - Application - MultiByte - v143 - - - Application - MultiByte - v143 - - - Application - MultiByte - v143 - - - Application - MultiByte - v143 - - - Application - MultiByte - v143 - Application MultiByte @@ -192,24 +137,6 @@ - - - - - - - - - - - - - - - - - - @@ -230,13 +157,7 @@ - <_ProjectFileVersion>17.0.32505.173 - tecd - tecd - tecd - tec - tec - tec + <_ProjectFileVersion>15.0.28307.799 tecd tecd tecd @@ -250,36 +171,6 @@ tec tec - - binA64\ - objA64\Compiler\$(Configuration)\ - true - - - binA64\ - objA64\Compiler\$(Configuration)\ - false - - - binA64\static_mt\ - objA64\Compiler\$(Configuration)\ - true - - - binA64\static_mt\ - objA64\Compiler\$(Configuration)\ - false - - - binA64\static_md\ - objA64\Compiler\$(Configuration)\ - true - - - binA64\static_md\ - objA64\Compiler\$(Configuration)\ - false - bin\ obj\Compiler\$(Configuration)\ @@ -340,189 +231,6 @@ obj64\Compiler\$(Configuration)\ false - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\tecd.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - true - true - binA64\tecd.pdb - Console - MachineARM64 - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - true - - - ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\tec.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineARM64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebug - true - true - true - true - - Level3 - ProgramDatabase - Default - true - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\tecd.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - true - true - binA64\static_mt\tecd.pdb - Console - MachineARM64 - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreaded - false - true - true - true - - Level3 - - Default - true - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\tec.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineARM64 - - - - - Disabled - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - EnableFastChecks - MultiThreadedDebugDLL - true - true - true - true - - Level3 - ProgramDatabase - Default - true - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\tecd.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - true - true - binA64\static_md\tecd.pdb - Console - MachineARM64 - - - - - MaxSpeed - OnlyExplicitInline - true - Speed - true - .\include;..\..\Foundation\include;..\..\XML\include;..\..\Util\include;..\..\Net\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) - true - MultiThreadedDLL - false - true - true - true - - Level3 - - Default - true - - - iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\tec.exe - ..\..\libA64;%(AdditionalLibraryDirectories) - false - Console - true - true - MachineARM64 - - Disabled diff --git a/Encodings/Encodings.progen b/Encodings/Encodings.progen index ebbfaf607f..88a4ce2fdb 100644 --- a/Encodings/Encodings.progen +++ b/Encodings/Encodings.progen @@ -12,5 +12,6 @@ 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.project.compiler.additionalOptions = /Zc:__cplusplus vc.solution.create = true vc.solution.include = testsuite\\TestSuite diff --git a/Encodings/Encodings_vs160.vcxproj b/Encodings/Encodings_vs160.vcxproj index 914fee669c..1b82a40b34 100644 --- a/Encodings/Encodings_vs160.vcxproj +++ b/Encodings/Encodings_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoEncodingsd PocoEncodingsmdd PocoEncodingsmtd @@ -241,6 +241,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -276,6 +277,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -309,6 +311,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -337,6 +340,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -362,6 +366,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -390,6 +395,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -415,6 +421,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +457,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -483,6 +491,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -511,6 +520,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -536,6 +546,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -564,6 +575,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Encodings/Encodings_vs160.vcxproj.filters b/Encodings/Encodings_vs160.vcxproj.filters index d0bb7b9732..54153ec9d7 100644 --- a/Encodings/Encodings_vs160.vcxproj.filters +++ b/Encodings/Encodings_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {d2eaf225-f3a3-445f-b77a-7ec8123b1ba5} + {16b27280-27fe-464e-ab9d-8b424b5f3ac8} - {91086300-388f-4f27-b8c0-b06c8137482a} + {81582967-7c81-419b-8e71-cdb621123fb5} - {a414b00d-415e-4006-80f3-0830a8901a9d} + {ae2c084a-6f2e-4fe8-b47c-40290a7efa8d} diff --git a/Encodings/Encodings_vs170.vcxproj b/Encodings/Encodings_vs170.vcxproj index 09e052f5ee..7b761235e6 100644 --- a/Encodings/Encodings_vs170.vcxproj +++ b/Encodings/Encodings_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoEncodingsA64d PocoEncodingsmdd PocoEncodingsmtd @@ -345,6 +345,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -380,6 +381,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -413,6 +415,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -441,6 +444,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -466,6 +470,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -494,6 +499,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -519,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -554,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -587,6 +595,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -615,6 +624,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -640,6 +650,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -668,6 +679,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -693,6 +705,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -728,6 +741,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -761,6 +775,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -789,6 +804,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -814,6 +830,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -842,6 +859,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Encodings/Encodings_vs170.vcxproj.filters b/Encodings/Encodings_vs170.vcxproj.filters index c72befa1ff..64116ee0a9 100644 --- a/Encodings/Encodings_vs170.vcxproj.filters +++ b/Encodings/Encodings_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {5e7cb9a9-a1d1-4be0-825e-5167afe689d7} + {3b223c49-df37-4d33-993d-93018cb52d6d} - {5c9c20dc-87cd-4647-a4ec-cc24e3a1bb11} + {4e205ead-0511-4400-98b1-dcc7a0ce4831} - {72db566e-b1f8-4622-a480-2ffc9b6c6065} + {ff2e9b80-6f03-4e70-9dd5-20c4cd343baf} diff --git a/Encodings/samples/TextConverter/TextConverter.progen b/Encodings/samples/TextConverter/TextConverter.progen index ccd636a33c..bf04023b16 100644 --- a/Encodings/samples/TextConverter/TextConverter.progen +++ b/Encodings/samples/TextConverter/TextConverter.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\Encodings\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj b/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj index ddd7d62565..a929e5c742 100644 --- a/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj +++ b/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TextConverterd TextConverterd TextConverterd @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters b/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters index d13cf76fdd..b0c3e32cd8 100644 --- a/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters +++ b/Encodings/samples/TextConverter/TextConverter_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {cc73a153-ea12-498d-9bf1-8cff466daca3} + {4c6126f2-2d98-4ad0-b746-7d03d303907f} - {c1d83b77-89fb-4666-be38-457ed90f6865} + {d82ed2ad-5174-4d99-8c28-e217914110ff} diff --git a/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj b/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj index 2bf7458aab..ff6ef29578 100644 --- a/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj +++ b/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 TextConverter {3CCF9527-B5D9-3522-84C3-C8E5381D7661} TextConverter @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + TextConverterd + TextConverterd + TextConverterd + TextConverter + TextConverter + TextConverter TextConverterd TextConverterd TextConverterd @@ -171,6 +250,36 @@ TextConverter TextConverter + + binA64\ + objA64\TextConverter\$(Configuration)\ + true + + + binA64\ + objA64\TextConverter\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\TextConverter\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\TextConverter\$(Configuration)\ + false + + + binA64\static_md\ + objA64\TextConverter\$(Configuration)\ + true + + + binA64\static_md\ + objA64\TextConverter\$(Configuration)\ + false + bin\ obj\TextConverter\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\TextConverter\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\TextConverter.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TextConverterd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TextConverter.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\TextConverterd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Encodings\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TextConverterd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj.filters b/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj.filters index d56030f3e4..53bc5d4de9 100644 --- a/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj.filters +++ b/Encodings/samples/TextConverter/TextConverter_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {ef5e65a7-e81b-4c22-be25-d208a64f8533} + {8fda1e51-a1f3-4ac1-9a8a-ff1070b56e88} - {5c3e0d5d-7090-4db8-964a-2616f64e3990} + {49ce66a7-68f9-4bc2-a997-4b9df3f2718b} diff --git a/Encodings/samples/samples_vs170.sln b/Encodings/samples/samples_vs170.sln index ea92a5064d..0a97da85d3 100644 --- a/Encodings/samples/samples_vs170.sln +++ b/Encodings/samples/samples_vs170.sln @@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TextConverter", "TextConver EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -18,6 +24,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|Win32.Build.0 = debug_shared|Win32 {3CCF9527-B5D9-3522-84C3-C8E5381D7661}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Encodings/testsuite/TestSuite.progen b/Encodings/testsuite/TestSuite.progen index bb69d812b9..0d83ea3071 100644 --- a/Encodings/testsuite/TestSuite.progen +++ b/Encodings/testsuite/TestSuite.progen @@ -7,3 +7,4 @@ vc.project.platforms = Win32 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;..\\..\\Encodings\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus diff --git a/Encodings/testsuite/TestSuite_vs160.vcxproj b/Encodings/testsuite/TestSuite_vs160.vcxproj index 1469a3c15a..ff0c09ce6f 100644 --- a/Encodings/testsuite/TestSuite_vs160.vcxproj +++ b/Encodings/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -249,6 +249,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -284,6 +285,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -316,6 +318,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -351,6 +354,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -383,6 +387,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -418,6 +423,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -450,6 +456,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -485,6 +492,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -517,6 +525,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -552,6 +561,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -584,6 +594,7 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -619,6 +630,7 @@ Default $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 diff --git a/Encodings/testsuite/TestSuite_vs160.vcxproj.filters b/Encodings/testsuite/TestSuite_vs160.vcxproj.filters index 9d2e324e08..898cfbff4d 100644 --- a/Encodings/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {abc004ad-578b-4f51-ac60-c071f04c4028} + {dfee0110-d287-48a7-88e0-1265dcc90e7c} - {294b52e1-6341-4ca4-bd72-1c4f835531d3} + {4f0e3b21-3aa5-4d12-8485-3bc15516325a} diff --git a/Encodings/testsuite/TestSuite_vs170.vcxproj b/Encodings/testsuite/TestSuite_vs170.vcxproj index bca98e1d30..31447118fd 100644 --- a/Encodings/testsuite/TestSuite_vs170.vcxproj +++ b/Encodings/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -892,12 +964,18 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Encodings/testsuite/TestSuite_vs170.vcxproj.filters b/Encodings/testsuite/TestSuite_vs170.vcxproj.filters index 5a98ca0ffc..4f700cda53 100644 --- a/Encodings/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Encodings/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {0a7ac900-537d-4cc6-b888-d14e5b5b02ec} + {5c40f4bd-5cac-49cd-873e-0563409b5ae6} - {9046c505-595a-4358-816a-faa0d47dbd59} + {4f53facd-52c2-4b5e-81b3-2f128c03fd08} diff --git a/Foundation/Foundation_vs160.vcxproj b/Foundation/Foundation_vs160.vcxproj index b0fe2c1d4f..1e6b330354 100644 --- a/Foundation/Foundation_vs160.vcxproj +++ b/Foundation/Foundation_vs160.vcxproj @@ -243,6 +243,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -309,6 +310,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -380,6 +382,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmtd.lib @@ -433,6 +436,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmt.lib @@ -488,6 +492,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmdd.lib @@ -542,6 +547,7 @@ Default true stdcpp17 + /Zc:__cplusplus %(AdditionalOptions) diff --git a/Foundation/Foundation_vs170.vcxproj b/Foundation/Foundation_vs170.vcxproj index f79c42792f..13d18003ee 100644 --- a/Foundation/Foundation_vs170.vcxproj +++ b/Foundation/Foundation_vs170.vcxproj @@ -340,6 +340,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -371,6 +374,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -404,6 +410,7 @@ $(OutDir)$(TargetName).pdb stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -436,6 +443,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -472,6 +482,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -510,6 +523,7 @@ $(OutDir)$(TargetName).pdb stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) iphlpapi.lib;%(AdditionalDependencies) @@ -542,6 +556,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmtd.lib @@ -567,6 +584,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib64\PocoFoundationmtd.lib @@ -593,6 +613,7 @@ true stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) $(OutDir)$(TargetName).lib @@ -618,6 +639,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmt.lib @@ -646,6 +670,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib64\PocoFoundationmt.lib @@ -675,6 +702,7 @@ true stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) $(OutDir)$(TargetName).lib @@ -699,6 +727,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib\PocoFoundationmdd.lib @@ -724,6 +755,9 @@ ProgramDatabase Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) ..\lib64\PocoFoundationmdd.lib @@ -750,6 +784,7 @@ true stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) $(OutDir)$(TargetName).lib @@ -776,6 +811,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) @@ -807,6 +845,9 @@ Default true + stdcpp17 + stdc11 + /Zc:__cplusplus %(AdditionalOptions) @@ -839,6 +880,7 @@ true stdcpp17 stdc11 + /Zc:__cplusplus %(AdditionalOptions) @@ -2462,4 +2504,4 @@ - + \ No newline at end of file diff --git a/Foundation/Foundation_vs170.vcxproj.filters b/Foundation/Foundation_vs170.vcxproj.filters index 15652e5bdf..f06337f924 100644 --- a/Foundation/Foundation_vs170.vcxproj.filters +++ b/Foundation/Foundation_vs170.vcxproj.filters @@ -921,6 +921,8 @@ RegularExpression\PCRE2 Source Files + + diff --git a/Foundation/include/Poco/Config.h b/Foundation/include/Poco/Config.h index 66a50fdd18..cd01069d7b 100644 --- a/Foundation/include/Poco/Config.h +++ b/Foundation/include/Poco/Config.h @@ -171,33 +171,6 @@ // #define POCO_LOG_DEBUG -// OpenSSL on Windows -// -// Poco has its own OpenSSL build system. -// See -// for details. -// -// These options are Windows only. -// -// To disable the use of Poco-provided OpenSSL binaries, -// define POCO_EXTERNAL_OPENSSL. -// -// Possible values: -// POCO_EXTERNAL_OPENSSL_SLPRO: -// Automatically link OpenSSL libraries from OpenSSL Windows installer provided -// by Shining Light Productions -// The (global) library search path must be set accordingly. -// POCO_EXTERNAL_OPENSSL_DEFAULT: -// Automatically link OpenSSL libraries from standard OpenSSL Windows build. -// The (global) library search path must be set accordingly. -// empty or other value: -// Do not link any OpenSSL libraries automatically. You will have to edit the -// Visual C++ project files for Crypto and NetSSL_OpenSSL. -#if !defined(POCO_EXTERNAL_OPENSSL) && defined(POCO_EXTERNAL_OPENSSL_SLPRO) - #define POCO_EXTERNAL_OPENSSL POCO_EXTERNAL_OPENSSL_SLPRO -#endif - - // Define to prevent changing the suffix for shared libraries // to "d.so", "d.dll", etc. for _DEBUG builds in Poco::SharedLibrary. // #define POCO_NO_SHARED_LIBRARY_DEBUG_SUFFIX diff --git a/Foundation/include/Poco/MemoryStream.h b/Foundation/include/Poco/MemoryStream.h index 1db3a2c236..a537307674 100644 --- a/Foundation/include/Poco/MemoryStream.h +++ b/Foundation/include/Poco/MemoryStream.h @@ -140,6 +140,12 @@ class BasicMemoryStreamBuf: public std::basic_streambuf return newoff; } + + virtual pos_type seekpos(pos_type pos, std::ios_base::openmode which = std::ios_base::in | std::ios_base::out) + { + const off_type off = pos; + return seekoff(off, std::ios::beg, which); + } virtual int sync() { diff --git a/Foundation/include/Poco/Thread.h b/Foundation/include/Poco/Thread.h index 56f45e561d..00d3da09e8 100644 --- a/Foundation/include/Poco/Thread.h +++ b/Foundation/include/Poco/Thread.h @@ -72,7 +72,7 @@ class Foundation_API Thread: private ThreadImpl Thread(uint32_t sigMask = 0); /// Creates a thread. Call start() to start it. - /// + /// /// The optional sigMask parameter specifies which signals should be blocked. /// To block a specific signal, set the corresponding bit in the sigMask. /// Multiple bits can be set in the mask to block multiple signals if needed. @@ -81,7 +81,7 @@ class Foundation_API Thread: private ThreadImpl Thread(const std::string& name, uint32_t sigMask = 0); /// Creates a named thread. Call start() to start it. - /// + /// /// The optional sigMask parameter specifies which signals should be blocked. /// To block a specific signal, set the corresponding bit in the sigMask. /// Multiple bits can be set in the mask to block multiple signals if needed. @@ -243,6 +243,7 @@ class Foundation_API Thread: private ThreadImpl static long currentOsTid(); /// Returns the operating system specific thread ID for the current thread. + /// On error, or if the platform does not support this functionality, it returns zero. bool setAffinity(int coreId); /// Sets the thread affinity to the coreID. diff --git a/Foundation/include/Poco/Version.h b/Foundation/include/Poco/Version.h index 6f8fdcb248..eff51feded 100644 --- a/Foundation/include/Poco/Version.h +++ b/Foundation/include/Poco/Version.h @@ -36,6 +36,6 @@ // Bx: beta releases // -#define POCO_VERSION 0x010D0200 +#define POCO_VERSION 0x010D0300 #endif // Foundation_Version_INCLUDED diff --git a/Foundation/samples/ActiveMethod/ActiveMethod.progen b/Foundation/samples/ActiveMethod/ActiveMethod.progen index 7c2c98bb52..518a9d34ac 100644 --- a/Foundation/samples/ActiveMethod/ActiveMethod.progen +++ b/Foundation/samples/ActiveMethod/ActiveMethod.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/samples/Activity/Activity.progen b/Foundation/samples/Activity/Activity.progen index 7c2c98bb52..518a9d34ac 100644 --- a/Foundation/samples/Activity/Activity.progen +++ b/Foundation/samples/Activity/Activity.progen @@ -7,4 +7,5 @@ vc.project.platforms = Win32 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 = ..\\..\\..\\Foundation\\include +vc.project.compiler.additionalOptions = /Zc:__cplusplus vc.project.linker.dependencies.Win32 = ws2_32.lib iphlpapi.lib diff --git a/Foundation/src/BinaryWriter.cpp b/Foundation/src/BinaryWriter.cpp index 4362edf30c..ea389ac11d 100644 --- a/Foundation/src/BinaryWriter.cpp +++ b/Foundation/src/BinaryWriter.cpp @@ -336,7 +336,7 @@ void BinaryWriter::writeRaw(const char* buffer, std::streamsize length) void BinaryWriter::writeCString(const char* cString, std::streamsize maxLength) { - const std::size_t len = ::strnlen(cString, maxLength); + const std::size_t len = ::strnlen(cString, static_cast(maxLength)); writeRaw(cString, len); static const char zero = '\0'; _ostr.write(&zero, sizeof(zero)); diff --git a/Foundation/src/DateTimeFormat.cpp b/Foundation/src/DateTimeFormat.cpp index da25d6e8c8..27057143a0 100644 --- a/Foundation/src/DateTimeFormat.cpp +++ b/Foundation/src/DateTimeFormat.cpp @@ -67,7 +67,7 @@ const std::string DateTimeFormat::RFC850_REGEX( const std::string DateTimeFormat::RFC1036_FORMAT("%W, %e %b %y %H:%M:%S %Z"); const std::string DateTimeFormat::RFC1036_REGEX( - "(((Monday)|(Tuesday)|(Wednesday)|(Thursday)|(Friday)|(Saturday)|(Sun)), *)?" + "(((Monday)|(Tuesday)|(Wednesday)|(Thursday)|(Friday)|(Saturday)|(Sunday)), *)?" "\\d\\d? +" "((Jan)|(Feb)|(Mar)|(Apr)|(May)|(Jun)|(Jul)|(Aug)|(Sep)|(Oct)|(Nov)|(Dec)) +" "\\d\\d(\\d\\d)? +\\d\\d:\\d\\d(:\\d\\d)? " diff --git a/Foundation/src/Latin9Encoding.cpp b/Foundation/src/Latin9Encoding.cpp index 3f403540a3..bb33b48dba 100644 --- a/Foundation/src/Latin9Encoding.cpp +++ b/Foundation/src/Latin9Encoding.cpp @@ -97,17 +97,20 @@ int Latin9Encoding::convert(int ch, unsigned char* bytes, int length) const *bytes = ch; return 1; } - else switch (ch) + else { - case 0x0152: if (bytes && length >= 1) *bytes = 0xbc; return 1; - case 0x0153: if (bytes && length >= 1) *bytes = 0xbd; return 1; - case 0x0160: if (bytes && length >= 1) *bytes = 0xa6; return 1; - case 0x0161: if (bytes && length >= 1) *bytes = 0xa8; return 1; - case 0x017d: if (bytes && length >= 1) *bytes = 0xb4; return 1; - case 0x017e: if (bytes && length >= 1) *bytes = 0xb8; return 1; - case 0x0178: if (bytes && length >= 1) *bytes = 0xbe; return 1; - case 0x20ac: if (bytes && length >= 1) *bytes = 0xa4; return 1; - default: return 0; + switch (ch) + { + case 0x0152: if (bytes && length >= 1) *bytes = 0xbc; return 1; + case 0x0153: if (bytes && length >= 1) *bytes = 0xbd; return 1; + case 0x0160: if (bytes && length >= 1) *bytes = 0xa6; return 1; + case 0x0161: if (bytes && length >= 1) *bytes = 0xa8; return 1; + case 0x017d: if (bytes && length >= 1) *bytes = 0xb4; return 1; + case 0x017e: if (bytes && length >= 1) *bytes = 0xb8; return 1; + case 0x0178: if (bytes && length >= 1) *bytes = 0xbe; return 1; + case 0x20ac: if (bytes && length >= 1) *bytes = 0xa4; return 1; + default: return 0; + } } } diff --git a/Foundation/src/Process_WIN32U.cpp b/Foundation/src/Process_WIN32U.cpp index ffbf6cdc22..57f1a80728 100644 --- a/Foundation/src/Process_WIN32U.cpp +++ b/Foundation/src/Process_WIN32U.cpp @@ -280,7 +280,11 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg { startupInfo.hStdInput = 0; } - if (options & PROCESS_CLOSE_STDIN) CloseHandle(GetStdHandle(STD_INPUT_HANDLE)); + if (options & PROCESS_CLOSE_STDIN) + { + HANDLE hStdIn = GetStdHandle(STD_INPUT_HANDLE); + if (hStdIn) CloseHandle(hStdIn); + } // outPipe may be the same as errPipe, so we duplicate first and close later. if (outPipe) @@ -312,9 +316,17 @@ ProcessHandleImpl* ProcessImpl::launchImpl(const std::string& command, const Arg startupInfo.hStdError = 0; } if (outPipe) outPipe->close(Pipe::CLOSE_WRITE); - if (options & PROCESS_CLOSE_STDOUT) CloseHandle(GetStdHandle(STD_OUTPUT_HANDLE)); + if (options & PROCESS_CLOSE_STDOUT) + { + HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + if (hStdOut) CloseHandle(hStdOut); + } if (errPipe) errPipe->close(Pipe::CLOSE_WRITE); - if (options & PROCESS_CLOSE_STDERR) CloseHandle(GetStdHandle(STD_ERROR_HANDLE)); + if (options & PROCESS_CLOSE_STDERR) + { + HANDLE hStdErr = GetStdHandle(STD_ERROR_HANDLE); + if (hStdErr) CloseHandle(hStdErr); + } if (mustInheritHandles) { diff --git a/Foundation/src/Thread_POSIX.cpp b/Foundation/src/Thread_POSIX.cpp index 0cc89cb18d..3b39f8d32b 100644 --- a/Foundation/src/Thread_POSIX.cpp +++ b/Foundation/src/Thread_POSIX.cpp @@ -21,6 +21,8 @@ #include "Poco/Timestamp.h" #include "Poco/Format.h" #include +#include + #if POCO_OS == POCO_OS_FREE_BSD # include @@ -28,6 +30,7 @@ # include #endif + #if defined(__sun) && defined(__SVR4) # if !defined(__EXTENSIONS__) # define __EXTENSIONS__ @@ -37,7 +40,8 @@ # include #endif -#if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID || POCO_OS == POCO_OS_FREE_BSD + +#if POCO_OS == POCO_OS_LINUX || POCO_OS == POCO_OS_ANDROID # include #endif @@ -75,6 +79,7 @@ namespace } #endif + namespace { std::string truncName(const std::string& name, int nameSize = POCO_MAX_THREAD_NAME_LEN) @@ -88,7 +93,7 @@ namespace /// Sets thread name. Support for this feature varies /// on platforms. Any errors are ignored. { -#if ((POCO_OS == POCO_OS_FREE_BSD) && (__FreeBSD_version < 1300000)) +#if (POCO_OS == POCO_OS_FREE_BSD) pthread_setname_np(pthread_self(), truncName(threadName).c_str()); #elif (POCO_OS == POCO_OS_MAC_OS_X) #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED @@ -106,7 +111,7 @@ namespace std::string getThreadName() { char name[POCO_MAX_THREAD_NAME_LEN + 1]{'\0'}; -#if ((POCO_OS == POCO_OS_FREE_BSD) && (__FreeBSD_version < 1300000)) +#if (POCO_OS == POCO_OS_FREE_BSD) pthread_getname_np(pthread_self(), name, POCO_MAX_THREAD_NAME_LEN + 1); #elif (POCO_OS == POCO_OS_MAC_OS_X) #ifdef __MAC_OS_X_VERSION_MIN_REQUIRED @@ -145,6 +150,7 @@ ThreadImpl::~ThreadImpl() } } + void ThreadImpl::setNameImpl(const std::string& threadName) { std::string realName = threadName; @@ -309,6 +315,7 @@ void ThreadImpl::startImpl(SharedPtr pTarget) } } _pData->started = true; + _pData->joined = false; pthread_attr_destroy(&attributes); if (_pData->policy == SCHED_OTHER) @@ -335,10 +342,16 @@ void ThreadImpl::joinImpl() { if (!_pData->started) return; _pData->done.wait(); - void* result; - if (pthread_join(_pData->thread, &result)) - throw SystemException("cannot join thread"); - _pData->joined = true; + if (!_pData->joined) + { + int errorCode; + if ((errorCode = pthread_join(_pData->thread, nullptr))) + { + throw SystemException(Poco::format("cannot join thread (%s)", + Error::getMessage(errorCode))); + } + _pData->joined = true; + } } @@ -368,23 +381,18 @@ ThreadImpl::TIDImpl ThreadImpl::currentTidImpl() return pthread_self(); } + long ThreadImpl::currentOsTidImpl() { -#if defined(POCO_EMSCRIPTEN) - return ::pthread_self(); -#elif POCO_OS == POCO_OS_LINUX - return ::syscall(SYS_gettid); + long id = 0; +#if (POCO_OS == POCO_OS_LINUX) && !defined(POCO_EMSCRIPTEN) + id = ::syscall(SYS_gettid); #elif POCO_OS == POCO_OS_MAC_OS_X - return ::pthread_mach_thread_np(::pthread_self()); + id = ::pthread_mach_thread_np(::pthread_self()); #elif POCO_OS == POCO_OS_FREE_BSD - long id; - if(thr_self(&id) < 0) { - return 0; - } - return id; -#else - return ::pthread_self(); + if (0 != thr_self(&id)) id = 0; #endif + return id; } diff --git a/Foundation/src/URI.cpp b/Foundation/src/URI.cpp index e64629fb21..bc7582b489 100644 --- a/Foundation/src/URI.cpp +++ b/Foundation/src/URI.cpp @@ -857,7 +857,8 @@ void URI::parseHostAndPort(std::string::const_iterator& it, const std::string::c } else _port = 0; _host = host; - toLowerInPlace(_host); + if (_host.size() && _host[0] != '%') + toLowerInPlace(_host); } diff --git a/Foundation/src/Windows1250Encoding.cpp b/Foundation/src/Windows1250Encoding.cpp index 764d9e8972..03c8d8ed63 100644 --- a/Foundation/src/Windows1250Encoding.cpp +++ b/Foundation/src/Windows1250Encoding.cpp @@ -98,82 +98,85 @@ int Windows1250Encoding::convert(int ch, unsigned char* bytes, int length) const *bytes = (unsigned char) ch; return 1; } - else switch(ch) + else { - case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1; - case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; - case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; - case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; - case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; - case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; - case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; - case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1; - case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; - case 0x015a: if (bytes && length >= 1) *bytes = 0x8c; return 1; - case 0x0164: if (bytes && length >= 1) *bytes = 0x8d; return 1; - case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1; - case 0x0179: if (bytes && length >= 1) *bytes = 0x8f; return 1; - case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; - case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; - case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; - case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; - case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; - case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; - case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; - case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; - case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1; - case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; - case 0x015b: if (bytes && length >= 1) *bytes = 0x9c; return 1; - case 0x0165: if (bytes && length >= 1) *bytes = 0x9d; return 1; - case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1; - case 0x017a: if (bytes && length >= 1) *bytes = 0x9f; return 1; - case 0x02c7: if (bytes && length >= 1) *bytes = 0xa1; return 1; - case 0x02d8: if (bytes && length >= 1) *bytes = 0xa2; return 1; - case 0x0141: if (bytes && length >= 1) *bytes = 0xa3; return 1; - case 0x0104: if (bytes && length >= 1) *bytes = 0xa5; return 1; - case 0x015e: if (bytes && length >= 1) *bytes = 0xaa; return 1; - case 0x017b: if (bytes && length >= 1) *bytes = 0xaf; return 1; - case 0x02db: if (bytes && length >= 1) *bytes = 0xb2; return 1; - case 0x0142: if (bytes && length >= 1) *bytes = 0xb3; return 1; - case 0x0105: if (bytes && length >= 1) *bytes = 0xb9; return 1; - case 0x015f: if (bytes && length >= 1) *bytes = 0xba; return 1; - case 0x013d: if (bytes && length >= 1) *bytes = 0xbc; return 1; - case 0x02dd: if (bytes && length >= 1) *bytes = 0xbd; return 1; - case 0x013e: if (bytes && length >= 1) *bytes = 0xbe; return 1; - case 0x017c: if (bytes && length >= 1) *bytes = 0xbf; return 1; - case 0x0154: if (bytes && length >= 1) *bytes = 0xc0; return 1; - case 0x0102: if (bytes && length >= 1) *bytes = 0xc3; return 1; - case 0x0139: if (bytes && length >= 1) *bytes = 0xc5; return 1; - case 0x0106: if (bytes && length >= 1) *bytes = 0xc6; return 1; - case 0x010c: if (bytes && length >= 1) *bytes = 0xc8; return 1; - case 0x0118: if (bytes && length >= 1) *bytes = 0xca; return 1; - case 0x011a: if (bytes && length >= 1) *bytes = 0xcc; return 1; - case 0x010e: if (bytes && length >= 1) *bytes = 0xcf; return 1; - case 0x0110: if (bytes && length >= 1) *bytes = 0xd0; return 1; - case 0x0143: if (bytes && length >= 1) *bytes = 0xd1; return 1; - case 0x0147: if (bytes && length >= 1) *bytes = 0xd2; return 1; - case 0x0150: if (bytes && length >= 1) *bytes = 0xd5; return 1; - case 0x0158: if (bytes && length >= 1) *bytes = 0xd8; return 1; - case 0x016e: if (bytes && length >= 1) *bytes = 0xd9; return 1; - case 0x0170: if (bytes && length >= 1) *bytes = 0xdb; return 1; - case 0x0162: if (bytes && length >= 1) *bytes = 0xde; return 1; - case 0x0155: if (bytes && length >= 1) *bytes = 0xe0; return 1; - case 0x0103: if (bytes && length >= 1) *bytes = 0xe3; return 1; - case 0x013a: if (bytes && length >= 1) *bytes = 0xe5; return 1; - case 0x0107: if (bytes && length >= 1) *bytes = 0xe6; return 1; - case 0x010d: if (bytes && length >= 1) *bytes = 0xe8; return 1; - case 0x0119: if (bytes && length >= 1) *bytes = 0xea; return 1; - case 0x011b: if (bytes && length >= 1) *bytes = 0xec; return 1; - case 0x010f: if (bytes && length >= 1) *bytes = 0xef; return 1; - case 0x0111: if (bytes && length >= 1) *bytes = 0xf0; return 1; - case 0x0144: if (bytes && length >= 1) *bytes = 0xf1; return 1; - case 0x0148: if (bytes && length >= 1) *bytes = 0xf2; return 1; - case 0x0151: if (bytes && length >= 1) *bytes = 0xf5; return 1; - case 0x0159: if (bytes && length >= 1) *bytes = 0xf8; return 1; - case 0x016f: if (bytes && length >= 1) *bytes = 0xf9; return 1; - case 0x0171: if (bytes && length >= 1) *bytes = 0xfb; return 1; - case 0x0163: if (bytes && length >= 1) *bytes = 0xfe; return 1; - default: return 0; + switch(ch) + { + case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1; + case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; + case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; + case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; + case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; + case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; + case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; + case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1; + case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; + case 0x015a: if (bytes && length >= 1) *bytes = 0x8c; return 1; + case 0x0164: if (bytes && length >= 1) *bytes = 0x8d; return 1; + case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1; + case 0x0179: if (bytes && length >= 1) *bytes = 0x8f; return 1; + case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; + case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; + case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; + case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; + case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; + case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; + case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; + case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; + case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1; + case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; + case 0x015b: if (bytes && length >= 1) *bytes = 0x9c; return 1; + case 0x0165: if (bytes && length >= 1) *bytes = 0x9d; return 1; + case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1; + case 0x017a: if (bytes && length >= 1) *bytes = 0x9f; return 1; + case 0x02c7: if (bytes && length >= 1) *bytes = 0xa1; return 1; + case 0x02d8: if (bytes && length >= 1) *bytes = 0xa2; return 1; + case 0x0141: if (bytes && length >= 1) *bytes = 0xa3; return 1; + case 0x0104: if (bytes && length >= 1) *bytes = 0xa5; return 1; + case 0x015e: if (bytes && length >= 1) *bytes = 0xaa; return 1; + case 0x017b: if (bytes && length >= 1) *bytes = 0xaf; return 1; + case 0x02db: if (bytes && length >= 1) *bytes = 0xb2; return 1; + case 0x0142: if (bytes && length >= 1) *bytes = 0xb3; return 1; + case 0x0105: if (bytes && length >= 1) *bytes = 0xb9; return 1; + case 0x015f: if (bytes && length >= 1) *bytes = 0xba; return 1; + case 0x013d: if (bytes && length >= 1) *bytes = 0xbc; return 1; + case 0x02dd: if (bytes && length >= 1) *bytes = 0xbd; return 1; + case 0x013e: if (bytes && length >= 1) *bytes = 0xbe; return 1; + case 0x017c: if (bytes && length >= 1) *bytes = 0xbf; return 1; + case 0x0154: if (bytes && length >= 1) *bytes = 0xc0; return 1; + case 0x0102: if (bytes && length >= 1) *bytes = 0xc3; return 1; + case 0x0139: if (bytes && length >= 1) *bytes = 0xc5; return 1; + case 0x0106: if (bytes && length >= 1) *bytes = 0xc6; return 1; + case 0x010c: if (bytes && length >= 1) *bytes = 0xc8; return 1; + case 0x0118: if (bytes && length >= 1) *bytes = 0xca; return 1; + case 0x011a: if (bytes && length >= 1) *bytes = 0xcc; return 1; + case 0x010e: if (bytes && length >= 1) *bytes = 0xcf; return 1; + case 0x0110: if (bytes && length >= 1) *bytes = 0xd0; return 1; + case 0x0143: if (bytes && length >= 1) *bytes = 0xd1; return 1; + case 0x0147: if (bytes && length >= 1) *bytes = 0xd2; return 1; + case 0x0150: if (bytes && length >= 1) *bytes = 0xd5; return 1; + case 0x0158: if (bytes && length >= 1) *bytes = 0xd8; return 1; + case 0x016e: if (bytes && length >= 1) *bytes = 0xd9; return 1; + case 0x0170: if (bytes && length >= 1) *bytes = 0xdb; return 1; + case 0x0162: if (bytes && length >= 1) *bytes = 0xde; return 1; + case 0x0155: if (bytes && length >= 1) *bytes = 0xe0; return 1; + case 0x0103: if (bytes && length >= 1) *bytes = 0xe3; return 1; + case 0x013a: if (bytes && length >= 1) *bytes = 0xe5; return 1; + case 0x0107: if (bytes && length >= 1) *bytes = 0xe6; return 1; + case 0x010d: if (bytes && length >= 1) *bytes = 0xe8; return 1; + case 0x0119: if (bytes && length >= 1) *bytes = 0xea; return 1; + case 0x011b: if (bytes && length >= 1) *bytes = 0xec; return 1; + case 0x010f: if (bytes && length >= 1) *bytes = 0xef; return 1; + case 0x0111: if (bytes && length >= 1) *bytes = 0xf0; return 1; + case 0x0144: if (bytes && length >= 1) *bytes = 0xf1; return 1; + case 0x0148: if (bytes && length >= 1) *bytes = 0xf2; return 1; + case 0x0151: if (bytes && length >= 1) *bytes = 0xf5; return 1; + case 0x0159: if (bytes && length >= 1) *bytes = 0xf8; return 1; + case 0x016f: if (bytes && length >= 1) *bytes = 0xf9; return 1; + case 0x0171: if (bytes && length >= 1) *bytes = 0xfb; return 1; + case 0x0163: if (bytes && length >= 1) *bytes = 0xfe; return 1; + default: return 0; + } } } diff --git a/Foundation/src/Windows1251Encoding.cpp b/Foundation/src/Windows1251Encoding.cpp index 0da8ce0659..f0bfd52603 100644 --- a/Foundation/src/Windows1251Encoding.cpp +++ b/Foundation/src/Windows1251Encoding.cpp @@ -98,122 +98,125 @@ int Windows1251Encoding::convert(int ch, unsigned char* bytes, int length) const *bytes = (unsigned char) ch; return 1; } - else switch(ch) + else { - case 0x0402: if (bytes && length >= 1) *bytes = 0x80; return 1; - case 0x0403: if (bytes && length >= 1) *bytes = 0x81; return 1; - case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; - case 0x0453: if (bytes && length >= 1) *bytes = 0x83; return 1; - case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; - case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; - case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; - case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; - case 0x20ac: if (bytes && length >= 1) *bytes = 0x88; return 1; - case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; - case 0x0409: if (bytes && length >= 1) *bytes = 0x8a; return 1; - case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; - case 0x040a: if (bytes && length >= 1) *bytes = 0x8c; return 1; - case 0x040c: if (bytes && length >= 1) *bytes = 0x8d; return 1; - case 0x040b: if (bytes && length >= 1) *bytes = 0x8e; return 1; - case 0x040f: if (bytes && length >= 1) *bytes = 0x8f; return 1; - case 0x0452: if (bytes && length >= 1) *bytes = 0x90; return 1; - case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; - case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; - case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; - case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; - case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; - case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; - case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; - case 0xfffe: if (bytes && length >= 1) *bytes = 0x98; return 1; - case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; - case 0x0459: if (bytes && length >= 1) *bytes = 0x9a; return 1; - case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; - case 0x045a: if (bytes && length >= 1) *bytes = 0x9c; return 1; - case 0x045c: if (bytes && length >= 1) *bytes = 0x9d; return 1; - case 0x045b: if (bytes && length >= 1) *bytes = 0x9e; return 1; - case 0x045f: if (bytes && length >= 1) *bytes = 0x9f; return 1; - case 0x040e: if (bytes && length >= 1) *bytes = 0xa1; return 1; - case 0x045e: if (bytes && length >= 1) *bytes = 0xa2; return 1; - case 0x0408: if (bytes && length >= 1) *bytes = 0xa3; return 1; - case 0x0490: if (bytes && length >= 1) *bytes = 0xa5; return 1; - case 0x0401: if (bytes && length >= 1) *bytes = 0xa8; return 1; - case 0x0404: if (bytes && length >= 1) *bytes = 0xaa; return 1; - case 0x0407: if (bytes && length >= 1) *bytes = 0xaf; return 1; - case 0x0406: if (bytes && length >= 1) *bytes = 0xb2; return 1; - case 0x0456: if (bytes && length >= 1) *bytes = 0xb3; return 1; - case 0x0491: if (bytes && length >= 1) *bytes = 0xb4; return 1; - case 0x0451: if (bytes && length >= 1) *bytes = 0xb8; return 1; - case 0x2116: if (bytes && length >= 1) *bytes = 0xb9; return 1; - case 0x0454: if (bytes && length >= 1) *bytes = 0xba; return 1; - case 0x0458: if (bytes && length >= 1) *bytes = 0xbc; return 1; - case 0x0405: if (bytes && length >= 1) *bytes = 0xbd; return 1; - case 0x0455: if (bytes && length >= 1) *bytes = 0xbe; return 1; - case 0x0457: if (bytes && length >= 1) *bytes = 0xbf; return 1; - case 0x0410: if (bytes && length >= 1) *bytes = 0xc0; return 1; - case 0x0411: if (bytes && length >= 1) *bytes = 0xc1; return 1; - case 0x0412: if (bytes && length >= 1) *bytes = 0xc2; return 1; - case 0x0413: if (bytes && length >= 1) *bytes = 0xc3; return 1; - case 0x0414: if (bytes && length >= 1) *bytes = 0xc4; return 1; - case 0x0415: if (bytes && length >= 1) *bytes = 0xc5; return 1; - case 0x0416: if (bytes && length >= 1) *bytes = 0xc6; return 1; - case 0x0417: if (bytes && length >= 1) *bytes = 0xc7; return 1; - case 0x0418: if (bytes && length >= 1) *bytes = 0xc8; return 1; - case 0x0419: if (bytes && length >= 1) *bytes = 0xc9; return 1; - case 0x041a: if (bytes && length >= 1) *bytes = 0xca; return 1; - case 0x041b: if (bytes && length >= 1) *bytes = 0xcb; return 1; - case 0x041c: if (bytes && length >= 1) *bytes = 0xcc; return 1; - case 0x041d: if (bytes && length >= 1) *bytes = 0xcd; return 1; - case 0x041e: if (bytes && length >= 1) *bytes = 0xce; return 1; - case 0x041f: if (bytes && length >= 1) *bytes = 0xcf; return 1; - case 0x0420: if (bytes && length >= 1) *bytes = 0xd0; return 1; - case 0x0421: if (bytes && length >= 1) *bytes = 0xd1; return 1; - case 0x0422: if (bytes && length >= 1) *bytes = 0xd2; return 1; - case 0x0423: if (bytes && length >= 1) *bytes = 0xd3; return 1; - case 0x0424: if (bytes && length >= 1) *bytes = 0xd4; return 1; - case 0x0425: if (bytes && length >= 1) *bytes = 0xd5; return 1; - case 0x0426: if (bytes && length >= 1) *bytes = 0xd6; return 1; - case 0x0427: if (bytes && length >= 1) *bytes = 0xd7; return 1; - case 0x0428: if (bytes && length >= 1) *bytes = 0xd8; return 1; - case 0x0429: if (bytes && length >= 1) *bytes = 0xd9; return 1; - case 0x042a: if (bytes && length >= 1) *bytes = 0xda; return 1; - case 0x042b: if (bytes && length >= 1) *bytes = 0xdb; return 1; - case 0x042c: if (bytes && length >= 1) *bytes = 0xdc; return 1; - case 0x042d: if (bytes && length >= 1) *bytes = 0xdd; return 1; - case 0x042e: if (bytes && length >= 1) *bytes = 0xde; return 1; - case 0x042f: if (bytes && length >= 1) *bytes = 0xdf; return 1; - case 0x0430: if (bytes && length >= 1) *bytes = 0xe0; return 1; - case 0x0431: if (bytes && length >= 1) *bytes = 0xe1; return 1; - case 0x0432: if (bytes && length >= 1) *bytes = 0xe2; return 1; - case 0x0433: if (bytes && length >= 1) *bytes = 0xe3; return 1; - case 0x0434: if (bytes && length >= 1) *bytes = 0xe4; return 1; - case 0x0435: if (bytes && length >= 1) *bytes = 0xe5; return 1; - case 0x0436: if (bytes && length >= 1) *bytes = 0xe6; return 1; - case 0x0437: if (bytes && length >= 1) *bytes = 0xe7; return 1; - case 0x0438: if (bytes && length >= 1) *bytes = 0xe8; return 1; - case 0x0439: if (bytes && length >= 1) *bytes = 0xe9; return 1; - case 0x043a: if (bytes && length >= 1) *bytes = 0xea; return 1; - case 0x043b: if (bytes && length >= 1) *bytes = 0xeb; return 1; - case 0x043c: if (bytes && length >= 1) *bytes = 0xec; return 1; - case 0x043d: if (bytes && length >= 1) *bytes = 0xed; return 1; - case 0x043e: if (bytes && length >= 1) *bytes = 0xee; return 1; - case 0x043f: if (bytes && length >= 1) *bytes = 0xef; return 1; - case 0x0440: if (bytes && length >= 1) *bytes = 0xf0; return 1; - case 0x0441: if (bytes && length >= 1) *bytes = 0xf1; return 1; - case 0x0442: if (bytes && length >= 1) *bytes = 0xf2; return 1; - case 0x0443: if (bytes && length >= 1) *bytes = 0xf3; return 1; - case 0x0444: if (bytes && length >= 1) *bytes = 0xf4; return 1; - case 0x0445: if (bytes && length >= 1) *bytes = 0xf5; return 1; - case 0x0446: if (bytes && length >= 1) *bytes = 0xf6; return 1; - case 0x0447: if (bytes && length >= 1) *bytes = 0xf7; return 1; - case 0x0448: if (bytes && length >= 1) *bytes = 0xf8; return 1; - case 0x0449: if (bytes && length >= 1) *bytes = 0xf9; return 1; - case 0x044a: if (bytes && length >= 1) *bytes = 0xfa; return 1; - case 0x044b: if (bytes && length >= 1) *bytes = 0xfb; return 1; - case 0x044c: if (bytes && length >= 1) *bytes = 0xfc; return 1; - case 0x044d: if (bytes && length >= 1) *bytes = 0xfd; return 1; - case 0x044e: if (bytes && length >= 1) *bytes = 0xfe; return 1; - case 0x044f: if (bytes && length >= 1) *bytes = 0xff; return 1; - default: return 0; + switch(ch) + { + case 0x0402: if (bytes && length >= 1) *bytes = 0x80; return 1; + case 0x0403: if (bytes && length >= 1) *bytes = 0x81; return 1; + case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; + case 0x0453: if (bytes && length >= 1) *bytes = 0x83; return 1; + case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; + case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; + case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; + case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; + case 0x20ac: if (bytes && length >= 1) *bytes = 0x88; return 1; + case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; + case 0x0409: if (bytes && length >= 1) *bytes = 0x8a; return 1; + case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; + case 0x040a: if (bytes && length >= 1) *bytes = 0x8c; return 1; + case 0x040c: if (bytes && length >= 1) *bytes = 0x8d; return 1; + case 0x040b: if (bytes && length >= 1) *bytes = 0x8e; return 1; + case 0x040f: if (bytes && length >= 1) *bytes = 0x8f; return 1; + case 0x0452: if (bytes && length >= 1) *bytes = 0x90; return 1; + case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; + case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; + case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; + case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; + case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; + case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; + case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; + case 0xfffe: if (bytes && length >= 1) *bytes = 0x98; return 1; + case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; + case 0x0459: if (bytes && length >= 1) *bytes = 0x9a; return 1; + case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; + case 0x045a: if (bytes && length >= 1) *bytes = 0x9c; return 1; + case 0x045c: if (bytes && length >= 1) *bytes = 0x9d; return 1; + case 0x045b: if (bytes && length >= 1) *bytes = 0x9e; return 1; + case 0x045f: if (bytes && length >= 1) *bytes = 0x9f; return 1; + case 0x040e: if (bytes && length >= 1) *bytes = 0xa1; return 1; + case 0x045e: if (bytes && length >= 1) *bytes = 0xa2; return 1; + case 0x0408: if (bytes && length >= 1) *bytes = 0xa3; return 1; + case 0x0490: if (bytes && length >= 1) *bytes = 0xa5; return 1; + case 0x0401: if (bytes && length >= 1) *bytes = 0xa8; return 1; + case 0x0404: if (bytes && length >= 1) *bytes = 0xaa; return 1; + case 0x0407: if (bytes && length >= 1) *bytes = 0xaf; return 1; + case 0x0406: if (bytes && length >= 1) *bytes = 0xb2; return 1; + case 0x0456: if (bytes && length >= 1) *bytes = 0xb3; return 1; + case 0x0491: if (bytes && length >= 1) *bytes = 0xb4; return 1; + case 0x0451: if (bytes && length >= 1) *bytes = 0xb8; return 1; + case 0x2116: if (bytes && length >= 1) *bytes = 0xb9; return 1; + case 0x0454: if (bytes && length >= 1) *bytes = 0xba; return 1; + case 0x0458: if (bytes && length >= 1) *bytes = 0xbc; return 1; + case 0x0405: if (bytes && length >= 1) *bytes = 0xbd; return 1; + case 0x0455: if (bytes && length >= 1) *bytes = 0xbe; return 1; + case 0x0457: if (bytes && length >= 1) *bytes = 0xbf; return 1; + case 0x0410: if (bytes && length >= 1) *bytes = 0xc0; return 1; + case 0x0411: if (bytes && length >= 1) *bytes = 0xc1; return 1; + case 0x0412: if (bytes && length >= 1) *bytes = 0xc2; return 1; + case 0x0413: if (bytes && length >= 1) *bytes = 0xc3; return 1; + case 0x0414: if (bytes && length >= 1) *bytes = 0xc4; return 1; + case 0x0415: if (bytes && length >= 1) *bytes = 0xc5; return 1; + case 0x0416: if (bytes && length >= 1) *bytes = 0xc6; return 1; + case 0x0417: if (bytes && length >= 1) *bytes = 0xc7; return 1; + case 0x0418: if (bytes && length >= 1) *bytes = 0xc8; return 1; + case 0x0419: if (bytes && length >= 1) *bytes = 0xc9; return 1; + case 0x041a: if (bytes && length >= 1) *bytes = 0xca; return 1; + case 0x041b: if (bytes && length >= 1) *bytes = 0xcb; return 1; + case 0x041c: if (bytes && length >= 1) *bytes = 0xcc; return 1; + case 0x041d: if (bytes && length >= 1) *bytes = 0xcd; return 1; + case 0x041e: if (bytes && length >= 1) *bytes = 0xce; return 1; + case 0x041f: if (bytes && length >= 1) *bytes = 0xcf; return 1; + case 0x0420: if (bytes && length >= 1) *bytes = 0xd0; return 1; + case 0x0421: if (bytes && length >= 1) *bytes = 0xd1; return 1; + case 0x0422: if (bytes && length >= 1) *bytes = 0xd2; return 1; + case 0x0423: if (bytes && length >= 1) *bytes = 0xd3; return 1; + case 0x0424: if (bytes && length >= 1) *bytes = 0xd4; return 1; + case 0x0425: if (bytes && length >= 1) *bytes = 0xd5; return 1; + case 0x0426: if (bytes && length >= 1) *bytes = 0xd6; return 1; + case 0x0427: if (bytes && length >= 1) *bytes = 0xd7; return 1; + case 0x0428: if (bytes && length >= 1) *bytes = 0xd8; return 1; + case 0x0429: if (bytes && length >= 1) *bytes = 0xd9; return 1; + case 0x042a: if (bytes && length >= 1) *bytes = 0xda; return 1; + case 0x042b: if (bytes && length >= 1) *bytes = 0xdb; return 1; + case 0x042c: if (bytes && length >= 1) *bytes = 0xdc; return 1; + case 0x042d: if (bytes && length >= 1) *bytes = 0xdd; return 1; + case 0x042e: if (bytes && length >= 1) *bytes = 0xde; return 1; + case 0x042f: if (bytes && length >= 1) *bytes = 0xdf; return 1; + case 0x0430: if (bytes && length >= 1) *bytes = 0xe0; return 1; + case 0x0431: if (bytes && length >= 1) *bytes = 0xe1; return 1; + case 0x0432: if (bytes && length >= 1) *bytes = 0xe2; return 1; + case 0x0433: if (bytes && length >= 1) *bytes = 0xe3; return 1; + case 0x0434: if (bytes && length >= 1) *bytes = 0xe4; return 1; + case 0x0435: if (bytes && length >= 1) *bytes = 0xe5; return 1; + case 0x0436: if (bytes && length >= 1) *bytes = 0xe6; return 1; + case 0x0437: if (bytes && length >= 1) *bytes = 0xe7; return 1; + case 0x0438: if (bytes && length >= 1) *bytes = 0xe8; return 1; + case 0x0439: if (bytes && length >= 1) *bytes = 0xe9; return 1; + case 0x043a: if (bytes && length >= 1) *bytes = 0xea; return 1; + case 0x043b: if (bytes && length >= 1) *bytes = 0xeb; return 1; + case 0x043c: if (bytes && length >= 1) *bytes = 0xec; return 1; + case 0x043d: if (bytes && length >= 1) *bytes = 0xed; return 1; + case 0x043e: if (bytes && length >= 1) *bytes = 0xee; return 1; + case 0x043f: if (bytes && length >= 1) *bytes = 0xef; return 1; + case 0x0440: if (bytes && length >= 1) *bytes = 0xf0; return 1; + case 0x0441: if (bytes && length >= 1) *bytes = 0xf1; return 1; + case 0x0442: if (bytes && length >= 1) *bytes = 0xf2; return 1; + case 0x0443: if (bytes && length >= 1) *bytes = 0xf3; return 1; + case 0x0444: if (bytes && length >= 1) *bytes = 0xf4; return 1; + case 0x0445: if (bytes && length >= 1) *bytes = 0xf5; return 1; + case 0x0446: if (bytes && length >= 1) *bytes = 0xf6; return 1; + case 0x0447: if (bytes && length >= 1) *bytes = 0xf7; return 1; + case 0x0448: if (bytes && length >= 1) *bytes = 0xf8; return 1; + case 0x0449: if (bytes && length >= 1) *bytes = 0xf9; return 1; + case 0x044a: if (bytes && length >= 1) *bytes = 0xfa; return 1; + case 0x044b: if (bytes && length >= 1) *bytes = 0xfb; return 1; + case 0x044c: if (bytes && length >= 1) *bytes = 0xfc; return 1; + case 0x044d: if (bytes && length >= 1) *bytes = 0xfd; return 1; + case 0x044e: if (bytes && length >= 1) *bytes = 0xfe; return 1; + case 0x044f: if (bytes && length >= 1) *bytes = 0xff; return 1; + default: return 0; + } } } diff --git a/Foundation/src/Windows1252Encoding.cpp b/Foundation/src/Windows1252Encoding.cpp index 1c51cf0745..206a1836aa 100644 --- a/Foundation/src/Windows1252Encoding.cpp +++ b/Foundation/src/Windows1252Encoding.cpp @@ -99,36 +99,39 @@ int Windows1252Encoding::convert(int ch, unsigned char* bytes, int length) const *bytes = ch; return 1; } - else switch (ch) + else { - case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1; - case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; - case 0x0192: if (bytes && length >= 1) *bytes = 0x83; return 1; - case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; - case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; - case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; - case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; - case 0x02c6: if (bytes && length >= 1) *bytes = 0x88; return 1; - case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; - case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1; - case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; - case 0x0152: if (bytes && length >= 1) *bytes = 0x8c; return 1; - case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1; - case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; - case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; - case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; - case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; - case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; - case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; - case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; - case 0x02dc: if (bytes && length >= 1) *bytes = 0x98; return 1; - case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; - case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1; - case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; - case 0x0153: if (bytes && length >= 1) *bytes = 0x9c; return 1; - case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1; - case 0x0178: if (bytes && length >= 1) *bytes = 0x9f; return 1; - default: return 0; + switch (ch) + { + case 0x20ac: if (bytes && length >= 1) *bytes = 0x80; return 1; + case 0x201a: if (bytes && length >= 1) *bytes = 0x82; return 1; + case 0x0192: if (bytes && length >= 1) *bytes = 0x83; return 1; + case 0x201e: if (bytes && length >= 1) *bytes = 0x84; return 1; + case 0x2026: if (bytes && length >= 1) *bytes = 0x85; return 1; + case 0x2020: if (bytes && length >= 1) *bytes = 0x86; return 1; + case 0x2021: if (bytes && length >= 1) *bytes = 0x87; return 1; + case 0x02c6: if (bytes && length >= 1) *bytes = 0x88; return 1; + case 0x2030: if (bytes && length >= 1) *bytes = 0x89; return 1; + case 0x0160: if (bytes && length >= 1) *bytes = 0x8a; return 1; + case 0x2039: if (bytes && length >= 1) *bytes = 0x8b; return 1; + case 0x0152: if (bytes && length >= 1) *bytes = 0x8c; return 1; + case 0x017d: if (bytes && length >= 1) *bytes = 0x8e; return 1; + case 0x2018: if (bytes && length >= 1) *bytes = 0x91; return 1; + case 0x2019: if (bytes && length >= 1) *bytes = 0x92; return 1; + case 0x201c: if (bytes && length >= 1) *bytes = 0x93; return 1; + case 0x201d: if (bytes && length >= 1) *bytes = 0x94; return 1; + case 0x2022: if (bytes && length >= 1) *bytes = 0x95; return 1; + case 0x2013: if (bytes && length >= 1) *bytes = 0x96; return 1; + case 0x2014: if (bytes && length >= 1) *bytes = 0x97; return 1; + case 0x02dc: if (bytes && length >= 1) *bytes = 0x98; return 1; + case 0x2122: if (bytes && length >= 1) *bytes = 0x99; return 1; + case 0x0161: if (bytes && length >= 1) *bytes = 0x9a; return 1; + case 0x203a: if (bytes && length >= 1) *bytes = 0x9b; return 1; + case 0x0153: if (bytes && length >= 1) *bytes = 0x9c; return 1; + case 0x017e: if (bytes && length >= 1) *bytes = 0x9e; return 1; + case 0x0178: if (bytes && length >= 1) *bytes = 0x9f; return 1; + default: return 0; + } } } diff --git a/Foundation/testsuite/TestApp_vs160.vcxproj b/Foundation/testsuite/TestApp_vs160.vcxproj index 4bf91150c4..3dbcd1caed 100644 --- a/Foundation/testsuite/TestApp_vs160.vcxproj +++ b/Foundation/testsuite/TestApp_vs160.vcxproj @@ -261,7 +261,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -290,7 +290,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -323,7 +323,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -360,7 +360,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -396,7 +396,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -433,7 +433,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -465,7 +465,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -494,7 +494,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -523,7 +523,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -552,7 +552,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -585,7 +585,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -622,7 +622,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 diff --git a/Foundation/testsuite/TestLibrary_vs160.vcxproj b/Foundation/testsuite/TestLibrary_vs160.vcxproj index 82d91aa85e..33d727c077 100644 --- a/Foundation/testsuite/TestLibrary_vs160.vcxproj +++ b/Foundation/testsuite/TestLibrary_vs160.vcxproj @@ -105,7 +105,7 @@ Level3 ProgramDatabase - /FS + /FS /Zc:__cplusplus true stdcpp17 @@ -172,7 +172,7 @@ Level3 - /FS + /FS /Zc:__cplusplus true stdcpp17 diff --git a/Foundation/testsuite/src/MemoryStreamTest.cpp b/Foundation/testsuite/src/MemoryStreamTest.cpp index f3c6ff30cc..529f4c7f1a 100644 --- a/Foundation/testsuite/src/MemoryStreamTest.cpp +++ b/Foundation/testsuite/src/MemoryStreamTest.cpp @@ -143,6 +143,14 @@ void MemoryStreamTest::testInputSeek() assertTrue (istr.good()); assertTrue (9 == istr.tellg()); + + istr.seekg(5); + assertTrue (istr.good()); + assertTrue (5 == istr.tellg()); + istr >> c; + assertTrue (c == '6'); + + { Poco::MemoryInputStream istr2(buffer.begin(), buffer.size()); istr2.seekg(10, std::ios_base::beg); @@ -337,6 +345,12 @@ void MemoryStreamTest::testOutputSeek() assertTrue (ostr.good()); assertTrue (9 == ostr.tellp()); + + ostr.seekp(5); + assertTrue (ostr.good()); + assertTrue (5 == ostr.tellp()); + + { Poco::MemoryOutputStream ostr2(buffer.begin(), buffer.size()); ostr2.seekp(10, std::ios_base::beg); diff --git a/Foundation/testsuite/src/StreamTokenizerTest.cpp b/Foundation/testsuite/src/StreamTokenizerTest.cpp index d794da58e8..00d90bff1b 100644 --- a/Foundation/testsuite/src/StreamTokenizerTest.cpp +++ b/Foundation/testsuite/src/StreamTokenizerTest.cpp @@ -43,7 +43,7 @@ class IdentifierToken: public Token bool start(char c, std::istream& istr) { - if (c != -1 && Ascii::isAlpha(c)) + if ((int)c != -1 && Ascii::isAlpha(c)) { _value = c; return true; @@ -54,7 +54,7 @@ class IdentifierToken: public Token void finish(std::istream& istr) { int c = istr.peek(); - while (c != -1 && Ascii::isAlphaNumeric(c)) + while ((int)c != -1 && Ascii::isAlphaNumeric(c)) { istr.get(); _value += c; @@ -82,7 +82,7 @@ class IntLiteralToken: public Token bool start(char c, std::istream& istr) { - if (c != -1 && Ascii::isDigit(c)) + if ((int)c != -1 && Ascii::isDigit(c)) { _value = c; return true; @@ -93,7 +93,7 @@ class IntLiteralToken: public Token void finish(std::istream& istr) { int c = istr.peek(); - while (c != -1 && Ascii::isDigit(c)) + while ((int)c != -1 && Ascii::isDigit(c)) { istr.get(); _value += c; diff --git a/Foundation/testsuite/src/ThreadTest.cpp b/Foundation/testsuite/src/ThreadTest.cpp index eefdf0c9ea..6975a29bce 100644 --- a/Foundation/testsuite/src/ThreadTest.cpp +++ b/Foundation/testsuite/src/ThreadTest.cpp @@ -372,10 +372,11 @@ void ThreadTest::testThreadFunction() assertTrue (!thread.isRunning()); - int tmp = MyRunnable::_staticVar; + MyRunnable::_staticVar = 0; + int tmp = 1; thread.start(freeFunc, &tmp); thread.join(); - assertTrue (tmp * 2 == MyRunnable::_staticVar); + assertTrue (tmp == MyRunnable::_staticVar); assertTrue (!thread.isRunning()); @@ -433,15 +434,16 @@ void ThreadTest::testThreadStackSize() assertTrue (0 == thread.getStackSize()); thread.setStackSize(stackSize); assertTrue (stackSize <= thread.getStackSize()); - int tmp = MyRunnable::_staticVar; + MyRunnable::_staticVar = 0; + int tmp = 1; thread.start(freeFunc, &tmp); thread.join(); - assertTrue (tmp * 2 == MyRunnable::_staticVar); + assertTrue (1 == MyRunnable::_staticVar); stackSize = 1; thread.setStackSize(stackSize); -#if !defined(POCO_OS_FAMILY_BSD) // on BSD family, stack size is rounded +#if defined(POCO_OS_FAMILY_BSD) // on BSD family, stack size is rounded #ifdef PTHREAD_STACK_MIN assertTrue (PTHREAD_STACK_MIN == thread.getStackSize()); #else @@ -449,17 +451,22 @@ void ThreadTest::testThreadStackSize() #endif #endif - tmp = MyRunnable::_staticVar; - thread.start(freeFunc, &tmp); - thread.join(); - assertTrue (tmp * 2 == MyRunnable::_staticVar); - - thread.setStackSize(0); - assertTrue (0 == thread.getStackSize()); - tmp = MyRunnable::_staticVar; - thread.start(freeFunc, &tmp); - thread.join(); - assertTrue (tmp * 2 == MyRunnable::_staticVar); +// disabled on FreeBSD; segfaults due to stack overflow, +// possibly happens on other BSD OSes) +#if (POCO_OS == POCO_OS_FREE_BSD) + { + int tmp = MyRunnable::_staticVar; + thread.start(freeFunc, &tmp); + thread.join(); + assertTrue (tmp * 2 == MyRunnable::_staticVar); + thread.setStackSize(0); + assertTrue (0 == thread.getStackSize()); + tmp = MyRunnable::_staticVar; + thread.start(freeFunc, &tmp); + thread.join(); + assertTrue (tmp * 2 == MyRunnable::_staticVar); + } +#endif } diff --git a/Foundation/testsuite/src/URITest.cpp b/Foundation/testsuite/src/URITest.cpp index e835b377b7..4008bdbeee 100644 --- a/Foundation/testsuite/src/URITest.cpp +++ b/Foundation/testsuite/src/URITest.cpp @@ -798,6 +798,15 @@ void URITest::testOther() assertTrue (uri.getRawFragment() == "foo%2Fbar"); assertTrue (uri.toString() == "http://google.com/search?q=hello+world#foo%2Fbar"); assertTrue (uri.getPathEtc() == "/search?q=hello+world#foo%2Fbar"); + + uri = "http://ServerSocket.com/index.html"; + assertTrue (uri.toString() == "http://serversocket.com/index.html"); + + uri = "http+unix://%2Ftmp%2FServerSocket/index.html"; + assertTrue (uri.toString() == "http+unix://%2Ftmp%2FServerSocket/index.html"); + std::string decoded; + uri.decode("http+unix://%2Ftmp%2FServerSocket/index.html", decoded); + assertTrue (decoded == "http+unix:///tmp/ServerSocket/index.html"); } diff --git a/JSON/JSON_vs160.vcxproj b/JSON/JSON_vs160.vcxproj index 1f0fcc61df..b256598872 100644 --- a/JSON/JSON_vs160.vcxproj +++ b/JSON/JSON_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoJSONd PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_vs160.vcxproj.filters b/JSON/JSON_vs160.vcxproj.filters index 4125cf9886..7db436b33f 100644 --- a/JSON/JSON_vs160.vcxproj.filters +++ b/JSON/JSON_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {b0a7b744-1519-42d8-a7ce-bb056ad2a88f} + {7cefb5a5-8b74-4fe9-bee0-92270e1920f9} - {4e840e51-0586-4a15-9c80-43205763676d} + {f7777155-4062-4375-8634-d4e14210274e} diff --git a/JSON/JSON_vs170.vcxproj b/JSON/JSON_vs170.vcxproj index 0614b249b7..b803921097 100644 --- a/JSON/JSON_vs170.vcxproj +++ b/JSON/JSON_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoJSONA64d PocoJSONmdd PocoJSONmtd diff --git a/JSON/JSON_vs170.vcxproj.filters b/JSON/JSON_vs170.vcxproj.filters index 21d18d54c4..4fca8f690c 100644 --- a/JSON/JSON_vs170.vcxproj.filters +++ b/JSON/JSON_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {0d04a5d6-9439-4b50-8b1a-23f14b10b711} + {415f14ca-1305-4e2b-8e56-78264d0d8be7} - {5618c8ec-9722-4d59-88be-6e79c2061801} + {385776c8-ddec-40c6-a162-7a3abbc439ff} diff --git a/JSON/samples/Benchmark/Benchmark_vs160.vcxproj b/JSON/samples/Benchmark/Benchmark_vs160.vcxproj index f4b9ccf201..095ca07319 100644 --- a/JSON/samples/Benchmark/Benchmark_vs160.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Benchmarkd Benchmarkd Benchmarkd diff --git a/JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters index 6395a7744e..9ee1750e92 100644 --- a/JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {397eac41-b7ab-47e1-b57b-fb5bb3521473} + {7a783ddb-cd9f-4bd7-9eee-0cba33f5953a} - {2f8635d8-04c4-4b32-8134-bb18911b1818} + {5eb0054c-aa14-46c9-be63-3f6755f58a21} diff --git a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj index 9ccce33263..e7fd5b374a 100644 --- a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj +++ b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 Benchmarkd Benchmarkd Benchmarkd diff --git a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters index 9ccb2bd49a..b31f3252ec 100644 --- a/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters +++ b/JSON/samples/Benchmark/Benchmark_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {191dbded-1d8a-4fda-a457-3fb684a4228a} + {98ca4a16-5b75-4739-9704-7482b5c0e72c} - {88402007-1e0c-4845-a43b-d89fe64751fa} + {0c5dcb82-b68a-4fa6-a3cb-1480f2f2f949} diff --git a/JSON/samples/samples_vs170.sln b/JSON/samples/samples_vs170.sln index bbe9c1cd2f..eb12cdab12 100644 --- a/JSON/samples/samples_vs170.sln +++ b/JSON/samples/samples_vs170.sln @@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Benchmark", "Benchmark\Benc EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -18,6 +24,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {D0381ECF-E750-32DA-8EEF-92D56B172D15}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {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 diff --git a/JSON/testsuite/TestSuite_vs160.vcxproj b/JSON/testsuite/TestSuite_vs160.vcxproj index cfda8d46fc..0492c8fe75 100644 --- a/JSON/testsuite/TestSuite_vs160.vcxproj +++ b/JSON/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/JSON/testsuite/TestSuite_vs160.vcxproj.filters b/JSON/testsuite/TestSuite_vs160.vcxproj.filters index 55697fba7b..15a6ee2d47 100644 --- a/JSON/testsuite/TestSuite_vs160.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {10f69dac-042c-43a9-9cf4-3f123b37d2a1} + {0d952573-391f-4152-a6de-6510916a9717} - {4ffee813-d2e4-4d56-afa3-a14a68fd514e} + {08e01ca0-18ba-4f52-8551-43f55e792943} diff --git a/JSON/testsuite/TestSuite_vs170.vcxproj b/JSON/testsuite/TestSuite_vs170.vcxproj index 737871b5cd..85ebc59003 100644 --- a/JSON/testsuite/TestSuite_vs170.vcxproj +++ b/JSON/testsuite/TestSuite_vs170.vcxproj @@ -1,4 +1,4 @@ - + @@ -81,7 +81,7 @@ TestSuite Win32Proj - + Application MultiByte @@ -172,65 +172,65 @@ MultiByte v143 - - + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -352,21 +352,23 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -386,17 +388,19 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,21 +421,23 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -451,17 +457,19 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -482,21 +490,23 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -516,17 +526,19 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -547,10 +559,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -561,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -581,10 +595,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -612,10 +628,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -626,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -646,10 +664,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -677,10 +697,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -691,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -711,10 +733,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -742,10 +766,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -756,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -776,10 +802,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -807,10 +835,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -821,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -841,10 +871,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -872,10 +904,12 @@ true true true - + Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -886,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -906,10 +940,12 @@ true true true - + Level3 - + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true stdcpp17 stdc11 @@ -928,18 +964,24 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 - - + + - - - \ No newline at end of file + + + diff --git a/JSON/testsuite/TestSuite_vs170.vcxproj.filters b/JSON/testsuite/TestSuite_vs170.vcxproj.filters index 340b903dac..85fb963c8b 100644 --- a/JSON/testsuite/TestSuite_vs170.vcxproj.filters +++ b/JSON/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {f220f43a-7e1c-4435-8bb5-8629b1f7c740} + {f6c07a9a-42fd-432f-b9ec-e60d8e88b528} - {6794b30f-6ba1-4241-a56f-8b73f2296371} + {30e57715-d70c-4f7f-a6f6-ecf3465f1490} diff --git a/JWT/JWT.progen b/JWT/JWT.progen index 70f081e9e8..ce1e8627d5 100644 --- a/JWT/JWT.progen +++ b/JWT/JWT.progen @@ -5,6 +5,7 @@ vc.project.type = library vc.project.pocobase = .. vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\Foundation\\include;..\\JSON\\include;..\\Crypto\\include diff --git a/JWT/JWT_vs160.vcxproj b/JWT/JWT_vs160.vcxproj index 4283486a30..3b8fe0d89c 100644 --- a/JWT/JWT_vs160.vcxproj +++ b/JWT/JWT_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoJWTd PocoJWTmdd PocoJWTmtd @@ -224,6 +224,57 @@ ..\lib64\ obj64\JWT\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/JWT/JWT_vs160.vcxproj.filters b/JWT/JWT_vs160.vcxproj.filters index 37d07f4f68..c94f8c9658 100644 --- a/JWT/JWT_vs160.vcxproj.filters +++ b/JWT/JWT_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {044d5f6d-92c1-4b43-afba-6aee1bf81417} + {8e3dec9b-71c0-408a-b825-8d1781beb59e} - {a6c59773-f3e7-4d29-82f9-ba5b1b8e55ad} + {0ab945b3-3663-4c8c-9d9e-2f7c72c403df} diff --git a/JWT/JWT_vs170.vcxproj b/JWT/JWT_vs170.vcxproj index 9410efe718..2c346921cc 100644 --- a/JWT/JWT_vs170.vcxproj +++ b/JWT/JWT_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoJWTA64d PocoJWTmdd PocoJWTmtd @@ -328,6 +328,81 @@ ..\lib64\ obj64\JWT\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled diff --git a/JWT/JWT_vs170.vcxproj.filters b/JWT/JWT_vs170.vcxproj.filters index 3581087c20..f1f9e53c96 100644 --- a/JWT/JWT_vs170.vcxproj.filters +++ b/JWT/JWT_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {17f40ad0-87a9-4097-8694-dd74cdb883e4} + {2e014c97-bfb0-428b-bda6-dce68b1def38} - {e25da310-5bc0-48a8-b315-523b046ef71b} + {84b77ba3-0ab8-4563-8066-de8ecc04e6f8} diff --git a/JWT/testsuite/TestSuite.progen b/JWT/testsuite/TestSuite.progen index 72c40da854..83b5dc5100 100644 --- a/JWT/testsuite/TestSuite.progen +++ b/JWT/testsuite/TestSuite.progen @@ -4,6 +4,7 @@ vc.project.target = TestSuite vc.project.type = testsuite vc.project.pocobase = ..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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;..\\..\\JSON\\include;..\\..\\Crypto\\include diff --git a/JWT/testsuite/TestSuite_vs160.vcxproj b/JWT/testsuite/TestSuite_vs160.vcxproj index e5372ba868..6d2470f201 100644 --- a/JWT/testsuite/TestSuite_vs160.vcxproj +++ b/JWT/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -232,6 +232,57 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/JWT/testsuite/TestSuite_vs160.vcxproj.filters b/JWT/testsuite/TestSuite_vs160.vcxproj.filters index 71aaac4e59..812f1e6d99 100644 --- a/JWT/testsuite/TestSuite_vs160.vcxproj.filters +++ b/JWT/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {3265aff2-ccb6-4d32-82f0-e03249251271} + {33cd7e31-7203-4796-a491-55b34e84c753} - {9165f827-bdbc-407e-bdca-a4c1e6001e3c} + {ae42160a-2ee6-45bc-9ee0-2fec32306b65} diff --git a/JWT/testsuite/TestSuite_vs170.vcxproj b/JWT/testsuite/TestSuite_vs170.vcxproj index 3d5601fd70..660c0773a7 100644 --- a/JWT/testsuite/TestSuite_vs170.vcxproj +++ b/JWT/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -340,6 +340,81 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled @@ -356,15 +431,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +467,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +500,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +536,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +569,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +605,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +650,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +719,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +788,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +857,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +926,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +995,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -892,18 +1039,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/JWT/testsuite/TestSuite_vs170.vcxproj.filters b/JWT/testsuite/TestSuite_vs170.vcxproj.filters index 6d02162b88..40ecec5519 100644 --- a/JWT/testsuite/TestSuite_vs170.vcxproj.filters +++ b/JWT/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {bb42f737-7ea8-4308-b814-480ac61a6b6f} + {4485cd03-819c-4e05-a042-ad1ef7c392f6} - {243b5333-278e-450e-995c-08f75f63db1f} + {e9c850ba-73ee-4938-ab9c-ef9c8458495b} diff --git a/JWT/vcpkg-configuration.json b/JWT/vcpkg-configuration.json new file mode 100644 index 0000000000..c540ec736f --- /dev/null +++ b/JWT/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/JWT/vcpkg.json b/JWT/vcpkg.json new file mode 100644 index 0000000000..3ed9a36b23 --- /dev/null +++ b/JWT/vcpkg.json @@ -0,0 +1,5 @@ +{ + "dependencies": [ + "openssl" + ] +} diff --git a/MongoDB/MongoDB_vs160.vcxproj b/MongoDB/MongoDB_vs160.vcxproj index fe418938a2..cd3080f87a 100644 --- a/MongoDB/MongoDB_vs160.vcxproj +++ b/MongoDB/MongoDB_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoMongoDBd PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_vs160.vcxproj.filters b/MongoDB/MongoDB_vs160.vcxproj.filters index 5603a8d691..6e6017baa3 100644 --- a/MongoDB/MongoDB_vs160.vcxproj.filters +++ b/MongoDB/MongoDB_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {f0921de7-217a-49ae-b2cb-69837f059462} + {808c9a27-7331-481b-9703-5b8e022e2773} - {36075a44-87d3-470d-91b2-cc3024a1dd2c} + {3c204866-fc1c-40a7-8fd6-cf0a30019de8} diff --git a/MongoDB/MongoDB_vs170.vcxproj b/MongoDB/MongoDB_vs170.vcxproj index fe51a2e9ca..30fd2708f9 100644 --- a/MongoDB/MongoDB_vs170.vcxproj +++ b/MongoDB/MongoDB_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoMongoDBA64d PocoMongoDBmdd PocoMongoDBmtd diff --git a/MongoDB/MongoDB_vs170.vcxproj.filters b/MongoDB/MongoDB_vs170.vcxproj.filters index 021eb99097..75d4e8a09f 100644 --- a/MongoDB/MongoDB_vs170.vcxproj.filters +++ b/MongoDB/MongoDB_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {e687701a-4324-4099-a863-e409f4b92b3e} + {2910f5db-d3e4-487f-aa1c-f1e71cdf1f4b} - {8488969c-4d96-49be-bc25-4263be678ebc} + {14166d70-493d-45f8-b43b-b0f1bfdf6943} diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj b/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj index fc0aa17264..2c37509ff5 100644 --- a/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj +++ b/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SQLToMongod SQLToMongod SQLToMongod diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters b/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters index 81d18b37bf..964c7da5c3 100644 --- a/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters +++ b/MongoDB/samples/SQLToMongo/SQLToMongo_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {c05166b4-d886-4e70-98d1-59664effbfa7} + {c7b003ed-38cf-4778-a666-fd1d8fedb82d} - {13a64cd0-fac1-4a78-8bd6-2d88d9b4e61c} + {4e1a2441-7ce0-4a95-87d5-ae217b58b2ec} diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj b/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj index ec5076381b..b768dd1cbc 100644 --- a/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj +++ b/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SQLToMongo {638D0833-8E84-3A67-BD00-4611F99E65AF} SQLToMongo @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + SQLToMongod + SQLToMongod + SQLToMongod + SQLToMongo + SQLToMongo + SQLToMongo SQLToMongod SQLToMongod SQLToMongod @@ -171,6 +250,36 @@ SQLToMongo SQLToMongo + + binA64\ + objA64\SQLToMongo\$(Configuration)\ + true + + + binA64\ + objA64\SQLToMongo\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SQLToMongo\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SQLToMongo\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SQLToMongo\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SQLToMongo\$(Configuration)\ + false + bin\ obj\SQLToMongo\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\SQLToMongo\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SQLToMongo.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SQLToMongod.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SQLToMongo.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SQLToMongod.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;..\..\..\MongoDB\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SQLToMongod.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj.filters b/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj.filters index 4d7256cb47..bb083dc05c 100644 --- a/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj.filters +++ b/MongoDB/samples/SQLToMongo/SQLToMongo_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {47904dd2-c4e6-428d-b1a3-a7756aede789} + {4725e64d-c06c-4005-b396-39cc6b30c656} - {69010b63-9d81-462b-8459-525b66c7ca77} + {43419a5a-fc1b-4d52-b760-660ad9192838} diff --git a/MongoDB/samples/samples_vs170.sln b/MongoDB/samples/samples_vs170.sln index 9e95fa5b2f..ef20ff5da6 100644 --- a/MongoDB/samples/samples_vs170.sln +++ b/MongoDB/samples/samples_vs170.sln @@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SQLToMongo", "SQLToMongo\SQ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -18,6 +24,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {638D0833-8E84-3A67-BD00-4611F99E65AF}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {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 diff --git a/MongoDB/testsuite/TestSuite_vs160.vcxproj b/MongoDB/testsuite/TestSuite_vs160.vcxproj index adcc23ef53..c323108202 100644 --- a/MongoDB/testsuite/TestSuite_vs160.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -657,6 +657,11 @@ stdcpp17 stdc11 + + true + stdcpp17 + stdc11 + true stdcpp17 @@ -665,6 +670,7 @@ + diff --git a/MongoDB/testsuite/TestSuite_vs160.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs160.vcxproj.filters index 477e20591a..50b712d20b 100644 --- a/MongoDB/testsuite/TestSuite_vs160.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,16 +2,19 @@ - {9b2d31e1-9118-4042-b864-90c6fed19a68} + {5a0c244d-4cc0-4a66-8f64-54c36a39a9e0} - {8b58dc5c-f28a-4321-be77-5683a050cfdd} + {60fe6fcd-cccd-4914-bb23-fb6bbd6c8a57} Source Files + + Source Files + Source Files @@ -23,6 +26,9 @@ Header Files + + Header Files + Header Files diff --git a/MongoDB/testsuite/TestSuite_vs170.vcxproj b/MongoDB/testsuite/TestSuite_vs170.vcxproj index a8beb67983..33a04a50f3 100644 --- a/MongoDB/testsuite/TestSuite_vs170.vcxproj +++ b/MongoDB/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -892,19 +964,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 + diff --git a/MongoDB/testsuite/TestSuite_vs170.vcxproj.filters b/MongoDB/testsuite/TestSuite_vs170.vcxproj.filters index 7660c6408b..7870cd9e35 100644 --- a/MongoDB/testsuite/TestSuite_vs170.vcxproj.filters +++ b/MongoDB/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,16 +2,19 @@ - {9b5459bb-35da-4d08-8d3b-b33471ff20ef} + {22e35507-6d5b-462f-bc46-9d712932c6fc} - {d82a024a-314d-4a56-957f-08694cf19d9b} + {24dcad59-867e-4c66-a22e-1efff85e77bc} Source Files + + Source Files + Source Files @@ -23,6 +26,9 @@ Header Files + + Header Files + Header Files diff --git a/MongoDB/testsuite/TestSuite_vs90.vcproj b/MongoDB/testsuite/TestSuite_vs90.vcproj index c5c52dc924..9a9788f79a 100644 --- a/MongoDB/testsuite/TestSuite_vs90.vcproj +++ b/MongoDB/testsuite/TestSuite_vs90.vcproj @@ -447,6 +447,8 @@ Name="Source Files"> + + diff --git a/Net/Net_vs160.vcxproj b/Net/Net_vs160.vcxproj index 775500d31a..7c6ffe6c95 100644 --- a/Net/Net_vs160.vcxproj +++ b/Net/Net_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoNetd PocoNetmdd PocoNetmtd diff --git a/Net/Net_vs160.vcxproj.filters b/Net/Net_vs160.vcxproj.filters index 355ed28633..56b0cba95f 100644 --- a/Net/Net_vs160.vcxproj.filters +++ b/Net/Net_vs160.vcxproj.filters @@ -2,166 +2,166 @@ - {6586007c-ca3f-4f39-b0e7-4693fc952fab} + {6ddde696-9ac4-4b28-8abe-ace383d0a5a5} - {547b1423-5e32-4001-a630-af236d1d3655} + {aa151002-163a-4f8a-b026-af2f1799ebac} - {2c3ec25b-78cb-491f-8bf2-c01f8b82e119} + {621962f1-3af4-4bf5-b108-8183494d52db} - {30e726ad-65cf-4ab0-8e9e-37711c75ea45} + {31e74865-5832-4648-88ee-e6f9ecb46348} - {c946519a-2221-4333-b74f-3996d0902258} + {a854f1a6-a53e-4159-b1a4-24d74289d265} - {23e8dc14-00b0-4539-a047-95ebd609683d} + {8987185b-fbbb-4fd6-aade-14555837b670} - {1b750747-fb28-4f7b-bfcb-4db73b0d76ed} + {b498e495-1add-415b-9436-046548bf6ae8} - {7c21e22f-fd5b-4ef3-807c-4693d84ff0db} + {5010cbbb-d731-463b-8e9d-1d87f12e6b89} - {bd0ccfa7-6333-4efd-8c76-62da58325c47} + {bdec33b6-b47d-4dd4-9fc6-895af8dc39db} - {b00ba381-9922-433e-b2dd-24830cd52443} + {fad38183-2110-4429-b9c0-765b51b79186} - {ef4fa3dc-d7f9-4b99-864f-2d91e4a4eaa0} + {b965cede-3254-4d87-94d6-4b731ee0f7d4} - {2284cb87-011e-47d4-a999-c45acfbe8787} + {3d748acd-faa6-49d4-846d-bd2ee5370cf8} - {d0b198a4-0654-4118-bcb6-9ebb86e6cb83} + {3b613276-fd67-4695-be08-832b1b7799ef} - {266c8f68-8372-4046-88db-917e0f291b2d} + {4e4f2f13-b46b-4c6e-a864-ef620cfc6126} - {93264c0a-e4c9-4f3e-8bad-f93932a9a760} + {3a9dc17d-b34a-48ff-99cc-e13191a79c3f} - {fa927c98-db31-42a0-ad56-8a57a9e77e4e} + {dfb9bd48-f0ac-412d-9e6f-3475d239612e} - {468cba2a-2b1d-43b1-8a43-e6de730fd8b2} + {739b0a32-f748-4b98-9c32-b6ad0b617090} - {d1be417b-1f0c-40c0-ac02-dabd8d1f1219} + {deb12fe5-37e7-47ff-8ee4-23ad55f671c6} - {93895a4f-fd23-47c0-8dfa-5768a938dc6c} + {4c10be5c-12a6-495d-adc7-97883d5ec912} - {6eac7515-7fb4-4bdd-9a78-da0f74fb832e} + {2205c383-b2d3-4333-b972-f40e9c3c4f10} - {5fb12433-84f9-4197-b8e2-89fa79a235c1} + {f19679d7-9579-42b6-994e-050003282330} - {3ed299f7-ad22-4b0a-8f56-d55e915f22b6} + {ed1cb7e9-6e16-473f-a8a1-14a88bf503f7} - {a8e7f394-c278-4af4-950c-4afcf29abf80} + {10501aae-90d1-492a-8c89-5985e3ab75e3} - {f193812c-3e8a-4be5-ae11-e9a0795f3be4} + {7f2d7bea-311d-419e-9fb2-e32251dff4d4} - {0246692c-4842-4999-b34b-69b01408b6c4} + {a24df84e-796b-4000-a330-42e890b1bed4} - {703afbda-41f3-4f00-a7c2-b6e9c9aca1b4} + {f8e0e39f-5a84-4b14-9c80-9868a0a37730} - {0a90ed52-3eaa-41a0-912c-9657558be145} + {b53917c3-7311-4764-9522-902003d83a57} - {da54b91d-e830-479c-b9c4-a4351c5318fe} + {45672c47-35ed-4000-ad20-0cb342ca0730} - {31dd5b2d-90d2-4b81-a25d-56b09fe975d3} + {5f91e0f5-1b9a-4589-9df7-265b6eb80447} - {0a262473-922a-4008-8af3-e7a08410574e} + {14e1931c-51d9-4add-9c85-bb3ddec3dcda} - {29164446-693d-4311-82cd-f562ae4c7c85} + {19319f3d-020a-4489-bf28-3d68fef791cf} - {38968f5a-123d-41bc-b946-9f70c4234101} + {1bb3563f-2a75-4056-81d9-c584a7628eaa} - {c02b32a6-3d5e-47a9-978c-aeb8d2e4a6b2} + {0a5b4ef8-e098-430a-81ca-566f97b7bf40} - {b215a7b1-023a-4e6e-bc96-9efcd29450fc} + {efd4bbd6-7a3d-4106-b179-03f5349cb920} - {31ecbbc8-2926-48c0-8c6a-4d999a215c71} + {4af25911-8666-4888-b44a-3ef019bd5262} - {05af34dc-aead-4fa3-b2fe-3af120f3315b} + {9fcf7a52-ab46-40fd-825c-c54791274e54} - {d2774370-b567-456c-96e6-bd112abd5f92} + {20b5b915-bdc3-471f-b6d4-aedcadf19530} - {bfec6508-1e91-4988-a4f7-0319076f79ef} + {2d22f1a0-b90a-4dbd-b51f-ebc083e84945} - {35922673-1923-4fce-a598-106d22fadae6} + {8e3ed5a8-65be-4416-b718-ef59029bc159} - {c79ecd0c-401c-4f03-a374-8bee20bc5749} + {e3d48f49-c162-4496-95a8-bb004c43261a} - {a4967cc4-a1cc-4447-b008-71f7545c57f9} + {999022b0-4f20-4de5-8fe4-aa714bdfb5ae} - {f4cb442a-c76e-4af4-b848-cf889f1da3c7} + {06554a97-e412-4fa9-8532-e96483e57026} - {ed6c0de8-11ad-4bd6-a8be-698fccd9058d} + {56e12f3b-de04-4f9e-bd30-b5aae7ef6fc8} - {cf1cf3f6-5cad-4813-ac18-07234e1e7d21} + {56442157-2c80-4bff-bf83-8d56563a1876} - {2ca60ef4-2aec-4590-8f8f-96b888d14700} + {c696ab2d-7c13-4273-8ff1-82b2a58c3188} - {a1455a31-9406-46f8-9178-2ffcb70e9a85} + {9981e1fc-f3ba-4892-b272-00fd25d68065} - {46da8814-e0d8-4281-9ef3-9ebbdebc2205} + {0c1d298f-7459-489d-953b-623958b9d1b2} - {688005cc-583b-43d9-99b8-c72729046ab3} + {d7319009-50d9-4a89-86bf-cc6fae321985} - {d1477907-8069-4477-8700-0236b48f972a} + {5a2dbcec-59d7-4a85-bdb4-d493f694f0c9} - {07a6fba2-ca4e-4e26-839d-a9000190b95c} + {45afa7d1-864e-4e0e-8c3f-9822db5342f5} - {7496c44f-1b9a-4b4a-aab5-121f27d8d173} + {39b96a65-80f1-494a-8940-354593703f00} - {61e1e9d1-e066-4553-a24f-73b81c6c68ef} + {117ef0c6-8ca7-4ef5-bc6c-5e6b885eec8f} - {a0624a14-a94b-4a04-beef-04c407cc3854} + {5421eeae-1d37-4a20-a3cb-e1bc0d8f1c60} - {de8dae17-8c06-4b5b-aa00-46c9ded50bec} + {36f26296-a53e-4d14-b2b5-a3efc625cecc} diff --git a/Net/Net_vs170.vcxproj b/Net/Net_vs170.vcxproj index 331f5f6ef1..2cd0ad3205 100644 --- a/Net/Net_vs170.vcxproj +++ b/Net/Net_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoNetA64d PocoNetmdd PocoNetmtd diff --git a/Net/Net_vs170.vcxproj.filters b/Net/Net_vs170.vcxproj.filters index e5c3c662de..9abc1bcd54 100644 --- a/Net/Net_vs170.vcxproj.filters +++ b/Net/Net_vs170.vcxproj.filters @@ -2,166 +2,166 @@ - {0f393581-fb6c-4d73-b811-19733a904d02} + {d1a25f91-36d5-4d94-b0e9-34f055618588} - {7d92a679-da95-4691-83af-f94a72380c8a} + {e166d78c-5244-46a8-8d6e-d8b14ee0a7a4} - {fe6b7b86-3e2e-4ab6-afbf-f8f10456df57} + {b80d01ae-ba96-480d-a15e-fce603bb3a21} - {30fce044-fc3f-4bd9-824c-f412e5558e5b} + {85774aa8-6870-4854-bc5a-dcf4e15997e4} - {172b7d94-dc82-4905-8663-8e9206a6d123} + {f24b31cd-2ed2-4310-b8c3-a79478bebbf8} - {4d5c961f-3a8f-42ed-9956-21935625c1d2} + {461cc3c8-41c3-494d-bb35-6748de4408b3} - {7eab4806-80e3-409b-8348-2c80be0f3524} + {db25db8e-f0c7-46af-a37d-de3328bedfc7} - {834ec475-9213-4b7d-b2bf-4766f4246d2c} + {89e81e0a-a582-4558-9c8d-15d6a26791fe} - {cb796d62-dee6-45af-a7c0-5909769eaa5d} + {3170ae32-b4fc-4c58-a510-797ed61f291f} - {ec0de0ea-eaa7-4f65-8dc6-333ce7fb145c} + {eb381829-6d84-4a7a-9b56-daa0ed4054b0} - {8323a82c-63f3-4049-b0b7-5e188fed5779} + {64b7995d-209a-485c-82ea-f24454c4ed24} - {c03b3059-5722-4ba7-9415-a316eb0b3461} + {5388f916-c876-4aa7-b20f-c438ebfe35c5} - {d7e6310c-244d-4193-b178-9eff441ffaa5} + {c95af791-4ea6-43f6-8e5d-d47b9ad3d50b} - {ce6e9655-8a4e-4aae-abda-e2ef4938355b} + {cfaf9285-1ed3-4336-82f0-f511feb3aa1b} - {ca423d03-073b-42e3-9363-0a065c086b43} + {b87e2aca-7e7a-4f8d-9222-b177153daf7a} - {c08c3294-ddc0-4fbc-9ec1-909766304402} + {f7ac408e-8c6d-43ff-9e06-bc0e1a1c0536} - {2c77b3b7-677f-4aef-9956-fce03b43fbba} + {d7aa1b54-e524-4fa5-9dea-040dc52f54ee} - {d23f849f-cfb6-4747-aadb-1f6937fcf6ab} + {9bff9af5-d4e4-4700-bdc9-89ae57483358} - {59c3213c-7398-4922-9786-0e45428cf090} + {ee358002-666b-4c4b-98d0-8a4139e2fdee} - {57768490-3ad9-4baf-8323-04f5b0b37e1d} + {15838461-8f95-485f-b3c2-5666a89ca3f1} - {29e894e3-a5c2-4ac0-9462-0f3cbf09a07e} + {a401eda0-30c3-4e13-ad7b-f13252d58093} - {88b9a471-6e74-4a30-8ddc-c6843a804fe9} + {aa72bcd8-5659-4f4e-b589-9704179aa038} - {7bbd272c-91a7-4640-ab2b-5576d0aba1da} + {71b699b3-0077-46fc-844b-e77456bebb73} - {5b35ce48-7d42-4819-bb14-016c8cd08c1e} + {b3a99450-5d10-4cc4-9902-d49457e2f619} - {c548a957-d077-4b1c-b52d-5faa7c116ff1} + {84baaab7-b869-48db-93ff-7626ca9f5789} - {c7db860a-5743-4ec6-8a7a-8ebb4808d4b1} + {c0fbb70b-6f77-4513-9e50-e5d2427db562} - {2920f992-d22c-4802-8dfd-8f2a79506722} + {392661c3-89e5-49bf-a024-06f5e15d6f5e} - {eadc8668-bfec-4b9a-b92c-1ce73161cf95} + {bf6dfbbc-cfe1-4c76-8ad1-54120b9c4363} - {65e64bf1-3b11-4100-8ea8-2fe84d56c3b8} + {8236c7f2-3611-4a17-b02c-4af7ef53c82f} - {d5462cff-09df-4808-92bc-54810b8900ae} + {3df3df76-810f-4927-a91d-391a02b41455} - {19667b40-77aa-487f-98e3-2bbee4bf3a48} + {976e913c-1f93-428d-b2aa-8f44719310d8} - {bd35580c-2467-4381-872d-2efe9bb8722d} + {d4611797-f511-48ed-b156-36ba144fbf4e} - {24745bd5-81e6-4bb4-b1c6-97bfb3e30ed2} + {47344ada-0af2-4430-9f9b-0ef0ea5702c0} - {06069587-0dde-4d10-bea7-5358b9ffbf97} + {2b14846c-5c1b-4d49-a0bf-814c4afc47ab} - {8135fb8b-ef54-41ce-872b-ec34c1984051} + {63465e73-927d-4ad7-ab39-ca822ecc4ef7} - {b5d41b85-1f85-4256-b92e-98d010bef2ac} + {31d917c7-7ca5-4f88-bac9-3a00780d9461} - {f85def03-7da6-4ce8-a11c-47e14067e360} + {0489bc03-4348-4752-a78b-03c4aa6993a1} - {0f89a979-ac8f-4fd1-b8b6-427b7f2bd4e3} + {bb2489d4-a24d-412b-a4c2-e8a27deab88a} - {854476b2-23e2-43a1-af94-c5710c97bf51} + {3e5931bf-ec24-471d-9142-6e851d25864c} - {f35fa359-4531-479e-bf41-827bcfed2589} + {490d8b98-b884-4e9d-88ac-da04e4fb58b3} - {202f25d8-c8d9-433d-a7a0-18239240101f} + {6810549e-c869-4e0f-bce6-98631f9833c7} - {8fe2f58d-56bc-4869-9eab-dd65dd0a14ca} + {104abfe0-8072-4fa1-8498-f00aa5f86731} - {f22d77b3-7de7-45d6-9c82-c06f9673b44e} + {f61f9a87-eae7-40dc-91be-f9e46000560c} - {9a20a6bc-9f47-4bcb-8b0a-39f524bc8e65} + {451c6425-d79c-4d05-ac3e-bd2fcd808658} - {1dd41c32-d00e-4c55-8645-c356aca4023b} + {9b58944a-3bb5-4be7-86e2-aa9af1fcc5f2} - {9c2d7a98-8398-42fc-a345-5278661dfb5b} + {490b723e-ecd5-426f-a6d3-c7e35970d0dd} - {e1146a66-2ef9-4f82-8b0e-e80f2d8c91f9} + {f9bb98b5-4ddc-4df0-8623-3bbb496c237c} - {13a18171-b410-4c2f-9233-b70f7116faf3} + {8c7625be-2875-42a2-bbe7-e94aad60c91d} - {72cfa271-ffc8-49c9-b46c-34a920c74554} + {482ea848-f10d-4d2f-be53-5c2938889e3f} - {a28c4870-c13c-4494-a100-21eca36e176e} + {954cacd6-ec10-488f-9e7e-4e2b8b73a552} - {3eb5680d-25b9-45ee-a927-e0b32e712052} + {a8d58f0a-cd5a-4373-b384-a10d8d5a2276} - {eb39586c-e344-404f-915f-5d65c6e433c7} + {c7cda404-6679-4036-a686-4a1a55561dd2} - {579659c3-dd76-4375-ade8-423ead925e9e} + {90b4e44d-1937-4b90-b44b-1236aa947065} - {e3865012-ad03-49c4-b49e-0a3a653deaba} + {ffec0d38-9ed3-419c-8292-cb3f875f7def} diff --git a/Net/include/Poco/Net/HostEntry.h b/Net/include/Poco/Net/HostEntry.h index f194ca6595..a0fdcc6ad1 100644 --- a/Net/include/Poco/Net/HostEntry.h +++ b/Net/include/Poco/Net/HostEntry.h @@ -76,14 +76,6 @@ class Net_API HostEntry /// for the host. private: - template - void removeDuplicates(C& list) - { - std::sort(list.begin(), list.end()); - auto last = std::unique(list.begin(), list.end()); - list.erase(last, list.end()); - } - std::string _name; AliasList _aliases; AddressList _addresses; diff --git a/Net/include/Poco/Net/Net.h b/Net/include/Poco/Net/Net.h index 98780164db..3934b972cf 100644 --- a/Net/include/Poco/Net/Net.h +++ b/Net/include/Poco/Net/Net.h @@ -134,7 +134,7 @@ POCO_NET_FORCE_SYMBOL(pocoNetworkInitializer) #endif -#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_WINDOWS_NT) +#if (POCO_OS == POCO_OS_LINUX) || (POCO_OS == POCO_OS_WINDOWS_NT) || (POCO_OS == POCO_OS_ANDROID) #define POCO_HAVE_FD_EPOLL 1 #endif diff --git a/Net/samples/EchoServer/EchoServer_vs160.vcxproj b/Net/samples/EchoServer/EchoServer_vs160.vcxproj index 694330c41e..df093d2740 100644 --- a/Net/samples/EchoServer/EchoServer_vs160.vcxproj +++ b/Net/samples/EchoServer/EchoServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 EchoServerd EchoServerd EchoServerd diff --git a/Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters b/Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters index 821f76d7aa..4c29a92b79 100644 --- a/Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters +++ b/Net/samples/EchoServer/EchoServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {f8ec6c33-55b8-4c41-abea-1331fa246eba} + {5f3c8176-47e9-44ed-9ebd-ed390e710e18} - {854255f5-31d9-4821-a308-2fc436fadd12} + {9fab81cd-90b5-4468-8171-1adc59747ce2} diff --git a/Net/samples/EchoServer/EchoServer_vs170.vcxproj b/Net/samples/EchoServer/EchoServer_vs170.vcxproj index 66a17628ed..9baa50ecc7 100644 --- a/Net/samples/EchoServer/EchoServer_vs170.vcxproj +++ b/Net/samples/EchoServer/EchoServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 EchoServer {5074CE3E-05F5-31BA-BA79-1AD54C3416F7} EchoServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + EchoServerd + EchoServerd + EchoServerd + EchoServer + EchoServer + EchoServer EchoServerd EchoServerd EchoServerd @@ -171,6 +250,36 @@ EchoServer EchoServer + + binA64\ + objA64\EchoServer\$(Configuration)\ + true + + + binA64\ + objA64\EchoServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\EchoServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\EchoServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\EchoServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\EchoServer\$(Configuration)\ + false + bin\ obj\EchoServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\EchoServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\EchoServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\EchoServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\EchoServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\EchoServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\EchoServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +967,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/EchoServer/EchoServer_vs170.vcxproj.filters b/Net/samples/EchoServer/EchoServer_vs170.vcxproj.filters index f4db67f095..69e21c5775 100644 --- a/Net/samples/EchoServer/EchoServer_vs170.vcxproj.filters +++ b/Net/samples/EchoServer/EchoServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {41fd51d3-4127-44d1-a8e2-4d7ef29139f8} + {89af96e5-faf2-4e12-8ff3-bade7223228f} - {05ac81c2-e990-4638-923f-badd82dcc797} + {1d98988d-a86a-4765-9da5-ec1e16e578e7} diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj b/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj index b04a9c1d06..e004ee4763 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 HTTPFormServerd HTTPFormServerd HTTPFormServerd diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters b/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters index 06282f1bf2..031e90d165 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {28d9ec32-2303-45cd-9b82-99d8e82d114a} + {a07a333d-4e91-4f04-ae19-ca1abcfe39db} - {7b664366-4efd-4f61-8e9a-d3402e5f9151} + {b3de65cd-6bcd-4da6-be50-1fc4abdfdcac} diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj b/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj index 2ae47d8631..46a3aac449 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 HTTPFormServer {19B162EB-DDAA-37BA-AE93-7FDED89274DE} HTTPFormServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + HTTPFormServerd + HTTPFormServerd + HTTPFormServerd + HTTPFormServer + HTTPFormServer + HTTPFormServer HTTPFormServerd HTTPFormServerd HTTPFormServerd @@ -171,6 +250,36 @@ HTTPFormServer HTTPFormServer + + binA64\ + objA64\HTTPFormServer\$(Configuration)\ + true + + + binA64\ + objA64\HTTPFormServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\HTTPFormServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\HTTPFormServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\HTTPFormServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\HTTPFormServer\$(Configuration)\ + false + bin\ obj\HTTPFormServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\HTTPFormServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\HTTPFormServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPFormServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPFormServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\HTTPFormServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\HTTPFormServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +967,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj.filters b/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj.filters index 2c162b77cf..c07a4cd5f4 100644 --- a/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj.filters +++ b/Net/samples/HTTPFormServer/HTTPFormServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {948be1f4-79e0-4ef4-b975-6e4ba8bcba90} + {e0da5bc8-519d-489c-8f50-aa5115f8f03f} - {8be1e552-7224-4ca2-b0e4-23796a2b6b75} + {a8439932-5266-4cb1-a963-790ea922ff4a} diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj index 188b663051..a2d0e1b851 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 HTTPLoadTestd HTTPLoadTestd HTTPLoadTestd diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters index fca88fd576..82ce700855 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {03b3bbaf-68d9-4642-b816-5aecd2346517} + {6cd35fc6-20c7-4c97-b977-ba9856885f92} diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj index 47a400eeb2..8cb538df9f 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 HTTPLoadTest {A140D236-D64B-370A-A7E7-3000725D9869} HTTPLoadTest @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTestd + HTTPLoadTest + HTTPLoadTest + HTTPLoadTest HTTPLoadTestd HTTPLoadTestd HTTPLoadTestd @@ -171,6 +250,36 @@ HTTPLoadTest HTTPLoadTest + + binA64\ + objA64\HTTPLoadTest\$(Configuration)\ + true + + + binA64\ + objA64\HTTPLoadTest\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\HTTPLoadTest\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\HTTPLoadTest\$(Configuration)\ + false + + + binA64\static_md\ + objA64\HTTPLoadTest\$(Configuration)\ + true + + + binA64\static_md\ + objA64\HTTPLoadTest\$(Configuration)\ + false + bin\ obj\HTTPLoadTest\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\HTTPLoadTest\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\HTTPLoadTest.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPLoadTestd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPLoadTest.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\HTTPLoadTestd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\HTTPLoadTestd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj.filters b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj.filters index ee645f841b..f09d8f6c6f 100644 --- a/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj.filters +++ b/Net/samples/HTTPLoadTest/HTTPLoadTest_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {ee8d0578-0505-40d4-a762-4a3a8fe9824f} + {de76325c-9e83-4495-8eaf-89a547ea96a0} diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj index 339b8a6c01..245a2d19c3 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 HTTPTimeServerd HTTPTimeServerd HTTPTimeServerd diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters index 5ca7aef491..67ba9c4836 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {f15659cc-e7e0-4f06-84e4-d2e78640f40a} + {e7e3b19c-b5ae-4b6c-a388-e90c4ccfc1fa} - {fdd11454-e1d0-4044-a596-7998c65f4581} + {127687bc-30a3-444f-9f0c-dd6a312253e1} diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj index fc6cf19183..ca386df2c3 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 HTTPTimeServer {18A0143A-444A-38E3-838C-1ACFBE4EE18C} HTTPTimeServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer HTTPTimeServerd HTTPTimeServerd HTTPTimeServerd @@ -171,6 +250,36 @@ HTTPTimeServer HTTPTimeServer + + binA64\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\ + objA64\HTTPTimeServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\HTTPTimeServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\HTTPTimeServer\$(Configuration)\ + false + bin\ obj\HTTPTimeServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\HTTPTimeServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\HTTPTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\HTTPTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +967,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters index 0dba1f2c84..2e97f21986 100644 --- a/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters +++ b/Net/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {de4c5738-640f-4734-9b20-1986b5c4805d} + {e8ce49eb-1df9-41ae-9d67-579e2c70e9b6} - {fa31f8fa-e91f-448e-8711-056c35d27694} + {6c80bace-cc56-43fd-8709-af53ae948cad} diff --git a/Net/samples/Mail/Mail_vs160.vcxproj b/Net/samples/Mail/Mail_vs160.vcxproj index 5764ddf29c..c38b161f19 100644 --- a/Net/samples/Mail/Mail_vs160.vcxproj +++ b/Net/samples/Mail/Mail_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Maild Maild Maild diff --git a/Net/samples/Mail/Mail_vs160.vcxproj.filters b/Net/samples/Mail/Mail_vs160.vcxproj.filters index 9ae8fa154b..baaf5aa97d 100644 --- a/Net/samples/Mail/Mail_vs160.vcxproj.filters +++ b/Net/samples/Mail/Mail_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {32ea00e5-48d2-4cf3-873a-cb3473cb873f} + {18330b77-4c17-4910-a3eb-fb12b9b2913a} diff --git a/Net/samples/Mail/Mail_vs170.vcxproj b/Net/samples/Mail/Mail_vs170.vcxproj index b24788da0a..6eaebb40f7 100644 --- a/Net/samples/Mail/Mail_vs170.vcxproj +++ b/Net/samples/Mail/Mail_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 Mail {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} Mail @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + Maild + Maild + Maild + Mail + Mail + Mail Maild Maild Maild @@ -171,6 +250,36 @@ Mail Mail + + binA64\ + objA64\Mail\$(Configuration)\ + true + + + binA64\ + objA64\Mail\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\Mail\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\Mail\$(Configuration)\ + false + + + binA64\static_md\ + objA64\Mail\$(Configuration)\ + true + + + binA64\static_md\ + objA64\Mail\$(Configuration)\ + false + bin\ obj\Mail\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\Mail\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\Mail.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Maild.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Mail.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\Maild.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/Mail/Mail_vs170.vcxproj.filters b/Net/samples/Mail/Mail_vs170.vcxproj.filters index 2aa343dd93..167756854c 100644 --- a/Net/samples/Mail/Mail_vs170.vcxproj.filters +++ b/Net/samples/Mail/Mail_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {944fee45-67da-43cb-a000-06033806b09b} + {dedca3c2-4f4d-4f3b-8dff-91686b61af73} diff --git a/Net/samples/Ping/Ping_vs160.vcxproj b/Net/samples/Ping/Ping_vs160.vcxproj index 99c9e0759e..052f35f1f9 100644 --- a/Net/samples/Ping/Ping_vs160.vcxproj +++ b/Net/samples/Ping/Ping_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Pingd Pingd Pingd diff --git a/Net/samples/Ping/Ping_vs160.vcxproj.filters b/Net/samples/Ping/Ping_vs160.vcxproj.filters index f96f94dc43..38e2fab28f 100644 --- a/Net/samples/Ping/Ping_vs160.vcxproj.filters +++ b/Net/samples/Ping/Ping_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {9e79747a-4765-4a08-8a8c-a807b440a4bd} + {a96f9f74-6f28-47db-9fbd-083b72c49fd4} - {4debcd31-cc79-4aad-a363-5ab92c651b86} + {395efead-00d7-4160-87ac-27bd1a57fff5} diff --git a/Net/samples/Ping/Ping_vs170.vcxproj b/Net/samples/Ping/Ping_vs170.vcxproj index c4ed0b3b33..d5dfed6897 100644 --- a/Net/samples/Ping/Ping_vs170.vcxproj +++ b/Net/samples/Ping/Ping_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 Ping {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5} Ping @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + Pingd + Pingd + Pingd + Ping + Ping + Ping Pingd Pingd Pingd @@ -171,6 +250,36 @@ Ping Ping + + binA64\ + objA64\Ping\$(Configuration)\ + true + + + binA64\ + objA64\Ping\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\Ping\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\Ping\$(Configuration)\ + false + + + binA64\static_md\ + objA64\Ping\$(Configuration)\ + true + + + binA64\static_md\ + objA64\Ping\$(Configuration)\ + false + bin\ obj\Ping\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\Ping\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\Ping.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Pingd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Ping.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\Pingd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\Pingd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +967,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/Ping/Ping_vs170.vcxproj.filters b/Net/samples/Ping/Ping_vs170.vcxproj.filters index de87287b30..76e2f8cc1b 100644 --- a/Net/samples/Ping/Ping_vs170.vcxproj.filters +++ b/Net/samples/Ping/Ping_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {d318d425-63de-4a4b-891f-e4cbb0b5eb8d} + {716fbc33-0b6b-4311-a9ce-ea6aaa0c13f0} - {70d4eb66-b7b3-469f-8b07-a857cbab0498} + {524906c2-0b41-4575-960d-68fd7ae1be27} diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj index ad2a5b584f..b844a6b25f 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SMTPLoggerd SMTPLoggerd SMTPLoggerd diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters index e429d2202d..e5a297e0ea 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {31dd20ff-dada-4133-83ea-18077e42ad51} + {43a01154-9325-4c4a-80ab-ed5914a5e486} diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj b/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj index bdb2104219..1009435aa1 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj +++ b/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SMTPLogger {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF} SMTPLogger @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + SMTPLoggerd + SMTPLoggerd + SMTPLoggerd + SMTPLogger + SMTPLogger + SMTPLogger SMTPLoggerd SMTPLoggerd SMTPLoggerd @@ -171,6 +250,36 @@ SMTPLogger SMTPLogger + + binA64\ + objA64\SMTPLogger\$(Configuration)\ + true + + + binA64\ + objA64\SMTPLogger\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SMTPLogger\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SMTPLogger\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SMTPLogger\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SMTPLogger\$(Configuration)\ + false + bin\ obj\SMTPLogger\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\SMTPLogger\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SMTPLogger.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SMTPLoggerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SMTPLogger.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SMTPLoggerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SMTPLoggerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj.filters b/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj.filters index 1eb1423a24..0238a6dd7a 100644 --- a/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj.filters +++ b/Net/samples/SMTPLogger/SMTPLogger_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {85a3d00f-f4b6-43b2-8438-5bd88329fcec} + {da11ab25-c7a7-4b10-96c1-4e0858c553ba} diff --git a/Net/samples/TimeServer/TimeServer_vs160.vcxproj b/Net/samples/TimeServer/TimeServer_vs160.vcxproj index 71390573d3..7b12e628b1 100644 --- a/Net/samples/TimeServer/TimeServer_vs160.vcxproj +++ b/Net/samples/TimeServer/TimeServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TimeServerd TimeServerd TimeServerd diff --git a/Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters b/Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters index ecc57f9012..c7ae5b323c 100644 --- a/Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters +++ b/Net/samples/TimeServer/TimeServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {d0dfb7c6-c519-4fac-ae8d-e755125276ce} + {42ad58a7-8d8f-4736-b4a4-b9d2581b21ea} - {5494fc19-b6f8-4590-a41e-e26a9314f302} + {462aaa53-7569-400c-a7a6-4ffc24906507} diff --git a/Net/samples/TimeServer/TimeServer_vs170.vcxproj b/Net/samples/TimeServer/TimeServer_vs170.vcxproj index 3d3a238c99..d7babcd92b 100644 --- a/Net/samples/TimeServer/TimeServer_vs170.vcxproj +++ b/Net/samples/TimeServer/TimeServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 TimeServer {59EDFD20-9968-30F7-9532-44C08DA58C6E} TimeServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + TimeServerd + TimeServerd + TimeServerd + TimeServer + TimeServer + TimeServer TimeServerd TimeServerd TimeServerd @@ -171,6 +250,36 @@ TimeServer TimeServer + + binA64\ + objA64\TimeServer\$(Configuration)\ + true + + + binA64\ + objA64\TimeServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\TimeServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\TimeServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\TimeServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\TimeServer\$(Configuration)\ + false + bin\ obj\TimeServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\TimeServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\TimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\TimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/TimeServer/TimeServer_vs170.vcxproj.filters b/Net/samples/TimeServer/TimeServer_vs170.vcxproj.filters index 8130c3b45e..de97f5a7a0 100644 --- a/Net/samples/TimeServer/TimeServer_vs170.vcxproj.filters +++ b/Net/samples/TimeServer/TimeServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {ce935249-2847-47b3-be0f-d5c091b75015} + {564a255c-522c-4d30-b6fd-2998615a8a6f} - {294defb8-24ea-400a-9c82-dc312adad1fc} + {3c8c68cd-9074-4777-9e3f-9e538d9c9ba2} diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj b/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj index f1d9e83ce0..4725a54a7f 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj +++ b/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 WebSocketServerd WebSocketServerd WebSocketServerd diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters b/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters index 7bdb3f0345..c770a9af9d 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters +++ b/Net/samples/WebSocketServer/WebSocketServer_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {16bc7bb6-cdcb-4cbd-83da-1e265fb8bc61} + {be64a6cb-65d4-4a68-9e47-2ca125d663e2} diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj b/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj index fad47866db..a833a370fd 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj +++ b/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 WebSocketServer {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C} WebSocketServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + WebSocketServerd + WebSocketServerd + WebSocketServerd + WebSocketServer + WebSocketServer + WebSocketServer WebSocketServerd WebSocketServerd WebSocketServerd @@ -171,6 +250,36 @@ WebSocketServer WebSocketServer + + binA64\ + objA64\WebSocketServer\$(Configuration)\ + true + + + binA64\ + objA64\WebSocketServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\WebSocketServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\WebSocketServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\WebSocketServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\WebSocketServer\$(Configuration)\ + false + bin\ obj\WebSocketServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\WebSocketServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\WebSocketServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\WebSocketServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\WebSocketServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\WebSocketServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\WebSocketServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj.filters b/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj.filters index abdc50da1b..d60aa96225 100644 --- a/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj.filters +++ b/Net/samples/WebSocketServer/WebSocketServer_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {43eb0f0b-8d2c-4435-9965-09717af88a41} + {ff6c0caf-77c7-437b-8d5c-d7962ac84729} diff --git a/Net/samples/dict/dict_vs160.vcxproj b/Net/samples/dict/dict_vs160.vcxproj index f0b438c6b7..ab424935ac 100644 --- a/Net/samples/dict/dict_vs160.vcxproj +++ b/Net/samples/dict/dict_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 dictd dictd dictd diff --git a/Net/samples/dict/dict_vs160.vcxproj.filters b/Net/samples/dict/dict_vs160.vcxproj.filters index 0223072332..a44b7d465f 100644 --- a/Net/samples/dict/dict_vs160.vcxproj.filters +++ b/Net/samples/dict/dict_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {9b62a9a4-e309-4c35-b45d-2437a9930f07} + {124a915c-5a90-47a5-8288-a5dd13152e56} diff --git a/Net/samples/dict/dict_vs170.vcxproj b/Net/samples/dict/dict_vs170.vcxproj index b5ab1f3920..2ae4d5e7ba 100644 --- a/Net/samples/dict/dict_vs170.vcxproj +++ b/Net/samples/dict/dict_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 dict {90F24341-F59F-385F-A8D6-66AB377FF033} dict @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + dictd + dictd + dictd + dict + dict + dict dictd dictd dictd @@ -171,6 +250,36 @@ dict dict + + binA64\ + objA64\dict\$(Configuration)\ + true + + + binA64\ + objA64\dict\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\dict\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\dict\$(Configuration)\ + false + + + binA64\static_md\ + objA64\dict\$(Configuration)\ + true + + + binA64\static_md\ + objA64\dict\$(Configuration)\ + false + bin\ obj\dict\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\dict\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\dict.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\dictd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\dict.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\dictd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\dictd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/dict/dict_vs170.vcxproj.filters b/Net/samples/dict/dict_vs170.vcxproj.filters index d8719df172..2b4c03da3f 100644 --- a/Net/samples/dict/dict_vs170.vcxproj.filters +++ b/Net/samples/dict/dict_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {8c7e56d0-e1cd-4f22-a5c4-135ee00eb7c3} + {accb9e86-85f9-46c9-a471-505e510a8fd0} diff --git a/Net/samples/download/download_vs160.vcxproj b/Net/samples/download/download_vs160.vcxproj index b4e2a82405..7dbef5f22e 100644 --- a/Net/samples/download/download_vs160.vcxproj +++ b/Net/samples/download/download_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 downloadd downloadd downloadd diff --git a/Net/samples/download/download_vs160.vcxproj.filters b/Net/samples/download/download_vs160.vcxproj.filters index 7ecb89d822..1053592c5a 100644 --- a/Net/samples/download/download_vs160.vcxproj.filters +++ b/Net/samples/download/download_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {9f42ff18-153a-47b2-855d-138b270b1c04} + {d44f74b3-d6be-476f-9a4f-33f51932826d} diff --git a/Net/samples/download/download_vs170.vcxproj b/Net/samples/download/download_vs170.vcxproj index e66e71be96..885c88b0e2 100644 --- a/Net/samples/download/download_vs170.vcxproj +++ b/Net/samples/download/download_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 download {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} download @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + downloadd + downloadd + downloadd + download + download + download downloadd downloadd downloadd @@ -171,6 +250,36 @@ download download + + binA64\ + objA64\download\$(Configuration)\ + true + + + binA64\ + objA64\download\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\download\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\download\$(Configuration)\ + false + + + binA64\static_md\ + objA64\download\$(Configuration)\ + true + + + binA64\static_md\ + objA64\download\$(Configuration)\ + false + bin\ obj\download\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\download\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\download.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\downloadd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\download.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\downloadd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/download/download_vs170.vcxproj.filters b/Net/samples/download/download_vs170.vcxproj.filters index d3e7a2d09a..6d4c62bddc 100644 --- a/Net/samples/download/download_vs170.vcxproj.filters +++ b/Net/samples/download/download_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {ebb5b48d-dde5-4dae-9f7d-4d953da715f8} + {45347db9-3bac-47f4-8865-80f11ee2a21f} diff --git a/Net/samples/httpget/httpget_vs160.vcxproj b/Net/samples/httpget/httpget_vs160.vcxproj index 3a5aada230..17994f596f 100644 --- a/Net/samples/httpget/httpget_vs160.vcxproj +++ b/Net/samples/httpget/httpget_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 httpgetd httpgetd httpgetd diff --git a/Net/samples/httpget/httpget_vs160.vcxproj.filters b/Net/samples/httpget/httpget_vs160.vcxproj.filters index 96549e8f0e..ed461f16cb 100644 --- a/Net/samples/httpget/httpget_vs160.vcxproj.filters +++ b/Net/samples/httpget/httpget_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {64725bc7-615b-47a3-bf78-af641c1f330c} + {3a26a93d-b441-430f-8204-4c7937bea24f} diff --git a/Net/samples/httpget/httpget_vs170.vcxproj b/Net/samples/httpget/httpget_vs170.vcxproj index f5076de4df..2b00532bde 100644 --- a/Net/samples/httpget/httpget_vs170.vcxproj +++ b/Net/samples/httpget/httpget_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 httpget {5A299876-BF4E-37B9-922D-4E6FC1FA9520} httpget @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + httpgetd + httpgetd + httpgetd + httpget + httpget + httpget httpgetd httpgetd httpgetd @@ -171,6 +250,36 @@ httpget httpget + + binA64\ + objA64\httpget\$(Configuration)\ + true + + + binA64\ + objA64\httpget\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\httpget\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\httpget\$(Configuration)\ + false + + + binA64\static_md\ + objA64\httpget\$(Configuration)\ + true + + + binA64\static_md\ + objA64\httpget\$(Configuration)\ + false + bin\ obj\httpget\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\httpget\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\httpget.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\httpgetd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\httpget.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\httpgetd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\httpgetd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/httpget/httpget_vs170.vcxproj.filters b/Net/samples/httpget/httpget_vs170.vcxproj.filters index fa33c6f0a1..783109ab77 100644 --- a/Net/samples/httpget/httpget_vs170.vcxproj.filters +++ b/Net/samples/httpget/httpget_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {9ab2f474-cce7-41a1-9674-d52840306b5e} + {037ee10f-462e-417f-b4a8-3617b41c1b39} diff --git a/Net/samples/ifconfig/ifconfig_vs160.vcxproj b/Net/samples/ifconfig/ifconfig_vs160.vcxproj index a530add4b3..869e03d55a 100644 --- a/Net/samples/ifconfig/ifconfig_vs160.vcxproj +++ b/Net/samples/ifconfig/ifconfig_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 ifconfigd ifconfigd ifconfigd diff --git a/Net/samples/ifconfig/ifconfig_vs160.vcxproj.filters b/Net/samples/ifconfig/ifconfig_vs160.vcxproj.filters index a5ca393afb..7871e9458c 100644 --- a/Net/samples/ifconfig/ifconfig_vs160.vcxproj.filters +++ b/Net/samples/ifconfig/ifconfig_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {accc2194-d9ba-4f85-a4eb-f0eb38519788} + {7824aa2b-e4f1-4311-b4e2-b5f30a9ae189} diff --git a/Net/samples/ifconfig/ifconfig_vs170.vcxproj b/Net/samples/ifconfig/ifconfig_vs170.vcxproj index 5d5e0aedb9..d703283a5e 100644 --- a/Net/samples/ifconfig/ifconfig_vs170.vcxproj +++ b/Net/samples/ifconfig/ifconfig_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 ifconfig {BD3A18C6-22B6-3B10-913B-7A84D1845CA3} ifconfig @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + ifconfigd + ifconfigd + ifconfigd + ifconfig + ifconfig + ifconfig ifconfigd ifconfigd ifconfigd @@ -171,6 +250,36 @@ ifconfig ifconfig + + binA64\ + objA64\ifconfig\$(Configuration)\ + true + + + binA64\ + objA64\ifconfig\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\ifconfig\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\ifconfig\$(Configuration)\ + false + + + binA64\static_md\ + objA64\ifconfig\$(Configuration)\ + true + + + binA64\static_md\ + objA64\ifconfig\$(Configuration)\ + false + bin\ obj\ifconfig\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\ifconfig\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\ifconfig.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\ifconfigd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\ifconfig.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\ifconfigd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\ifconfigd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/ifconfig/ifconfig_vs170.vcxproj.filters b/Net/samples/ifconfig/ifconfig_vs170.vcxproj.filters index 331bb6072d..db9ecd3e3c 100644 --- a/Net/samples/ifconfig/ifconfig_vs170.vcxproj.filters +++ b/Net/samples/ifconfig/ifconfig_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {9eef68f9-e964-4cb0-b7f5-b69bd6aa860e} + {8bb7bcca-87b8-4572-a329-d5a70a5d4eed} diff --git a/Net/samples/samples_vs170.sln b/Net/samples/samples_vs170.sln index 44ed6f0288..ebe5be15ef 100644 --- a/Net/samples/samples_vs170.sln +++ b/Net/samples/samples_vs170.sln @@ -28,6 +28,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ifconfig", "ifconfig\ifconf EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -42,6 +48,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Build.0 = debug_shared|Win32 {90F24341-F59F-385F-A8D6-66AB377FF033}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -78,6 +102,24 @@ Global {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.ActiveCfg = release_static_md|x64 {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Build.0 = release_static_md|x64 {90F24341-F59F-385F-A8D6-66AB377FF033}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -114,6 +156,24 @@ Global {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Build.0 = debug_shared|Win32 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -150,6 +210,24 @@ Global {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.ActiveCfg = release_static_md|x64 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Build.0 = release_static_md|x64 {5074CE3E-05F5-31BA-BA79-1AD54C3416F7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -186,6 +264,24 @@ Global {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Build.0 = release_static_md|x64 {19B162EB-DDAA-37BA-AE93-7FDED89274DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Build.0 = debug_shared|Win32 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -222,6 +318,24 @@ Global {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.ActiveCfg = release_static_md|x64 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Build.0 = release_static_md|x64 {5A299876-BF4E-37B9-922D-4E6FC1FA9520}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Build.0 = debug_shared|Win32 {A140D236-D64B-370A-A7E7-3000725D9869}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -258,6 +372,24 @@ Global {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.ActiveCfg = release_static_md|x64 {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Build.0 = release_static_md|x64 {A140D236-D64B-370A-A7E7-3000725D9869}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -294,6 +426,24 @@ Global {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.ActiveCfg = release_static_md|x64 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Build.0 = release_static_md|x64 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -330,6 +480,24 @@ Global {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -366,6 +534,24 @@ Global {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Build.0 = release_static_md|x64 {154EC2E2-A1CC-3F3E-9BAA-8134DF82B0B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Build.0 = debug_shared|Win32 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -402,6 +588,24 @@ Global {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.ActiveCfg = release_static_md|x64 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Build.0 = release_static_md|x64 {59EDFD20-9968-30F7-9532-44C08DA58C6E}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -438,6 +642,24 @@ Global {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.ActiveCfg = release_static_md|x64 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Build.0 = release_static_md|x64 {0DC40FE3-6C42-365E-8DAB-899C50ECFB1C}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Build.0 = debug_shared|Win32 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -474,6 +696,24 @@ Global {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.ActiveCfg = release_static_md|x64 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Build.0 = release_static_md|x64 {83E96E4E-A7E8-340B-B6D2-31B4D40D99AF}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|Win32.Build.0 = debug_shared|Win32 {BD3A18C6-22B6-3B10-913B-7A84D1845CA3}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Net/samples/tcpserver/tcpserver_vs160.vcxproj b/Net/samples/tcpserver/tcpserver_vs160.vcxproj index a192f4a47d..fc77a75610 100644 --- a/Net/samples/tcpserver/tcpserver_vs160.vcxproj +++ b/Net/samples/tcpserver/tcpserver_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 tcpserverd tcpserverd tcpserverd diff --git a/Net/samples/tcpserver/tcpserver_vs160.vcxproj.filters b/Net/samples/tcpserver/tcpserver_vs160.vcxproj.filters index 97f1d22889..d78cb6cf6b 100644 --- a/Net/samples/tcpserver/tcpserver_vs160.vcxproj.filters +++ b/Net/samples/tcpserver/tcpserver_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {164d520e-cdd7-413e-b2f9-c579844a159e} + {c7214bcc-c5f1-45d1-986f-8eb401d711dd} diff --git a/Net/samples/tcpserver/tcpserver_vs170.vcxproj b/Net/samples/tcpserver/tcpserver_vs170.vcxproj index d220ce3f89..7ad2e2afd5 100644 --- a/Net/samples/tcpserver/tcpserver_vs170.vcxproj +++ b/Net/samples/tcpserver/tcpserver_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 tcpserver {62C6ABC1-F799-3071-A78E-532630841583} tcpserver @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + tcpserverd + tcpserverd + tcpserverd + tcpserver + tcpserver + tcpserver tcpserverd tcpserverd tcpserverd @@ -171,6 +250,36 @@ tcpserver tcpserver + + binA64\ + objA64\tcpserver\$(Configuration)\ + true + + + binA64\ + objA64\tcpserver\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\tcpserver\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\tcpserver\$(Configuration)\ + false + + + binA64\static_md\ + objA64\tcpserver\$(Configuration)\ + true + + + binA64\static_md\ + objA64\tcpserver\$(Configuration)\ + false + bin\ obj\tcpserver\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\tcpserver\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\tcpserver.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\tcpserverd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\tcpserver.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\tcpserverd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\tcpserverd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Net/samples/tcpserver/tcpserver_vs170.vcxproj.filters b/Net/samples/tcpserver/tcpserver_vs170.vcxproj.filters index a7f60d2060..11e2c5b1be 100644 --- a/Net/samples/tcpserver/tcpserver_vs170.vcxproj.filters +++ b/Net/samples/tcpserver/tcpserver_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {68a6b28f-b573-40ca-889d-5123c0859063} + {0215d8af-c922-497d-abda-d48615432941} diff --git a/Net/src/HostEntry.cpp b/Net/src/HostEntry.cpp index 79a1d7cae8..b045d264f1 100644 --- a/Net/src/HostEntry.cpp +++ b/Net/src/HostEntry.cpp @@ -15,12 +15,25 @@ #include "Poco/Net/HostEntry.h" #include "Poco/Exception.h" #include +#include namespace Poco { namespace Net { +template +void removeDuplicates(std::vector& list) +{ + std::set uniqueValues; + // Remove duplicates and preserve order + list.erase( + std::remove_if(list.begin(), list.end(), [&uniqueValues](const T& value) { return !uniqueValues.insert(value).second; }), + list.end() + ); +} + + HostEntry::HostEntry() { } diff --git a/Net/src/NetworkInterface.cpp b/Net/src/NetworkInterface.cpp index 0002c316d9..bb8940b225 100644 --- a/Net/src/NetworkInterface.cpp +++ b/Net/src/NetworkInterface.cpp @@ -1486,7 +1486,7 @@ NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) #include -#if POCO_OS != POCO_OS_ANDROID // Android doesn't have +#if POCO_OS != POCO_OS_ANDROID || __ANDROID_API__ >= 24 // old Android doesn't have #include #endif #include @@ -1521,7 +1521,7 @@ static NetworkInterface::Type fromNative(unsigned arphrd) } } -#if (POCO_OS != POCO_OS_ANDROID) && !defined(POCO_EMSCRIPTEN) +#if (POCO_OS != POCO_OS_ANDROID || __ANDROID_API__ >= 24) && !defined(POCO_EMSCRIPTEN) void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl) { @@ -1580,7 +1580,7 @@ void setInterfaceParams(struct ifaddrs* iface, NetworkInterfaceImpl& impl) NetworkInterface::Map NetworkInterface::map(bool ipOnly, bool upOnly) { -#if (POCO_OS != POCO_OS_ANDROID) && !defined(POCO_EMSCRIPTEN) +#if (POCO_OS != POCO_OS_ANDROID || __ANDROID_API__ >= 24) && !defined(POCO_EMSCRIPTEN) FastMutex::ScopedLock lock(_mutex); Map result; unsigned ifIndex = 0; diff --git a/Net/src/SocketImpl.cpp b/Net/src/SocketImpl.cpp index 68310f9300..34cad7d074 100644 --- a/Net/src/SocketImpl.cpp +++ b/Net/src/SocketImpl.cpp @@ -147,7 +147,7 @@ SocketImpl* SocketImpl::acceptConnection(SocketAddress& clientAddr) return new StreamSocketImpl(sd); } error(); // will throw - return 0; + return nullptr; } @@ -527,7 +527,7 @@ int SocketImpl::sendTo(const SocketBufVec& buffers, const SocketAddress& address msgHdr.msg_namelen = address.length(); msgHdr.msg_iov = const_cast(&buffers[0]); msgHdr.msg_iovlen = buffers.size(); - msgHdr.msg_control = 0; + msgHdr.msg_control = nullptr; msgHdr.msg_controllen = 0; msgHdr.msg_flags = flags; rc = sendmsg(_sockfd, &msgHdr, flags); @@ -613,7 +613,7 @@ int SocketImpl::receiveFrom(SocketBufVec& buffers, struct sockaddr** pSA, poco_s msgHdr.msg_namelen = **ppSALen; msgHdr.msg_iov = &buffers[0]; msgHdr.msg_iovlen = buffers.size(); - msgHdr.msg_control = 0; + msgHdr.msg_control = nullptr; msgHdr.msg_controllen = 0; msgHdr.msg_flags = flags; rc = recvmsg(_sockfd, &msgHdr, flags); @@ -652,7 +652,7 @@ int SocketImpl::available() if (result && (type() == SOCKET_TYPE_DATAGRAM)) { std::vector buf(result); - result = recvfrom(sockfd(), &buf[0], result, MSG_PEEK, NULL, NULL); + result = recvfrom(sockfd(), &buf[0], result, MSG_PEEK, nullptr, nullptr); } #endif return result; @@ -1114,7 +1114,7 @@ void SocketImpl::setReusePort(bool flag) int value = flag ? 1 : 0; setOption(SOL_SOCKET, SO_REUSEPORT, value); } - catch (IOException&) + catch (const IOException&) { // ignore error, since not all implementations // support SO_REUSEPORT, even if the macro diff --git a/Net/testsuite/TestSuite_vs160.vcxproj b/Net/testsuite/TestSuite_vs160.vcxproj index f81c42c9d9..4ef8a2e51d 100644 --- a/Net/testsuite/TestSuite_vs160.vcxproj +++ b/Net/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Net/testsuite/TestSuite_vs160.vcxproj.filters b/Net/testsuite/TestSuite_vs160.vcxproj.filters index b58d733cac..93b2e69699 100644 --- a/Net/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,172 +2,172 @@ - {bd6cfc50-4c83-49ae-abf8-bec79ce2054b} + {07fbd7d0-eaee-4c0e-8bdf-8061a895b9e8} - {9eeb4f90-1340-4764-b570-51072e4d1f5f} + {9482472e-2889-417f-be2d-b4b84ecec381} - {f2ac3b65-63f7-4bde-9b02-3f7eac34753f} + {7c539faf-945d-4542-a1b1-a9425aee23b8} - {7afa4bbb-97da-4b01-8878-b2202dd2e114} + {d773d420-169c-4fc1-be69-efa0e3cbd2a0} - {171910d5-caaf-4017-a6b9-90d5ddc76992} + {ce67d650-a33b-47d1-a4f3-a1ade9409f9b} - {35f72121-8e88-4440-bbe0-f0dc1b6595aa} + {4cd8aed9-e8ef-4fd6-aca8-b535850daa01} - {b81b7070-3c7e-494f-9f72-c9900e6fda58} + {10ed276d-9cd6-4ee4-8bb2-0ffda1aadc5e} - {8206dc89-e9ac-454a-ae42-ae2199b27367} + {5f550ba1-77c9-413b-bc87-f77dff23d5de} - {0a3f1ad0-860b-40d6-96d7-148ad8f81dc6} + {b620113f-65fe-40c9-9317-8f402d5eea44} - {33400132-1345-4b89-8b6c-7225ef34e9cb} + {6273f686-0bbe-4959-b876-92b703d711a8} - {19de33b0-9aeb-4007-8025-76380bf94a17} + {fcc1a837-fc55-4552-aa50-b20250e910d8} - {87a51413-9ae6-4def-b166-03b3a21a7b77} + {cb0d583b-a554-4583-bf02-8c9dfdebba3f} - {04a68fc1-cf40-43f5-83bf-099697c63412} + {680c3e38-1ce8-44b6-9eaa-42ad0f1b2ff1} - {a14a3a81-13af-47ad-8e9d-9c9685675e23} + {3031de47-e763-49a6-81ef-6c5021fe9eb8} - {a26f1a12-cfc1-4586-8385-274d377fe7cc} + {db7a50c5-1238-4580-a85d-85d516e1dbc4} - {d5f8fc72-a230-49f6-8f33-5d2064f5894d} + {5ecbed09-4224-4dca-bc9c-cbdf3a0c48c9} - {e2e9b50a-5928-4b0c-b7bb-a4eaa7e890d9} + {11e99bc3-039f-4354-b118-3ea127da6241} - {63a73f18-2a88-40fc-bb4b-de6205d2dc2f} + {569bdefb-b030-4f95-aad3-30b6b5fbf1f7} - {3ef1f3b4-2c07-410e-96e1-905b5d887aa5} + {301d6caf-0fe0-46f9-bed2-19bde647561d} - {02430fad-49f1-477c-ba36-666e2398a8db} + {51945a1e-bffd-4eff-a671-f3b080289b6e} - {7fb352ae-6469-4d38-87ec-2af60b59ca68} + {aa269536-e0c3-45a7-b8b9-76b7b6b2cf65} - {acd61cd0-993f-4754-b7c8-ad706875c043} + {11f3bbbb-dcff-4f35-ac48-43a0d90659b3} - {aff555ac-1c12-43c8-94d0-aab38980b73f} + {8f74a07e-e2e5-44f8-a270-f4f997a76fad} - {8a10a99a-e50d-4e02-9391-7c017e29f834} + {050c87e4-1764-4840-8b26-6c8956f146f8} - {8c1dbf0a-279e-4f62-9448-ee4ed3cc3033} + {58ccd8e0-62c6-4217-9d1b-f52aa8a43af5} - {cdd3594a-b19f-459e-a6fe-4bb72f6ad528} + {58260a97-16c5-43d2-bd4c-5c1c5cac591e} - {187849b2-f4ab-4ae5-ae47-b7204fb9d02a} + {ee3ff97c-a57c-4ade-9f05-8af7f6f2c1a5} - {744f2cee-7d79-4795-b9e2-c4d1b33b4967} + {ab672d90-a16b-4f02-95e3-c2fbddd428a0} - {a1353eab-1073-4f64-9fb0-31193a1c11ed} + {8b5aa9e7-c818-4f99-8864-36a066414254} - {caf2d5b1-60ba-46cd-bd7d-5311c3446782} + {927cae30-45ea-4d91-ab0f-c11e3e63969f} - {5e1486e3-6a43-4161-b03f-ee66e5f82052} + {d42f8616-555a-4c2d-bc8f-a85d110c22da} - {2be4b99c-9437-4ab5-8add-517f3f0757cd} + {a7215be8-a716-43a6-a60e-090e05f7d02d} - {ac8bae8a-9cf6-4b4d-a817-5c52329a6bb8} + {74a8c3a6-881f-434f-a7b9-25d61a32f37e} - {28d53b0f-f515-4b6d-8c07-dc4fdf5e8c64} + {8d35f046-c3e4-4aa1-9447-3471b87a0942} - {04b20043-9298-44cb-8e5b-8ed139f2a4e3} + {a8a2f0f8-964b-4407-9422-8cbbfee3fad3} - {f6e81063-804a-419e-9175-eaaa0925069a} + {ca9f68f6-bf8b-47af-abb3-406a5775baa3} - {5c32bf49-64f6-4ec8-a125-980e380db694} + {638e8c18-2ca7-4c97-b18f-30b4686b38ac} - {6e3bde09-5b1f-477b-9ebe-92b8ed2ba3ee} + {db3f0c62-fcd4-4831-bb9b-bc166a524e2f} - {edf6bbad-ae9f-481f-8415-6c6cd2f939a8} + {c20c48d8-cea9-4acd-93fc-444f5173feab} - {ef90cb36-2fc3-4cd0-bb99-b484d3f1550b} + {bffe9f81-d6db-4a1f-9dc0-b5ec6c13e3f7} - {136e5a16-7c71-42c3-af00-15e1d7150958} + {7cb117da-3739-433b-9a16-16ee22bb95d5} - {325faf4e-e692-4baf-9f51-5dd81410a3cf} + {a6c3ca83-03e7-449d-949d-75ca5b1b2b65} - {a9617814-8f8f-4aee-8253-d3c670329ae9} + {1ae17b47-06d2-4610-b90e-dd266f55443d} - {473f8ff9-b334-4236-934f-c726b0a6d3d6} + {7aa723ba-689a-4937-bb79-83cbea4bc41c} - {5ac568d9-2b93-428f-887e-96bae19fd76d} + {dc3b3038-e502-4be9-b624-747cff7e0445} - {7a9efbf7-f295-4a07-87cc-3d5a033eda87} + {f5b3c1ce-0d0c-4db8-a960-974b6bbce7b9} - {9b814585-1fd5-46a0-8a7c-4c6ba533867f} + {5d61534b-3ec6-48fa-91a6-a23949887e06} - {1b8670e8-95ea-4ff1-a929-4e28c2f5bedf} + {9469c3a4-9fbb-4db4-9d4c-93d0cae2df88} - {020d7a36-fb31-4c94-9f02-013675840060} + {44500267-1c49-4341-91e8-4ba960f78130} - {247a28fd-1e50-4bf0-92c5-27b115dd0fe7} + {f4061bd7-67ce-4ecb-868f-58482fa83a5b} - {3b8eb65d-dc40-4ccd-92e9-71ee885ba75d} + {28a96db6-ebd1-412c-9118-204899d08483} - {a9c4e89e-4ec6-4b27-a654-59a6d827f53a} + {494e1584-2e0a-4c74-9895-5654fd9394f9} - {161f52c5-6610-47a0-9306-ff11019755d6} + {13b75130-d93c-4a84-8939-298c53533541} - {0aa3aad0-6193-48ff-bccc-bb0a07de43e1} + {cdaafe61-27df-45f5-9ec1-b040c761302c} - {b52ab757-ff3f-4d5f-9d49-08e0001fab7f} + {8f93735e-797d-4cf3-a0e5-f37572ef8cd9} - {54eea72d-400a-4259-bffa-4b6a711cf94a} + {7a89be41-0393-468a-bea7-d3a45e1f47e4} diff --git a/Net/testsuite/TestSuite_vs170.vcxproj b/Net/testsuite/TestSuite_vs170.vcxproj index edd84e7b5e..03051fa8af 100644 --- a/Net/testsuite/TestSuite_vs170.vcxproj +++ b/Net/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34202.158 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -357,8 +357,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -391,8 +393,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -422,8 +426,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -456,8 +462,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -487,8 +495,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -521,8 +531,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -552,8 +564,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -586,8 +600,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -617,8 +633,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -651,8 +669,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -682,8 +702,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -716,8 +738,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -747,8 +771,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -781,8 +807,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -812,8 +840,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -846,8 +876,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -877,8 +909,10 @@ ProgramDatabase Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -911,8 +945,10 @@ Default $(OutDir)$(TargetName).pdb - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies) @@ -996,204 +1032,338 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Net/testsuite/TestSuite_vs170.vcxproj.filters b/Net/testsuite/TestSuite_vs170.vcxproj.filters index 8f5123de38..40e4b8ee5d 100644 --- a/Net/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Net/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,172 +2,172 @@ - {1de7c206-c047-4fa9-9f70-76fba36d6357} + {16c9177a-ecfd-4077-84a1-4f39fc7980d4} - {b8067e77-98a2-483f-9ac4-87f6926e781d} + {46ce1f5f-145b-4fd0-b62a-e1782da2c302} - {21307ccd-54fb-4e34-b214-d1445abb7f49} + {0884a89f-f367-4c51-83ab-417a70e06f9f} - {50f284c2-4fae-4db8-b938-edc31f894396} + {9348b11c-7d07-4dc1-aa63-c1a327ec2bc2} - {88476b8b-c763-4846-9332-faa616e0af8e} + {3a9cc876-dfc3-4df1-b941-3249da4aed0d} - {745ac167-857f-462c-ba8d-b77e85c3f0f8} + {ae61e107-a2f6-4a35-959b-65b69e030f6b} - {782f1313-d76f-43f8-b194-4db6d179c288} + {cb900f64-42d7-460f-8b5a-103406ce76c3} - {7e31d1a5-174b-4d94-b66f-5306fc1d0516} + {507d6fbe-88a6-4955-878a-787e849fc8ac} - {f069a939-12ee-4950-a2be-ac79d0633704} + {e3bfab53-2023-4204-8352-4842ad191a2d} - {1ff556e1-f288-4a77-9af3-2d8dcba443cb} + {17bceac6-b95f-443b-959d-1dca5e834831} - {b8e2bd2b-b893-4ce1-ac58-af41715c1d74} + {7f7df937-297c-47f7-9943-65ce249ae6f9} - {a0aca32e-b4d1-46a1-8389-65ea253b36d6} + {cdea4cfa-a4aa-435f-a688-6f3b9bc4fbbb} - {eacb0411-250d-436e-8d2f-e7177d116ec0} + {07a91a3f-6e1b-4a0c-b7c5-b2d269da93f1} - {d9e4d8e8-d182-4dea-9b5b-b89962403176} + {f9298e90-eacc-4015-83bb-f6d04deb90d5} - {b6edc3f3-cc59-494b-a71d-4f8c14ce3e39} + {02b546f6-238f-4d08-9c5f-0a528c4b04e8} - {458168b2-eebc-4dd4-9a03-d9f0f9a2a6c9} + {516990f9-d378-49d3-af29-4a57b9537ee6} - {838e9f23-65d9-411d-ad98-865282c4b124} + {383cc295-fe65-48b4-b542-31ea6920fa3a} - {6790685c-24ac-4168-b7ec-11a33c69eecc} + {889a5ece-306f-4fa0-8222-2ba20da81748} - {e275504a-869c-4e49-8efb-5d761f5fa689} + {ab005c44-14aa-4d38-bec3-1ad887c6d691} - {eee2aa8f-28a6-4b90-9620-7074523024ed} + {65363cb8-7258-4b09-9f73-0f2f2d61ab2c} - {17bcc15e-9b80-4a1f-b001-0c5c87e1c174} + {ef3a5847-9347-4f28-804c-09270d3789be} - {5045634b-9e56-4776-9d49-e636e35f53f2} + {3485cfea-a7cb-4f6b-8504-c6d0259c184c} - {08c36bec-040b-40f4-aff2-62b9285dc941} + {7e71fb64-57c4-4221-b4f1-1b5af1ea09da} - {b2e93dbe-aa43-4d42-a7f8-15eff701159f} + {38147fbb-2af0-404a-993b-30b04a38d365} - {91b9a556-e17f-4ed2-8362-0bc461cfa9d3} + {7e02e39e-014d-46dd-b4f3-96f642c4f4ef} - {78fe40f0-075d-4204-8585-bf075d34845c} + {9ffe6fcc-1704-44de-87f3-940f46525eb9} - {d1d5fce3-0238-4e76-a858-cfd624518677} + {e4494fb5-1e61-4b9b-9a85-75bdbcfa3962} - {d60f9e62-cc72-485e-9560-03e039bb99d7} + {8016e5ed-a75e-4004-ab39-e5c66c63d974} - {ffab98d4-0d10-4316-998e-64f2a7c1e420} + {3533ea18-a525-4455-9dee-02b61930eece} - {72bc5ba0-b4bc-45a7-887b-4f26d11c3388} + {18ed59d9-2173-43f8-aadd-a691782289a1} - {cb750701-7d58-4b83-96bd-3e20c101dc88} + {93b5ff51-8f99-454b-b4e5-ba19e8ec5e7f} - {c8829492-7db9-4fa8-bde1-8fec56ec7760} + {4b5dbeb7-c7f8-4356-a7ec-b2dad2dec4da} - {9b7bd1fc-4765-492c-b1fc-e8cd0dbf2901} + {9b998599-d592-44a3-a0db-42658731796a} - {eaab7fac-663b-488c-a432-cee5c82c803a} + {80b60d90-07a1-42b4-8ccb-d001244ee02b} - {acd6ae16-7521-4502-a85e-f7c260ad252e} + {f24001f2-16e9-41cc-a14b-b894e4ee8920} - {d5c53961-e5cf-4d89-8077-b1146b50ff9c} + {ace4b652-3392-44c3-92ff-6d194cfedd7f} - {78abd5c7-e162-40db-bae9-187a17af9b5e} + {0b76bfb0-552e-488d-9215-7337f1b08b89} - {bb0aaf00-be64-401b-b847-5968d682bf75} + {f9fa839a-3b1a-4249-af78-f1c39741b299} - {9a43adf5-9118-437e-bd3f-979da977ac57} + {072cf3ed-309b-44dc-97bd-dabaa243ea56} - {ed4fe2e4-debb-4b0a-9b8a-434970c01115} + {4cc096a0-93ac-44c4-b8d5-0ef44570b806} - {18b22b60-08c4-44a3-8915-ec192e8a3fb0} + {94de20d6-0377-4f89-a32e-537d07ef6949} - {3db6f9e0-ec17-41de-ad4b-48af29dc4ac1} + {879d702c-dde2-491e-9791-63c3ae4cf15d} - {bec0a34f-958b-40d2-b6d6-bc6b6b147113} + {b3b72f70-febc-4502-829d-e9bc530ad226} - {8195d3bf-855d-4817-89ea-a58eff8c03c4} + {4e3a90f9-2a15-457d-ad72-4f6ff581f17c} - {6333479e-c8ff-44f7-a50d-085523e5105f} + {f93f5a0b-da43-416f-a1e6-dddd400554a7} - {72b65c24-6964-4b98-a113-329343f32ebd} + {218153cf-a2a1-41b3-aef9-55409711fffa} - {09e33a50-8379-46db-8e79-e41018ee0d8f} + {ce7930a7-37ef-4991-a6ea-6990e3422880} - {bd402350-2d9d-4a4a-852d-be89ac05db28} + {7923a150-6232-4ad2-b719-85e9ad3013ba} - {f4cd0903-39ed-40f7-9e92-c4e7cbe35ef0} + {418f6095-553b-4390-910c-3197ce0f33a9} - {68a90000-19f3-4d13-8fae-e9b6e5716652} + {d7e324d1-9c76-4608-8c1f-dc00992611f3} - {66c54799-5c41-46f8-ae7a-58942ad4705b} + {69b05326-5e8a-4805-a049-641b2fef0e34} - {f8351074-43b3-486c-b17c-1d3e97afa010} + {d30830e4-0c9d-4435-997c-6f84dbf677ab} - {2cfcb915-097f-4a15-861f-69087117bc54} + {97383aa0-6a04-4e58-b502-ce9ffdcc749e} - {160bf970-48eb-490c-a1c7-ada4205e3b04} + {7107a56a-7b11-4fd3-b293-383b9ecc3b26} - {bd7d0bc2-d6a3-40fb-889d-3a9908f761b2} + {c868650b-79f6-454b-9838-a64be7bcb5a2} - {704cd365-f4d0-41dc-8509-02627e48fc33} + {7b019e8d-3758-4777-a30c-dad90f3cc3b1} diff --git a/NetSSL_OpenSSL/CMakeLists.txt b/NetSSL_OpenSSL/CMakeLists.txt index eb7f562279..b83fe9fa12 100644 --- a/NetSSL_OpenSSL/CMakeLists.txt +++ b/NetSSL_OpenSSL/CMakeLists.txt @@ -29,7 +29,7 @@ target_include_directories(NetSSL PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/src ) -if(MSVC AND POCO_DISABLE_INTERNAL_OPENSSL AND OPENSSL_USE_STATIC_LIBS) +if(MSVC AND OPENSSL_USE_STATIC_LIBS) target_link_libraries(NetSSL PUBLIC ws2_32.lib Crypt32.lib) endif() diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen index 5073169533..b6fb1f104b 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL.progen +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL.progen @@ -5,6 +5,7 @@ vc.project.type = library vc.project.pocobase = .. vc.project.outdir = ${vc.project.pocobase} vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\Foundation\\include;..\\Net\\include;..\\Util\\include;..\\Crypto\\include diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj index 0f2856232c..cca00ae656 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoNetSSLd PocoNetSSLmdd PocoNetSSLmtd @@ -224,6 +224,57 @@ ..\lib64\ obj64\NetSSL_OpenSSL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters index febc1f1276..bfedb2cda4 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs160.vcxproj.filters @@ -2,49 +2,49 @@ - {c88f461e-3fd2-45f7-8dba-99979cfc5868} + {a4e44619-b344-4cbc-b5ac-9bfef1d3320d} - {702acf59-13fb-4f42-a78b-ff48bab51b4b} + {4b859f53-fd30-4725-8f16-1491996c23eb} - {efa5519e-352e-4842-98a8-ab7a1d6dccf3} + {5b8e6fa3-59a5-44ae-af73-01ef4ff12e6f} - {25872691-1f49-43f7-9782-8d5357ffcdb3} + {4e1f1137-83c7-4a26-bc9f-76b6d0f05ee7} - {9d63a04f-f366-4d71-b22f-7d3c50cc550c} + {327ea0da-6375-46ce-bbeb-d6265875cbd1} - {f80f7bf8-ae75-4b0b-a69b-d44900ad4803} + {debf5cc2-3012-48c7-ac94-ceddf703e7fe} - {4690d3bd-eb2a-47b4-b58b-8cb6497eb68c} + {df55d452-6dbb-4501-91a9-c463d573799f} - {94bda176-50ca-4a66-8a55-64d37564ce08} + {c40262cd-b90d-4116-8ffa-1dd80efd385d} - {c04a7709-b33e-41de-8958-237671ae71a7} + {79fd16d3-ab17-4f79-80aa-8213f17ead93} - {a7d858c5-e876-4f74-8872-b551fcf19bb9} + {798827d4-6963-459d-8ee5-fa45730c003e} - {42f35ca9-4d18-42f2-af75-f08b5718fee0} + {70cba60c-9906-461d-8a86-13065350b042} - {be9b24a1-0de5-4dc1-bfb7-9e8eee817b50} + {fa8d3970-63ea-4716-8d04-75a55c19dc8e} - {8d183fb7-56e9-442e-b56e-ad574b390aaf} + {cba150f7-18f0-4749-8dd8-de43ca631bb1} - {0728d812-2a21-4dde-a3c4-f6a59d625b6c} + {566c1037-b4bd-4f4d-8d83-be6436547115} - {063f6698-a66d-42ce-a613-83de51813130} + {9fcb9369-3374-4edf-b40f-d5d2d9d3b1df} diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj index 2b1ea8c421..95f4e455e2 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoNetSSLA64d PocoNetSSLmdd PocoNetSSLmtd @@ -328,6 +328,81 @@ ..\lib64\ obj64\NetSSL_OpenSSL\$(Configuration)\ + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters index 6e51be8ddf..6337e0bb1f 100644 --- a/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/NetSSL_OpenSSL_vs170.vcxproj.filters @@ -2,49 +2,49 @@ - {80af7578-186a-472c-9dcf-2c2b869bd712} + {25ea1371-0e23-4ac2-a8ad-649e3cfe2d3a} - {0275fcb3-6879-4e36-ba4d-18a2338f6799} + {bbe89646-b853-4b26-9236-a2f37e4a484b} - {dd7dab3b-e2ad-4953-8b75-b828b460ecbc} + {f9d3cc60-7518-4442-ba71-a787d5cb3edc} - {e3fda0f9-4ace-4eea-ab85-036841e3b0cf} + {9c98e685-0586-4570-ad80-367d25e6559c} - {d47af968-78e6-4fe4-b8f1-46869242b2a3} + {f630cf66-040b-403d-bc29-d2115c62e7d9} - {3fad2a6f-d754-4a75-bbf9-5b2ec3f036cb} + {d194b4cd-69f8-4541-af6e-3f7316ab8b04} - {e1c12303-0459-4ffb-99a8-c0afb1c0b752} + {76566147-e043-48f5-a47f-8327add4c391} - {a1c8a207-f17d-4519-8704-d45e70769064} + {529e7bb0-c0e6-42c3-b5a5-1c49767e9df8} - {cab77a5e-f306-40bb-85a3-a20f0824f76b} + {93a91e17-fb86-48a2-b01a-0108e8435e8c} - {a7b6f111-b005-4b35-9c9e-35a3108237b3} + {44916bbe-e2cd-46d9-b23e-eacdb4b52259} - {a7f480c0-5b2c-4100-b4b4-85fbb054cd00} + {a2bf611e-a790-4933-954f-648d62ecc1e5} - {8923e8f4-edb2-4e1f-a73b-441c6eec3ff7} + {f7a00efb-463b-466a-8380-b41cf3ed28d2} - {c20480f2-2707-47de-ba34-77ee87349631} + {852eeb6c-ce4b-41f9-97d4-7bfa3989abf0} - {52583bc6-77ed-4a85-9e76-91620d06c817} + {0e950b39-859d-4f56-a405-366e0876831b} - {daa86ff8-3c83-4b0f-9a0f-5985b5728dc8} + {a95fbc6f-18d1-4d86-8e62-5411321a1780} diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h index c8eedb638f..38b7ea502f 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureSocketImpl.h @@ -284,16 +284,21 @@ class NetSSL_API SecureSocketImpl /// Callback to handle new session data sent by server. private: + using MutexT = Poco::FastMutex; + using LockT = MutexT::ScopedLock; + using UnLockT = Poco::ScopedLockWithUnlock; + SecureSocketImpl(const SecureSocketImpl&); SecureSocketImpl& operator = (const SecureSocketImpl&); - SSL* _pSSL; + std::atomic _pSSL; Poco::AutoPtr _pSocket; Context::Ptr _pContext; bool _needHandshake; std::string _peerHostName; Session::Ptr _pSession; bool _bidirectShutdown = true; + mutable MutexT _mutex; friend class SecureStreamSocketImpl; friend class Context; diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h index 016757beaf..4e228b6a40 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocket.h @@ -132,7 +132,7 @@ class NetSSL_API SecureStreamSocket: public StreamSocket /// a SecureStreamSocketImpl, otherwise an InvalidArgumentException /// will be thrown. - virtual ~SecureStreamSocket(); + ~SecureStreamSocket() override; /// Destroys the StreamSocket. SecureStreamSocket& operator = (const Socket& socket); diff --git a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h index 8114b036f3..1327a67cd0 100644 --- a/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h +++ b/NetSSL_OpenSSL/include/Poco/Net/SecureStreamSocketImpl.h @@ -39,12 +39,12 @@ class NetSSL_API SecureStreamSocketImpl: public StreamSocketImpl SecureStreamSocketImpl(StreamSocketImpl* pStreamSocket, Context::Ptr pContext); /// Creates the SecureStreamSocketImpl. - SocketImpl* acceptConnection(SocketAddress& clientAddr); + SocketImpl* acceptConnection(SocketAddress& clientAddr) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - void connect(const SocketAddress& address); + void connect(const SocketAddress& address) override; /// Initializes the socket and establishes a connection to /// the TCP server at the given address. /// @@ -52,57 +52,57 @@ class NetSSL_API SecureStreamSocketImpl: public StreamSocketImpl /// connection is established. Instead, incoming and outgoing /// packets are restricted to the specified address. - void connect(const SocketAddress& address, const Poco::Timespan& timeout); + void connect(const SocketAddress& address, const Poco::Timespan& timeout) override; /// Initializes the socket, sets the socket timeout and /// establishes a connection to the TCP server at the given address. - void connectNB(const SocketAddress& address); + void connectNB(const SocketAddress& address) override; /// Initializes the socket and establishes a connection to /// the TCP server at the given address. Prior to opening the /// connection the socket is set to nonblocking mode. - void bind(const SocketAddress& address, bool reuseAddress = false); + void bind(const SocketAddress& address, bool reuseAddress = false) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - void listen(int backlog = 64); + void listen(int backlog = 64) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - void close(); + void close() override; /// Close the socket. - int sendBytes(const void* buffer, int length, int flags = 0); + int sendBytes(const void* buffer, int length, int flags = 0) override; /// Sends the contents of the given buffer through /// the socket. Any specified flags are ignored. /// /// Returns the number of bytes sent, which may be /// less than the number of bytes specified. - int receiveBytes(void* buffer, int length, int flags = 0); + int receiveBytes(void* buffer, int length, int flags = 0) override; /// Receives data from the socket and stores it /// in buffer. Up to length bytes are received. /// /// Returns the number of bytes received. - int sendTo(const void* buffer, int length, const SocketAddress& address, int flags = 0); + int sendTo(const void* buffer, int length, const SocketAddress& address, int flags = 0) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - int receiveFrom(void* buffer, int length, SocketAddress& address, int flags = 0); + int receiveFrom(void* buffer, int length, SocketAddress& address, int flags = 0) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - void sendUrgent(unsigned char data); + void sendUrgent(unsigned char data) override; /// Not supported by a SecureStreamSocket. /// /// Throws a Poco::InvalidAccessException. - int available(); + int available() override; /// Returns the number of bytes available that can be read /// without causing the socket to block. /// @@ -110,26 +110,26 @@ class NetSSL_API SecureStreamSocketImpl: public StreamSocketImpl /// can be read from the currently buffered SSL record, /// before a new record is read from the underlying socket. - void shutdownReceive(); + void shutdownReceive() override; /// Shuts down the receiving part of the socket connection. /// /// Since SSL does not support a half shutdown, this does /// nothing. - void shutdownSend(); + void shutdownSend() override; /// Shuts down the receiving part of the socket connection. /// /// Since SSL does not support a half shutdown, this does /// nothing. - void shutdown(); + void shutdown() override; /// Shuts down the SSL connection. void abort(); /// Aborts the connection by closing the underlying /// TCP connection. No orderly SSL shutdown is performed. - bool secure() const; + bool secure() const override; /// Returns true iff the socket's connection is secure /// (using SSL or TLS). @@ -203,7 +203,7 @@ class NetSSL_API SecureStreamSocketImpl: public StreamSocketImpl void connectSSL(); /// Performs a SSL client-side handshake on an already connected TCP socket. - ~SecureStreamSocketImpl(); + ~SecureStreamSocketImpl() override; /// Destroys the SecureStreamSocketImpl. static int lastError(); diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen index 6c28cacf47..6d768e64a0 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer.progen @@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj index e763ef0d71..4482daef29 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 HTTPSTimeServerd HTTPSTimeServerd HTTPSTimeServerd @@ -232,6 +232,57 @@ obj64\HTTPSTimeServer\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj.filters b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj.filters index e8aaba676f..a139cd1ea2 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {51840113-cbdf-45cf-a6ad-a06b0e75cb00} + {fb829482-4804-4ad3-a635-fb443e99d5cf} - {3f00c4d1-dddb-47b1-bb5d-a8b5a9f28d8f} + {32471a68-6764-4cad-8714-8899ca741f2f} diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj index 501b246f18..177032168b 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 HTTPSTimeServer {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9} HTTPSTimeServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServerd + HTTPSTimeServer + HTTPSTimeServer + HTTPSTimeServer HTTPSTimeServerd HTTPSTimeServerd HTTPSTimeServerd @@ -171,6 +250,36 @@ HTTPSTimeServer HTTPSTimeServer + + binA64\ + objA64\HTTPSTimeServer\$(Configuration)\ + true + + + binA64\ + objA64\HTTPSTimeServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\HTTPSTimeServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\HTTPSTimeServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\HTTPSTimeServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\HTTPSTimeServer\$(Configuration)\ + false + bin\ obj\HTTPSTimeServer\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\HTTPSTimeServer\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\HTTPSTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPSTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPSTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\HTTPSTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\HTTPSTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +1042,8 @@ true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj.filters b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj.filters index e012485937..53961dd3ab 100644 --- a/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/HTTPSTimeServer/HTTPSTimeServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {25b12d13-8779-438a-8f68-1ff1243a25d7} + {c69a3b82-8792-4759-9247-59b6242c5f69} - {98031ea1-2099-4dd1-8e3f-a399c873dbd3} + {e5330648-c1ab-4bbf-9a98-43d56f23133e} diff --git a/NetSSL_OpenSSL/samples/Mail/Mail.progen b/NetSSL_OpenSSL/samples/Mail/Mail.progen index 6c28cacf47..6d768e64a0 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail.progen +++ b/NetSSL_OpenSSL/samples/Mail/Mail.progen @@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj b/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj index ef83d66a49..d9a68969ba 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Maild Maild Maild @@ -232,6 +232,57 @@ obj64\Mail\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj.filters b/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj.filters index 152eeb896f..5e089d7afe 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {878ccd69-9cfe-4edb-a43e-d2960cc5ab09} + {4b6fc726-3e55-4727-a648-de19248946f4} diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj b/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj index c3fb3fa891..7e9334b563 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 Mail {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA} Mail @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + Maild + Maild + Maild + Mail + Mail + Mail Maild Maild Maild @@ -171,6 +250,36 @@ Mail Mail + + binA64\ + objA64\Mail\$(Configuration)\ + true + + + binA64\ + objA64\Mail\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\Mail\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\Mail\$(Configuration)\ + false + + + binA64\static_md\ + objA64\Mail\$(Configuration)\ + true + + + binA64\static_md\ + objA64\Mail\$(Configuration)\ + false + bin\ obj\Mail\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\Mail\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\Mail.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Maild.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\Mail.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\Maild.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\Maild.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +1039,8 @@ true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj.filters b/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj.filters index e17d6d3e7c..15182dec52 100644 --- a/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/Mail/Mail_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {750093a5-8f32-4ab2-8966-b9490ee494dd} + {b9a39919-ec0d-43cb-926e-ce4dde793e09} diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen index 6c28cacf47..6d768e64a0 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP.progen @@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj index 81ec57dc6d..dafdb04ced 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SetSourceIPd SetSourceIPd SetSourceIPd @@ -232,6 +232,57 @@ obj64\SetSourceIP\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj.filters b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj.filters index 8adc0ecbd6..afcc1175c9 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {a83bddae-4e20-463d-8b40-b9571cc1a311} + {d4e29a37-d702-49f5-b10d-f667e666455a} diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj index a3df3f5d3c..93faaf76a8 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SetSourceIP {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB} SetSourceIP @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>16.0.32002.118 + <_ProjectFileVersion>17.0.34714.143 + SetSourceIPd + SetSourceIPd + SetSourceIPd + SetSourceIP + SetSourceIP + SetSourceIP SetSourceIPd SetSourceIPd SetSourceIPd @@ -171,6 +250,36 @@ SetSourceIP SetSourceIP + + binA64\ + objA64\SetSourceIP\$(Configuration)\ + true + + + binA64\ + objA64\SetSourceIP\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SetSourceIP\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SetSourceIP\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SetSourceIP\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SetSourceIP\$(Configuration)\ + false + bin\ obj\SetSourceIP\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\SetSourceIP\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SetSourceIP.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SetSourceIPd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SetSourceIP.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SetSourceIPd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SetSourceIPd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +1039,8 @@ true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj.filters b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj.filters index 41c71de6ab..d48f840248 100644 --- a/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/SetSourceIP/SetSourceIP_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {e0c83b55-6767-4257-8699-27bd79dd9cef} + {5611fc43-2ba8-4b0a-becb-ac95547b0059} diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen index aab070e1a8..6e3d941486 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient.progen @@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\JSON\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj index 99403b4ef7..17a121e053 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TwitterClientd TwitterClientd TwitterClientd @@ -232,6 +232,57 @@ obj64\TwitterClient\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj.filters b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj.filters index 724e9d5845..25b2aae202 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7d622e8f-1a53-4a2a-a1a3-df26e9873cc5} + {322054a2-2a9f-4dc0-802f-4652e96a8758} - {fafd3475-6a46-42c7-a36d-4220d9394845} + {c4f9d672-f685-4786-9db4-b24aa3c7e040} diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj index d883066b72..5b4abeb2c6 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 TwitterClient {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E} TwitterClient @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + TwitterClientd + TwitterClientd + TwitterClientd + TwitterClient + TwitterClient + TwitterClient TwitterClientd TwitterClientd TwitterClientd @@ -171,6 +250,36 @@ TwitterClient TwitterClient + + binA64\ + objA64\TwitterClient\$(Configuration)\ + true + + + binA64\ + objA64\TwitterClient\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\TwitterClient\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\TwitterClient\$(Configuration)\ + false + + + binA64\static_md\ + objA64\TwitterClient\$(Configuration)\ + true + + + binA64\static_md\ + objA64\TwitterClient\$(Configuration)\ + false + bin\ obj\TwitterClient\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\TwitterClient\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\TwitterClient.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TwitterClientd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\TwitterClient.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\TwitterClientd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TwitterClientd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,9 +1039,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj.filters b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj.filters index 183cc41f98..49d8a25133 100644 --- a/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/TwitterClient/TwitterClient_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {ec261d02-ad76-418e-ab7c-aab19476847f} + {d78f0b7c-f692-49b2-81c6-c708cd0aed85} - {37ab4050-5ce8-4c27-9fa5-4e6cb291018c} + {e1565b76-8606-401f-8e2e-47678e0c1b0b} diff --git a/NetSSL_OpenSSL/samples/download/download.progen b/NetSSL_OpenSSL/samples/download/download.progen index 6c28cacf47..6d768e64a0 100644 --- a/NetSSL_OpenSSL/samples/download/download.progen +++ b/NetSSL_OpenSSL/samples/download/download.progen @@ -4,6 +4,7 @@ vc.project.target = ${vc.project.name} vc.project.type = executable vc.project.pocobase = ..\\..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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 = ..\\..\\..\\Foundation\\include;..\\..\\..\\XML\\include;..\\..\\..\\Util\\include;..\\..\\..\\Net\\include;..\\..\\..\\NetSSL_OpenSSL\\include;..\\..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj b/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj index 9ac00db3a8..eb6a0bc35d 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj +++ b/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 downloadd downloadd downloadd @@ -232,6 +232,57 @@ obj64\download\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj.filters b/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj.filters index 875179bd46..732240b29d 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/download/download_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {2187b503-aa52-4294-a53d-fc099c0e2928} + {e4a49aee-7e30-484a-8963-da504575b9c6} diff --git a/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj b/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj index 7dbf913d8b..d428cadca5 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj +++ b/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 download {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D} download @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + downloadd + downloadd + downloadd + download + download + download downloadd downloadd downloadd @@ -171,6 +250,36 @@ download download + + binA64\ + objA64\download\$(Configuration)\ + true + + + binA64\ + objA64\download\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\download\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\download\$(Configuration)\ + false + + + binA64\static_md\ + objA64\download\$(Configuration)\ + true + + + binA64\static_md\ + objA64\download\$(Configuration)\ + false + bin\ obj\download\$(Configuration)\ @@ -231,6 +340,288 @@ obj64\download\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\download.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\downloadd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\download.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\downloadd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;..\..\..\NetSSL_OpenSSL\include;..\..\..\Crypto\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +650,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +719,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +788,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +857,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +926,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +995,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\downloadd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +1039,8 @@ true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj.filters b/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj.filters index 5bae55fd64..934cac4d30 100644 --- a/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/samples/download/download_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {076546ab-fc2d-4873-9251-a363fd342cc0} + {26716e22-d9fa-4dc6-a924-55295e2c1d9c} diff --git a/NetSSL_OpenSSL/samples/samples_vs170.sln b/NetSSL_OpenSSL/samples/samples_vs170.sln index 15348158e0..95920bedb0 100644 --- a/NetSSL_OpenSSL/samples/samples_vs170.sln +++ b/NetSSL_OpenSSL/samples/samples_vs170.sln @@ -12,6 +12,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TwitterClient", "TwitterCli EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -26,6 +32,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Build.0 = debug_shared|Win32 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -62,6 +86,24 @@ Global {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.ActiveCfg = release_static_md|x64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Build.0 = release_static_md|x64 {D853F3D6-0D6F-3E8E-82C7-4216D7A21C4D}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Build.0 = debug_shared|Win32 {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -98,6 +140,24 @@ Global {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.ActiveCfg = release_static_md|x64 {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Build.0 = release_static_md|x64 {F8DE5054-3EC1-3FB4-9FE6-38EE974745A9}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Build.0 = debug_shared|Win32 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -134,6 +194,24 @@ Global {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.ActiveCfg = release_static_md|x64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Build.0 = release_static_md|x64 {BF75C029-EFC9-3A0F-A8F2-8001C11D1FBA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|Win32.Build.0 = debug_shared|Win32 {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -170,6 +248,24 @@ Global {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|x64.ActiveCfg = release_static_md|x64 {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|x64.Build.0 = release_static_md|x64 {1B02F8D6-3C35-33BC-A793-05B5BA54B9AB}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Build.0 = debug_shared|Win32 {CCDD82BC-680D-39C0-AE25-1FBC5B615F7E}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp index 911c0dea0a..8fb3c7f7dd 100644 --- a/NetSSL_OpenSSL/src/SecureSocketImpl.cpp +++ b/NetSSL_OpenSSL/src/SecureSocketImpl.cpp @@ -22,10 +22,7 @@ #include "Poco/Net/SecureStreamSocketImpl.h" #include "Poco/Net/StreamSocketImpl.h" #include "Poco/Net/StreamSocket.h" -#include "Poco/Net/NetException.h" -#include "Poco/Net/DNS.h" #include "Poco/NumberFormatter.h" -#include "Poco/NumberParser.h" #include "Poco/Format.h" #include #include @@ -38,16 +35,12 @@ using Poco::NumberFormatter; using Poco::Timespan; -// workaround for C++-incompatible macro -#define POCO_BIO_set_nbio_accept(b,n) BIO_ctrl(b,BIO_C_SET_ACCEPT,1,(void*)((n)?"a":NULL)) - - namespace Poco { namespace Net { SecureSocketImpl::SecureSocketImpl(Poco::AutoPtr pSocketImpl, Context::Ptr pContext): - _pSSL(0), + _pSSL(nullptr), _pSocket(pSocketImpl), _pContext(pContext), _needHandshake(false) @@ -61,6 +54,7 @@ SecureSocketImpl::~SecureSocketImpl() { try { + close(); reset(); } catch (...) @@ -86,14 +80,16 @@ void SecureSocketImpl::acceptSSL() { poco_assert (!_pSSL); - BIO* pBIO = BIO_new(BIO_s_socket()); + LockT l(_mutex); + + BIO* pBIO = ::BIO_new(BIO_s_socket()); if (!pBIO) throw SSLException("Cannot create BIO object"); BIO_set_fd(pBIO, static_cast(_pSocket->sockfd()), BIO_NOCLOSE); - _pSSL = SSL_new(_pContext->sslContext()); + _pSSL = ::SSL_new(_pContext->sslContext()); if (!_pSSL) { - BIO_free(pBIO); + ::BIO_free(pBIO); throw SSLException("Cannot create SSL object"); } @@ -105,15 +101,15 @@ void SecureSocketImpl::acceptSSL() * tickets. */ if (1 != SSL_set_num_tickets(_pSSL, 0)) { - BIO_free(pBIO); + ::BIO_free(pBIO); throw SSLException("Cannot create SSL object"); } //Otherwise we can perform two-way shutdown. Client must call SSL_read() before the final SSL_shutdown(). #endif - SSL_set_bio(_pSSL, pBIO, pBIO); - SSL_set_accept_state(_pSSL); - SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), this); + ::SSL_set_bio(_pSSL, pBIO, pBIO); + ::SSL_set_accept_state(_pSSL); + ::SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), this); _needHandshake = true; } @@ -162,18 +158,20 @@ void SecureSocketImpl::connectSSL(bool performHandshake) poco_assert (!_pSSL); poco_assert (_pSocket->initialized()); - BIO* pBIO = BIO_new(BIO_s_socket()); + LockT l(_mutex); + + ::BIO* pBIO = ::BIO_new(BIO_s_socket()); if (!pBIO) throw SSLException("Cannot create SSL BIO object"); BIO_set_fd(pBIO, static_cast(_pSocket->sockfd()), BIO_NOCLOSE); - _pSSL = SSL_new(_pContext->sslContext()); + _pSSL = ::SSL_new(_pContext->sslContext()); if (!_pSSL) { - BIO_free(pBIO); + ::BIO_free(pBIO); throw SSLException("Cannot create SSL object"); } - SSL_set_bio(_pSSL, pBIO, pBIO); - SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), this); + ::SSL_set_bio(_pSSL, pBIO, pBIO); + ::SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), this); if (!_peerHostName.empty()) { @@ -189,27 +187,27 @@ void SecureSocketImpl::connectSSL(bool performHandshake) if (_pSession && _pSession->isResumable()) { - SSL_set_session(_pSSL, _pSession->sslSession()); + ::SSL_set_session(_pSSL, _pSession->sslSession()); } try { if (performHandshake && _pSocket->getBlocking()) { - int ret = SSL_connect(_pSSL); + int ret = ::SSL_connect(_pSSL); handleError(ret); verifyPeerCertificate(); } else { - SSL_set_connect_state(_pSSL); + ::SSL_set_connect_state(_pSSL); _needHandshake = true; } } catch (...) { - SSL_free(_pSSL); - _pSSL = 0; + ::SSL_free(_pSSL); + _pSSL = nullptr; throw; } } @@ -259,11 +257,13 @@ void SecureSocketImpl::shutdown() { if (_pSSL) { - // Don't shut down the socket more than once. - int shutdownState = SSL_get_shutdown(_pSSL); - bool shutdownSent = (shutdownState & SSL_SENT_SHUTDOWN) == SSL_SENT_SHUTDOWN; - if (!shutdownSent) - { + UnLockT l(_mutex); + + // Don't shut down the socket more than once. + int shutdownState = ::SSL_get_shutdown(_pSSL); + bool shutdownSent = (shutdownState & SSL_SENT_SHUTDOWN) == SSL_SENT_SHUTDOWN; + if (!shutdownSent) + { // A proper clean shutdown would require us to // retry the shutdown if we get a zero return // value, until SSL_shutdown() returns 1. @@ -274,7 +274,7 @@ void SecureSocketImpl::shutdown() #if OPENSSL_VERSION_NUMBER >= 0x30000000L int rc = 0; if (!_bidirectShutdown) - rc = SSL_shutdown(_pSSL); + rc = ::SSL_shutdown(_pSSL); else { Poco::Timespan recvTimeout = _pSocket->getReceiveTimeout(); @@ -282,11 +282,11 @@ void SecureSocketImpl::shutdown() Poco::Timestamp tsNow; do { - rc = SSL_shutdown(_pSSL); + rc = ::SSL_shutdown(_pSSL); if (rc == 1) break; if (rc < 0) { - int err = SSL_get_error(_pSSL, rc); + int err = ::SSL_get_error(_pSSL, rc); if (err == SSL_ERROR_WANT_READ) _pSocket->poll(pollTimeout, Poco::Net::Socket::SELECT_READ); else if (err == SSL_ERROR_WANT_WRITE) @@ -294,7 +294,7 @@ void SecureSocketImpl::shutdown() else { int socketError = SocketImpl::lastError(); - long lastError = ERR_get_error(); + long lastError = ::ERR_get_error(); if ((err == SSL_ERROR_SSL) && (socketError == 0) && (lastError == 0x0A000123)) rc = 0; break; @@ -304,9 +304,12 @@ void SecureSocketImpl::shutdown() } while (!tsNow.isElapsed(recvTimeout.totalMicroseconds())); } #else - int rc = SSL_shutdown(_pSSL); + int rc = ::SSL_shutdown(_pSSL); #endif if (rc < 0) handleError(rc); + + l.unlock(); + if (_pSocket->getBlocking()) { _pSocket->shutdown(); @@ -351,6 +354,9 @@ int SecureSocketImpl::sendBytes(const void* buffer, int length, int flags) poco_check_ptr (_pSSL); int rc; + + LockT l(_mutex); + if (_needHandshake) { rc = completeHandshake(); @@ -361,11 +367,17 @@ int SecureSocketImpl::sendBytes(const void* buffer, int length, int flags) else return rc; } - do + const auto sendTimeout = _pSocket->getSendTimeout(); + Poco::Timestamp tsStart; + while (true) { - rc = SSL_write(_pSSL, buffer, length); - } - while (mustRetry(rc)); + rc = ::SSL_write(_pSSL, buffer, length); + if (!mustRetry(rc)) + break; + + if (tsStart.isElapsed(sendTimeout.totalMicroseconds())) + throw Poco::TimeoutException(); + }; if (rc <= 0) { rc = handleError(rc); @@ -381,6 +393,9 @@ int SecureSocketImpl::receiveBytes(void* buffer, int length, int flags) poco_check_ptr (_pSSL); int rc; + + LockT l(_mutex); + if (_needHandshake) { rc = completeHandshake(); @@ -389,11 +404,18 @@ int SecureSocketImpl::receiveBytes(void* buffer, int length, int flags) else return rc; } - do + + const auto recvTimeout = _pSocket->getReceiveTimeout(); + Poco::Timestamp tsStart; + while (true) { - rc = SSL_read(_pSSL, buffer, length); - } - while (mustRetry(rc)); + rc = ::SSL_read(_pSSL, buffer, length); + if (!mustRetry(rc)) + break; + + if (tsStart.isElapsed(recvTimeout.totalMicroseconds())) + throw Poco::TimeoutException(); + }; _bidirectShutdown = false; if (rc <= 0) { @@ -407,7 +429,9 @@ int SecureSocketImpl::available() const { poco_check_ptr (_pSSL); - return SSL_pending(_pSSL); + LockT l(_mutex); + + return ::SSL_pending(_pSSL); } @@ -417,11 +441,17 @@ int SecureSocketImpl::completeHandshake() poco_check_ptr (_pSSL); int rc; - do + const auto recvTimeout = _pSocket->getReceiveTimeout(); + Poco::Timestamp tsStart; + while (true) { - rc = SSL_do_handshake(_pSSL); - } - while (mustRetry(rc)); + rc = ::SSL_do_handshake(_pSSL); + if (!mustRetry(rc)) + break; + + if (tsStart.isElapsed(recvTimeout.totalMicroseconds())) + throw Poco::TimeoutException(); + }; if (rc <= 0) { return handleError(rc); @@ -455,12 +485,12 @@ long SecureSocketImpl::verifyPeerCertificateImpl(const std::string& hostName) { Context::VerificationMode mode = _pContext->verificationMode(); if (mode == Context::VERIFY_NONE || !_pContext->extendedCertificateVerificationEnabled() || - (mode != Context::VERIFY_STRICT && isLocalHost(hostName))) + (mode != Context::VERIFY_STRICT && isLocalHost(hostName))) { return X509_V_OK; } - X509* pCert = SSL_get_peer_certificate(_pSSL); + ::X509* pCert = ::SSL_get_peer_certificate(_pSSL); if (pCert) { X509Certificate cert(pCert); @@ -477,7 +507,7 @@ bool SecureSocketImpl::isLocalHost(const std::string& hostName) SocketAddress addr(hostName, 0); return addr.host().isLoopback(); } - catch (Poco::Exception&) + catch (const Poco::Exception&) { return false; } @@ -486,10 +516,14 @@ bool SecureSocketImpl::isLocalHost(const std::string& hostName) X509* SecureSocketImpl::peerCertificate() const { + LockT l(_mutex); + + X509* pCert = nullptr; + if (_pSSL) - return SSL_get_peer_certificate(_pSSL); + return ::SSL_get_peer_certificate(_pSSL); else - return 0; + return nullptr; } @@ -497,26 +531,24 @@ bool SecureSocketImpl::mustRetry(int rc) { if (rc <= 0) { - int sslError = SSL_get_error(_pSSL, rc); + static const Poco::Timespan pollTimeout(0, 100000); + + int sslError = ::SSL_get_error(_pSSL, rc); int socketError = _pSocket->lastError(); switch (sslError) { case SSL_ERROR_WANT_READ: if (_pSocket->getBlocking()) { - if (_pSocket->poll(_pSocket->getReceiveTimeout(), Poco::Net::Socket::SELECT_READ)) - return true; - else - throw Poco::TimeoutException(); + _pSocket->poll(pollTimeout, Poco::Net::Socket::SELECT_READ); + return true; } break; case SSL_ERROR_WANT_WRITE: if (_pSocket->getBlocking()) { - if (_pSocket->poll(_pSocket->getSendTimeout(), Poco::Net::Socket::SELECT_WRITE)) - return true; - else - throw Poco::TimeoutException(); + _pSocket->poll(pollTimeout, Poco::Net::Socket::SELECT_WRITE); + return true; } break; case SSL_ERROR_SYSCALL: @@ -533,7 +565,7 @@ int SecureSocketImpl::handleError(int rc) { if (rc > 0) return rc; - int sslError = SSL_get_error(_pSSL, rc); + int sslError = ::SSL_get_error(_pSSL, rc); int socketError = SocketImpl::lastError(); switch (sslError) @@ -569,12 +601,12 @@ int SecureSocketImpl::handleError(int rc) // fallthrough default: { - long lastError = ERR_get_error(); + long lastError = ::ERR_get_error(); std::string msg; if (lastError) { char buffer[256]; - ERR_error_string_n(lastError, buffer, sizeof(buffer)); + ::ERR_error_string_n(lastError, buffer, sizeof(buffer)); msg = buffer; } // SSL_GET_ERROR(3ossl): @@ -624,12 +656,13 @@ void SecureSocketImpl::setPeerHostName(const std::string& peerHostName) void SecureSocketImpl::reset() { - close(); if (_pSSL) { - SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), nullptr); - SSL_free(_pSSL); - _pSSL = 0; + LockT l(_mutex); + + ::SSL_set_ex_data(_pSSL, SSLManager::instance().socketIndex(), nullptr); + ::SSL_free(_pSSL); + _pSSL = nullptr; } } @@ -655,15 +688,18 @@ void SecureSocketImpl::useSession(Session::Ptr pSession) bool SecureSocketImpl::sessionWasReused() { if (_pSSL) - return SSL_session_reused(_pSSL) != 0; - else - return false; + { + LockT l(_mutex); + return ::SSL_session_reused(_pSSL) != 0; + } + + return false; } int SecureSocketImpl::onSessionCreated(SSL* pSSL, SSL_SESSION* pSession) { - void* pEx = SSL_get_ex_data(pSSL, SSLManager::instance().socketIndex()); + void* pEx = ::SSL_get_ex_data(pSSL, SSLManager::instance().socketIndex()); if (pEx) { SecureSocketImpl* pThis = reinterpret_cast(pEx); diff --git a/NetSSL_OpenSSL/testsuite/TestSuite.progen b/NetSSL_OpenSSL/testsuite/TestSuite.progen index 61b90bc37f..82305fe944 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite.progen +++ b/NetSSL_OpenSSL/testsuite/TestSuite.progen @@ -4,6 +4,7 @@ vc.project.target = TestSuite vc.project.type = testsuite vc.project.pocobase = ..\\.. vc.project.platforms = Win32 +vc.project.vcpkg = true 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;..\\..\\Crypto\\include diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj index 0aa7fa64db..b55a526477 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -232,6 +232,57 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + Disabled diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj.filters index 2e0e6f6884..cca4fcbc62 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,73 +2,73 @@ - {a1ac25db-b5dd-44b9-9b26-6c55ea17d081} + {517cf45d-4dc2-4fc6-a745-9541c5d2f98d} - {9df4683d-4fc6-48a6-b729-c77fd58608bb} + {3f4970a4-c8cc-4f1c-92ea-418032a9c719} - {27369ed3-bc4e-4497-9de3-657a79e63898} + {94271e26-7291-4c48-8823-355e1c821d1b} - {cc8d4f23-e9b3-474e-867d-af059102f42b} + {3cd38f15-f147-4a87-9f4d-404da5163b23} - {0f77d0ad-8565-483c-b12e-c20316869b87} + {9c566c43-4603-428d-b788-c69a2396e1d7} - {ba7e9e7b-9e27-4bf0-8ae7-a99c6354fbc9} + {e2459d76-9baf-4373-9623-1616f47a753f} - {d86f3270-ac71-47e0-bf70-4ed08ac4b926} + {a27f5035-d136-457a-8d0f-2a428063be21} - {1b776f70-fea0-48ef-9f31-ecccc4ae1c5d} + {ea6c9200-c15c-470a-be44-a2e04f06f651} - {16da7cc0-8451-45b5-860b-b5af4a171693} + {5bac4329-075d-4542-8091-dd78c281c86a} - {741a19d1-6d5b-407c-807c-a6962ed5f099} + {9d3abb67-c90f-475a-85f5-be2a75664e43} - {5ead36bb-340a-4676-abbf-64493186569e} + {78fc165f-58aa-4d01-8d25-849b3f37e9e3} - {bbc719e1-f1fc-4b82-b417-9f3427efa585} + {64e2426d-aeac-49a4-b794-6f08c4e8e5fb} - {53e5cdaf-2449-4c6c-b069-764fe950bc67} + {7e8ada98-6052-4e4a-a5a2-9207308e1eef} - {5228f4dd-5b1b-4aac-8aae-11a56f0c912c} + {7db34932-6771-46ea-9605-48e2876b0c9a} - {8fcbc164-f8d9-4b68-8e06-18a613614ef5} + {761c14f7-0e5c-4ded-a4c9-5054c1f55efe} - {e864b7e8-df0f-4618-83fe-0f4a562896c1} + {0c77fe5d-31fa-4246-be3c-e90c45937b70} - {e6918819-4f66-42f2-8b00-2e2da48bdaa8} + {97471266-0e8e-4dd2-9427-531062b4e5df} - {f5c56f04-07e7-443d-af48-80dfcca3a43d} + {a612c5e0-d45e-4780-83dd-e290e1caa53b} - {175f1249-6424-4aa5-826c-72e99f4d51b1} + {9753ac83-9eae-43aa-b658-09b20e000d8c} - {87a73253-6b5d-49fb-9c8d-fe5a1b322f9f} + {7624c0b7-9027-4a53-8dae-f56fb57c2137} - {d0abc311-0d45-4579-9250-3cb241bc3cbe} + {ff28caca-601d-4608-9787-4689a6151bf7} - {53ec564a-9461-40aa-8611-7032bc6a2b46} + {d04aa999-0dbd-4237-ac5b-5154e7c9f5eb} - {bd9dc45a-244d-48ef-bc5b-729146d60d36} + {ba6e84bb-cde9-4016-b1a7-9ebcdf3919c8} diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj index d966bf4531..4d0ee55859 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -340,6 +340,81 @@ obj64\TestSuite\$(Configuration)\ false + + true + + + Debug + + + Debug + + + Debug + + + Debug + true + true + + + Debug + true + true + + + Debug + true + true + + + Debug + true + + + Debug + true + + + Debug + true + + + Release + + + Release + + + Release + + + Release + true + true + + + Release + true + true + + + Release + true + true + + + Release + true + + + Release + true + + + Release + true + Disabled @@ -356,15 +431,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +467,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +500,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +536,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +569,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +605,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +638,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +650,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +674,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +707,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +719,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +743,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +776,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +788,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +812,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +845,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +857,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +881,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +914,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +926,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +950,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +983,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +995,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +1019,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;Crypt32.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -908,48 +1055,78 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj.filters b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj.filters index 71f1ade67d..43bbd65a4d 100644 --- a/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj.filters +++ b/NetSSL_OpenSSL/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,73 +2,73 @@ - {335b70eb-a1c5-4cc5-ba1e-a478ce499a45} + {c3a05981-6011-4ab0-9e2c-60160be15655} - {79ce92d6-cfb5-4e73-bb1d-6ea7bced9255} + {5517eaa9-06d6-455f-bddb-9d17fa8625b1} - {6c1defdc-292c-4534-b364-d30de83f24f8} + {4491eb64-733b-4cd6-bcb2-25b1cac71297} - {918af941-772b-4e26-8551-1cdce258c4e2} + {cc6ee44a-5d0f-4b46-b34f-6836d409d33f} - {5d081418-ccfa-4731-bf1a-002702f43766} + {988b52b3-e2db-4c70-bb55-d261b2589586} - {fa37ae89-ac9b-4433-a03b-b7f7cbc376ab} + {c16b828d-dee9-4731-903c-aef3d7af8b4e} - {51f0d8b2-aec4-4489-b1cb-f6bdedc35f0c} + {7a10b01c-2305-484b-aa1a-e1169cf2fbda} - {301a9873-6673-4132-9c4a-ab79098a66f3} + {2f6d6161-1b40-41d5-9040-fe72f0419919} - {5ba4eeca-172a-4731-a1da-3879e640d2e8} + {5529961b-1e60-4abc-9411-6f1b0903309c} - {d813b410-a925-427d-8407-456a64e7319f} + {02e82921-6451-4d9b-92df-450047d12934} - {a6f2f0d7-ad32-4913-a9a0-dd3666ad8e49} + {4d987269-abcf-4ff2-979a-dc6ac2d422e8} - {a1958c6f-ea7b-4b73-9282-dc783667e681} + {6f98c368-dc71-4d1c-b7fd-918924efb7bb} - {b68e978e-793e-4c1e-b0ca-2223bc197976} + {e17faf3c-b7bb-42a5-91f1-1dea54723670} - {0eb867e0-e918-4bb0-87ed-36e232c4b8a0} + {6b690686-b1e5-4d15-a176-2c2192963781} - {c15b64eb-c1cb-4ab7-98a1-6d0a2e377194} + {ed3d3d44-36d0-4a87-b2bc-2bd7f0175b69} - {91980deb-2851-498e-a93e-7605e76cfb3a} + {96aa8b80-bd00-4149-a659-583774796c82} - {6e1b307b-6d89-423e-8ce7-20072fb81cc7} + {a69fd3dd-9896-457d-a2cc-c84ae2d1bc20} - {e7a365a1-e648-49d0-ad38-255c61079a15} + {b53e6b9c-7d78-439f-ab0d-a773b91e239d} - {051d8e58-f927-4987-bb28-0d41efbaafd1} + {c9c868ff-fa45-49a1-91f2-342b1658d6f6} - {02ed1bdb-b073-4620-a4d8-7cae27fa2baf} + {d5d05d0b-2d03-4a43-afca-5de5da304580} - {4fec9e6f-af84-4bbe-baa9-e23d6466b403} + {bdd0b4f0-2ef5-46c5-82a1-93293c5dc7cc} - {706222ab-a96e-4e40-996e-7947337bd460} + {67552a5f-b243-4820-80f1-ed09cf114db8} - {bfdf70eb-f4d5-4e45-898d-1a29aa47dc1c} + {931858d4-3bae-43b2-80be-37b1c5c85ac6} diff --git a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp index ab2003c50b..b707febcf1 100644 --- a/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/HTTPSStreamFactoryTest.cpp @@ -103,7 +103,7 @@ void HTTPSStreamFactoryTest::testError() uri.setPort(server.port()); try { - std::istream* pStr = factory.open(uri); + factory.open(uri); fail("not found - must throw"); } catch (HTTPException& exc) diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp index eeb47c4234..bf37e4256b 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.cpp @@ -23,7 +23,7 @@ #include "Poco/Net/SecureServerSocket.h" #include "Poco/Net/NetException.h" #include "Poco/Thread.h" -#include + using Poco::Net::HTTPSClientSession; using Poco::Net::HTTPRequest; @@ -55,13 +55,14 @@ namespace do { n = ws.receiveFrame(pBuffer.get(), static_cast(_bufSize), flags); + Poco::Thread::current()->sleep(handleDelay.totalMilliseconds()); if (n == 0) break; ws.sendFrame(pBuffer.get(), n, flags); } while ((flags & WebSocket::FRAME_OP_BITMASK) != WebSocket::FRAME_OP_CLOSE); } - catch (WebSocketException& exc) + catch (const WebSocketException& exc) { switch (exc.code()) { @@ -79,10 +80,17 @@ namespace } } + public: + + static Poco::Timespan handleDelay; + private: std::size_t _bufSize; }; + Poco::Timespan WebSocketRequestHandler::handleDelay {0}; + + class WebSocketRequestHandlerFactory: public Poco::Net::HTTPRequestHandlerFactory { public: @@ -90,7 +98,7 @@ namespace { } - Poco::Net::HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request) + Poco::Net::HTTPRequestHandler* createRequestHandler(const HTTPServerRequest& request) override { return new WebSocketRequestHandler(_bufSize); } @@ -111,6 +119,46 @@ WebSocketTest::~WebSocketTest() } +void WebSocketTest::testWebSocketTimeout() +{ + Poco::Net::SecureServerSocket ss(0); + Poco::Net::HTTPServer server(new WebSocketRequestHandlerFactory, ss, new Poco::Net::HTTPServerParams); + server.start(); + + Poco::Thread::sleep(200); + + HTTPSClientSession cs("127.0.0.1", ss.address().port()); + HTTPRequest request(HTTPRequest::HTTP_GET, "/ws"); + HTTPResponse response; + WebSocket ws(cs, request, response); + ws.setSendTimeout( Poco::Timespan(2, 0)); + ws.setReceiveTimeout( Poco::Timespan(2, 0)); + + Poco::Timestamp sendStart; + char buffer[1024] = {}; + int flags; + try + { + // Server will take long to process and cause WS timeout + WebSocketRequestHandler::handleDelay.assign(3, 0); + + std::string payload("x"); + ws.sendFrame(payload.data(), (int) payload.size()); + ws.receiveFrame(buffer, sizeof(buffer), flags); + + failmsg("Data exchange shall time out."); + } + catch (const Poco::TimeoutException& te) + { + assertTrue(sendStart.elapsed() < Poco::Timespan(4, 0).totalMicroseconds()); + } + + ws.shutdown(); + ws.receiveFrame(buffer, sizeof(buffer), flags); + server.stop(); +} + + void WebSocketTest::testWebSocket() { Poco::Net::SecureServerSocket ss(0); @@ -227,6 +275,7 @@ CppUnit::Test* WebSocketTest::suite() CppUnit::TestSuite* pSuite = new CppUnit::TestSuite("WebSocketTest"); CppUnit_addTest(pSuite, WebSocketTest, testWebSocket); + CppUnit_addTest(pSuite, WebSocketTest, testWebSocketTimeout); CppUnit_addTest(pSuite, WebSocketTest, testWebSocketLarge); return pSuite; diff --git a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h index 87d943da7c..f8ea9131c6 100644 --- a/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h +++ b/NetSSL_OpenSSL/testsuite/src/WebSocketTest.h @@ -22,13 +22,14 @@ class WebSocketTest: public CppUnit::TestCase { public: WebSocketTest(const std::string& name); - ~WebSocketTest(); + ~WebSocketTest() override; + void testWebSocketTimeout(); void testWebSocket(); void testWebSocketLarge(); - void setUp(); - void tearDown(); + void setUp() override; + void tearDown() override; static CppUnit::Test* suite(); diff --git a/NetSSL_OpenSSL/vcpkg-configuration.json b/NetSSL_OpenSSL/vcpkg-configuration.json new file mode 100644 index 0000000000..c540ec736f --- /dev/null +++ b/NetSSL_OpenSSL/vcpkg-configuration.json @@ -0,0 +1,14 @@ +{ + "default-registry": { + "kind": "git", + "baseline": "000d1bda1ffa95a73e0b40334fa4103d6f4d3d48", + "repository": "https://github.com/microsoft/vcpkg" + }, + "registries": [ + { + "kind": "artifact", + "location": "https://github.com/microsoft/vcpkg-ce-catalog/archive/refs/heads/main.zip", + "name": "microsoft" + } + ] +} diff --git a/NetSSL_OpenSSL/vcpkg.json b/NetSSL_OpenSSL/vcpkg.json new file mode 100644 index 0000000000..3ed9a36b23 --- /dev/null +++ b/NetSSL_OpenSSL/vcpkg.json @@ -0,0 +1,5 @@ +{ + "dependencies": [ + "openssl" + ] +} diff --git a/PageCompiler/File2Page/File2Page_vs160.vcxproj b/PageCompiler/File2Page/File2Page_vs160.vcxproj index a0dd8d61d8..f368f3c347 100644 --- a/PageCompiler/File2Page/File2Page_vs160.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters index 1e4421baef..89fcc80966 100644 --- a/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {0b919fc7-d15e-486b-b980-1e5ca63fa7d1} + {1a569291-4402-44a6-9277-3f6de161eb8b} - {9476fc2e-02bf-41dd-8370-bbf2441eb488} + {f629b1ca-473b-4e72-8408-5c5e5bee08e6} diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj b/PageCompiler/File2Page/File2Page_vs170.vcxproj index fa92b209e5..8ce37b61b3 100644 --- a/PageCompiler/File2Page/File2Page_vs170.vcxproj +++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 f2cpspd f2cpspd f2cpspd diff --git a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters index 3bf35e99a7..12579cd916 100644 --- a/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters +++ b/PageCompiler/File2Page/File2Page_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {4d670046-8040-4f17-9e30-03c088a1f050} + {4159d9d4-12bf-4940-8fd1-4d8be6124b64} - {e6d9313e-e10d-4518-96c4-2f94f8c82d53} + {a78376f4-1971-4c26-8640-3024bc8323c9} diff --git a/PageCompiler/PageCompiler.make b/PageCompiler/PageCompiler.make index a109b320df..77251a9b0c 100644 --- a/PageCompiler/PageCompiler.make +++ b/PageCompiler/PageCompiler.make @@ -8,6 +8,7 @@ # a Makefile. # +ifndef PAGE_COMPILER ifneq (,$(findstring debug,$(DEFAULT_TARGET) $(MAKECMDGOALS))) ifneq (,$(findstring static,$(DEFAULT_TARGET) $(MAKECMDGOALS))) PAGE_COMPILER = $(POCO_BASE)/PageCompiler/$(POCO_HOST_BINDIR)/static/cpspcd @@ -21,3 +22,4 @@ else PAGE_COMPILER = $(POCO_BASE)/PageCompiler/$(POCO_HOST_BINDIR)/cpspc endif endif +endif diff --git a/PageCompiler/PageCompiler_vs160.vcxproj b/PageCompiler/PageCompiler_vs160.vcxproj index ff504e39b1..052174f98a 100644 --- a/PageCompiler/PageCompiler_vs160.vcxproj +++ b/PageCompiler/PageCompiler_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_vs160.vcxproj.filters b/PageCompiler/PageCompiler_vs160.vcxproj.filters index 40f8133d6a..b666ea2ccb 100644 --- a/PageCompiler/PageCompiler_vs160.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {11a28caa-b960-49c1-b7f8-d916a21d1c46} + {995e3a5e-acaa-49cc-912b-bb183e0b8b88} - {d58f87ea-d435-4d09-9685-8405ceefaf25} + {b220abd0-becf-4c40-8bb8-2bfbd2d79520} - {dcd4e5f7-a1ad-412c-9b69-da01e91595fc} + {510344c4-1ac7-4186-b25f-b3560c565dc1} diff --git a/PageCompiler/PageCompiler_vs170.vcxproj b/PageCompiler/PageCompiler_vs170.vcxproj index a336db198a..1d3c5eda5c 100644 --- a/PageCompiler/PageCompiler_vs170.vcxproj +++ b/PageCompiler/PageCompiler_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 cpspcd cpspcd cpspcd diff --git a/PageCompiler/PageCompiler_vs170.vcxproj.filters b/PageCompiler/PageCompiler_vs170.vcxproj.filters index d33b18cddd..ec1bf1f1fa 100644 --- a/PageCompiler/PageCompiler_vs170.vcxproj.filters +++ b/PageCompiler/PageCompiler_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {103c577e-1024-4356-877a-36eb70613768} + {068da949-a12d-40bd-bf33-5e5157225ad7} - {d1492508-83e0-482f-9a79-49539e1a7fe8} + {d4f90632-9b75-4198-8d5a-d21a0de74a59} - {78a8528f-97de-4d4e-a65a-1e1f72c3893a} + {5d022de6-2e19-468f-bcff-4f8c0fce4116} diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj index a7707f708d..ad34d11863 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 HTTPTimeServerd HTTPTimeServerd HTTPTimeServerd diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters index 953072f2cc..4d14c1b4f2 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {beddb1c5-42cf-406c-b799-f25409919fe7} + {67e64969-b648-4a78-a464-9694bfd51b68} - {144d5a4a-fe08-4be4-b51e-530625c0a75c} + {9996e6a0-8dfb-4498-b7e9-b257fc9505ee} - {0e8e6e27-e948-4160-b81f-42204222040d} + {587fc299-1546-4233-b6ec-d8ffc9a96933} diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj index 027a9d0edf..d08e30a29f 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 HTTPTimeServer {18A0143A-444A-38E3-838C-1ACFBE4EE18C} HTTPTimeServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServerd + HTTPTimeServer + HTTPTimeServer + HTTPTimeServer HTTPTimeServerd HTTPTimeServerd HTTPTimeServerd @@ -171,6 +250,36 @@ HTTPTimeServer HTTPTimeServer + + binA64\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\ + objA64\HTTPTimeServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\HTTPTimeServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\HTTPTimeServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\HTTPTimeServer\$(Configuration)\ + false + bin\ obj\HTTPTimeServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\HTTPTimeServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\HTTPTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\HTTPTimeServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\HTTPTimeServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\HTTPTimeServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,9 +967,13 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters index 38de691bd9..91d3f8a345 100644 --- a/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters +++ b/PageCompiler/samples/HTTPTimeServer/HTTPTimeServer_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {0a5a20e1-ae29-49a9-b112-d5df18f0dde9} + {b9fc66eb-46f6-4822-99a7-f71d7705d83a} - {e44f3bdd-a1a8-4747-a816-8d333d01982a} + {38f9d9e0-6c00-4c98-afd6-5cd3c842c838} - {56dee216-d640-4554-8878-fd96133d033f} + {3a3b0a8e-9eee-45f8-b258-4a8012708a7e} diff --git a/PageCompiler/samples/samples_vs170.sln b/PageCompiler/samples/samples_vs170.sln index f430a715bd..8ebca4a977 100644 --- a/PageCompiler/samples/samples_vs170.sln +++ b/PageCompiler/samples/samples_vs170.sln @@ -4,6 +4,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPTimeServer", "HTTPTimeS EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -18,6 +24,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Build.0 = debug_shared|Win32 {18A0143A-444A-38E3-838C-1ACFBE4EE18C}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/PageCompiler/src/PageCompiler.cpp b/PageCompiler/src/PageCompiler.cpp index 67d7b57ffa..82133bd607 100644 --- a/PageCompiler/src/PageCompiler.cpp +++ b/PageCompiler/src/PageCompiler.cpp @@ -216,7 +216,7 @@ class CompilerApp: public Application helpFormatter.setHeader( "\n" "The POCO C++ Server Page Compiler.\n" - "Copyright (c) 2008-2023 by Applied Informatics Software Engineering GmbH.\n" + "Copyright (c) 2008-2024 by Applied Informatics Software Engineering GmbH.\n" "All rights reserved.\n\n" "This program compiles web pages containing embedded C++ code " "into a C++ class that can be used with the HTTP server " diff --git a/ProGen/src/ProGen.cpp b/ProGen/src/ProGen.cpp index 6c9bdd1fea..def54f02e2 100644 --- a/ProGen/src/ProGen.cpp +++ b/ProGen/src/ProGen.cpp @@ -488,6 +488,45 @@ class ProGenApp: public Application } } + void addVcpkgProperties(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps) + { + Poco::XML::Node* pInsertAfterNode = nullptr; + Poco::AutoPtr pPropertyGroups = pProjectDoc->getElementsByTagName("PropertyGroup"); + if (pPropertyGroups->length() > 0) + { + pInsertAfterNode = pPropertyGroups->item(pPropertyGroups->length() - 1); + } + Poco::AutoPtr pPropertyGroupElem = pProjectDoc->createElement("PropertyGroup"); + pPropertyGroupElem->setAttribute("Label", "Vcpkg"); + appendElement(pPropertyGroupElem, "VcpkgEnableManifest", "true"); + pProjectDoc->documentElement()->insertAfterNP(pPropertyGroupElem, pInsertAfterNode); + pInsertAfterNode = pPropertyGroupElem; + + Poco::StringTokenizer archTok(templateProps.getString("project.architectures"), ";,", Poco::StringTokenizer::TOK_TRIM | Poco::StringTokenizer::TOK_IGNORE_EMPTY); + std::set archs(archTok.begin(), archTok.end()); + + for (const auto& config: configSet) + { + for (const auto& arch: archs) + { + Poco::AutoPtr pPropertyGroupElem = pProjectDoc->createElement("PropertyGroup"); + pPropertyGroupElem->setAttribute("Label", "Vcpkg"); + pPropertyGroupElem->setAttribute("Condition", Poco::format("'$(Configuration)|$(Platform)'=='%s|%s'", config, arch)); + appendElement(pPropertyGroupElem, "VcpkgConfiguration", config.find("debug") == 0 ? "Debug" : "Release"); + if (config.find("_static") != std::string::npos) + { + appendElement(pPropertyGroupElem, "VcpkgUseStatic", "true"); + } + if (config.find("_static_md") != std::string::npos) + { + appendElement(pPropertyGroupElem, "VcpkgUseMD", "true"); + } + pProjectDoc->documentElement()->insertAfterNP(pPropertyGroupElem, pInsertAfterNode); + pInsertAfterNode = pPropertyGroupElem; + } + } + } + void fix20XXProject(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps, const std::string& platformToolset) { fix2010Project(pProjectDoc, configSet, platform, projectProps, templateProps); @@ -498,6 +537,10 @@ class ProGenApp: public Application removeElement(pConfigurationTypeElem->parentNode(), "PlatformToolset"); appendElement(pConfigurationTypeElem->parentNode(), "PlatformToolset", platformToolset); } + if (projectProps.getBool("project.vcpkg", false)) + { + addVcpkgProperties(pProjectDoc, configSet, platform, projectProps, templateProps); + } } void fix2019Project(Poco::AutoPtr pProjectDoc, const std::set& configSet, const std::string& platform, const Poco::Util::AbstractConfiguration& projectProps, const Poco::Util::AbstractConfiguration& templateProps) @@ -625,6 +668,7 @@ class ProGenApp: public Application pProps->setString("project.pocobase", projectConfig.getString("vc.project.pocobase", "..")); pProps->setString("project.platform", pTemplateProps->getString("project.platform", platform)); pProps->setString("project.targetPlatform", pTemplateProps->getString("project.targetPlatform", "WINDOWS_NT")); + pProps->setBool("project.vcpkg", projectConfig.getBool("vc.project.vcpkg", false)); expandAttributes(pProjectDoc->documentElement(), *pProps); Poco::XML::Node* pFilesElement = pPrototypeDoc->getNodeByPath("//Files"); diff --git a/Prometheus/Prometheus_vs160.vcxproj b/Prometheus/Prometheus_vs160.vcxproj index 9b649ef4ab..a218ac4dcd 100644 --- a/Prometheus/Prometheus_vs160.vcxproj +++ b/Prometheus/Prometheus_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoPrometheusd PocoPrometheusmdd PocoPrometheusmtd diff --git a/Prometheus/Prometheus_vs160.vcxproj.filters b/Prometheus/Prometheus_vs160.vcxproj.filters index e59b9caccd..4e5defbe75 100644 --- a/Prometheus/Prometheus_vs160.vcxproj.filters +++ b/Prometheus/Prometheus_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {12c6fec0-ab44-4c7b-9568-92394d034826} + {5e586644-4202-438e-95ab-ba475fc957ac} - {5d71064f-72b9-4387-8cae-547281618dbc} + {f5a3fd88-9717-4360-abcd-0e45ff9ef205} - {629aaf51-a641-473b-8550-ef93abef9b2b} + {f5a2c56d-ac13-4cc4-bb84-df51ae864117} diff --git a/Prometheus/Prometheus_vs170.vcxproj b/Prometheus/Prometheus_vs170.vcxproj index b96d34932e..dcfe8408bc 100644 --- a/Prometheus/Prometheus_vs170.vcxproj +++ b/Prometheus/Prometheus_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoPrometheusA64d PocoPrometheusmdd PocoPrometheusmtd diff --git a/Prometheus/Prometheus_vs170.vcxproj.filters b/Prometheus/Prometheus_vs170.vcxproj.filters index 610535c6e8..cd88512e51 100644 --- a/Prometheus/Prometheus_vs170.vcxproj.filters +++ b/Prometheus/Prometheus_vs170.vcxproj.filters @@ -2,13 +2,13 @@ - {d305b0c7-712f-42b3-8ec3-327ca5750233} + {7d426854-47c9-4b88-9df8-70cc720f917e} - {d57dd874-479d-4fbe-bda8-92e240800515} + {514ecdc6-65b4-4699-a9a6-a15a65b5de4c} - {bed725cd-dd21-4ed5-950f-4bf9e21d8af6} + {214edee7-bcfa-4fdf-b86d-d15051c0673b} diff --git a/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj b/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj index ec8c6740e6..c75c5bc292 100644 --- a/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj +++ b/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 MetricsSampled MetricsSampled MetricsSampled diff --git a/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj.filters b/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj.filters index e986332f53..a8e56899f0 100644 --- a/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj.filters +++ b/Prometheus/samples/MetricsSample/MetricsSample_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {869cd671-8e9d-4a4c-8728-a469c992f507} + {8924ef8a-cecb-4224-8bf2-a52bc13e9285} diff --git a/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj b/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj index 4df8c61a36..df3fd22a88 100644 --- a/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj +++ b/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 MetricsSample {D256BB4C-7287-3E74-BC1A-31E116A8CE36} MetricsSample @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + MetricsSampled + MetricsSampled + MetricsSampled + MetricsSample + MetricsSample + MetricsSample MetricsSampled MetricsSampled MetricsSampled @@ -171,6 +250,36 @@ MetricsSample MetricsSample + + binA64\ + objA64\MetricsSample\$(Configuration)\ + true + + + binA64\ + objA64\MetricsSample\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\MetricsSample\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\MetricsSample\$(Configuration)\ + false + + + binA64\static_md\ + objA64\MetricsSample\$(Configuration)\ + true + + + binA64\static_md\ + objA64\MetricsSample\$(Configuration)\ + false + bin\ obj\MetricsSample\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\MetricsSample\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\MetricsSample.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\MetricsSampled.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\MetricsSample.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\MetricsSampled.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;..\..\..\XML\include;..\..\..\JSON\include;..\..\..\Net\include;..\..\..\Prometheus\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\MetricsSampled.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj.filters b/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj.filters index 7f56be9716..3a086d1cf6 100644 --- a/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj.filters +++ b/Prometheus/samples/MetricsSample/MetricsSample_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {31d254ca-b41c-447d-97f8-271ae656c427} + {ebdaa3a2-4caa-427f-b08d-318452bdb2fa} diff --git a/Prometheus/testsuite/TestSuite_vs160.vcxproj b/Prometheus/testsuite/TestSuite_vs160.vcxproj index 73a0202c04..d42f1aca96 100644 --- a/Prometheus/testsuite/TestSuite_vs160.vcxproj +++ b/Prometheus/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Prometheus/testsuite/TestSuite_vs160.vcxproj.filters b/Prometheus/testsuite/TestSuite_vs160.vcxproj.filters index ed1cb3ae49..b879f905ec 100644 --- a/Prometheus/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Prometheus/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {573502a6-8940-494b-994f-10c51bfcc24f} + {ddb72b1a-3a1b-415f-9c81-867c54666056} - {b6d546aa-3bd8-4c85-9082-6fefa82574e7} + {934830ca-85e5-4f81-a44e-f7557823c29c} diff --git a/Prometheus/testsuite/TestSuite_vs170.vcxproj b/Prometheus/testsuite/TestSuite_vs170.vcxproj index e762b32ad1..02f30c3c2c 100644 --- a/Prometheus/testsuite/TestSuite_vs170.vcxproj +++ b/Prometheus/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -901,27 +973,43 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Prometheus/testsuite/TestSuite_vs170.vcxproj.filters b/Prometheus/testsuite/TestSuite_vs170.vcxproj.filters index bd70dea47c..4908db498e 100644 --- a/Prometheus/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Prometheus/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {f2c2ac7f-b324-4f93-a1ea-99b8bbd63491} + {20958be3-7db1-4409-85c7-d6bd2fa42545} - {8abfe308-f380-4ed9-b45b-41f0e51b668c} + {44574a37-dffd-4aeb-93c4-0f8d56ae6a8b} diff --git a/README b/README index 68e81a3bb3..d8965df603 100644 --- a/README +++ b/README @@ -25,12 +25,12 @@ build/ the build system for Unix and additional utility scri cmake/ Support files for CMake bin/ all executables (dynamic link libraries on Windows) -bin64/ all 64-bit executables (and DLLs) +bin64/ 64-bit executables (and DLLs) on Windows doc/ additional documentation lib/ all libraries (import libraries on Windows) -lib64/ all 64-bit libraries +lib64/ 64-bit libraries on Windows CppUnit/ project and make/build files for the CppUnit unit testing framework doc/ additional documentation @@ -79,7 +79,7 @@ DOCUMENTATION ============= Plenty of documentation (tutorial slides, articles and SDK reference) -is available at . +is available at . EXTERNAL DEPENDENCIES @@ -88,16 +88,18 @@ EXTERNAL DEPENDENCIES The following libraries require third-party software (header files and libraries) being installed to build properly: -- NetSSL_OpenSSL and Crypt require OpenSSL. +- NetSSL_OpenSSL, Crypt and JWT require OpenSSL. - Data/ODBC requires ODBC (Microsoft ODBC on Windows, unixODBC or iODBC on Unix/Linux) -- Data/MySQL requires the MySQL client. +- Data/MySQL requires the MySQL or MariaDB client library. +- Data/PostgreSQL requires the PostgreSQL client library (libpq). Most Unix/Linux systems already have OpenSSL preinstalled. If your system -does not have OpenSSL, please get it from http://www.openssl.org or +does not have OpenSSL, please get it from https://www.openssl.org or another source. You do not have to build OpenSSL yourself - a binary distribution is fine (e.g., apt-get install openssl libssl-dev). On macOS, install OpenSSL via Homebrew (brew install openssl). +On Windows, OpenSSL can be installed with vcpkg. The easiest way to install OpenSSL on Windows is to get the pre-built libraries from the pocoproject/openssl Git repository at @@ -110,12 +112,6 @@ Depending on where you have installed the OpenSSL libraries, you might have to edit the build script (buildwin.cmd), or add the necessary paths to the INCLUDE and LIB environment variables. -Through the Poco/Crypto/Crypto.h and Poco/Net/NetSSL.h header files, -Visual C++ will automatically link the libcrypto.lib and libssl.lib -libraries. If your OpenSSL libraries are named differently, compile -with the macro POCO_EXTERNAL_OPENSSL defined and edit the project -files accordingly. - The Data library requires ODBC support on your system if you want to build the ODBC connector (which is the default). On Windows platforms, ODBC should be readily available if you have the @@ -151,9 +147,9 @@ described in the following. BUILDING - USING VCPKG -=================== +====================== -You can download and install poco using the vcpkg(https://github.com/Microsoft/vcpkg) +You can download and install poco using the vcpkg (https://vcpkg.io) dependency manager: $ git clone https://github.com/Microsoft/vcpkg.git @@ -162,7 +158,7 @@ $ ./bootstrap-vcpkg.sh $ ./vcpkg integrate install $ ./vcpkg install poco -The poco port in vcpkg is kept up to date by Microsoft team members and community contributors. +The Poco port in vcpkg is kept up to date by Microsoft team members and community contributors. If the version is out of date, please create an issue or pull request(https://github.com/Microsoft/vcpkg) on the vcpkg repository. @@ -189,26 +185,26 @@ on the Conan Center Index repository. BUILDING ON WINDOWS =================== -Microsoft Visual Studio 2015 or newer is required to build the POCO C++ Libraries on -Windows platforms. Solution and project files for all versions from 2015 to 2022 are included. +Microsoft Visual Studio 2019 or newer is required to build the POCO C++ Libraries on +Windows platforms. Solution and project files for Visual Studio 2019 to 2022 are included. 64-bit (x64) builds are supported as well. You can either build from within Visual Studio (Build->Batch Build->Select All;Rebuild) or from the command line. To build from the command line, start the -Visual Studio Command Prompt and cd to the directory where you -have extracted the POCO C++ Libraries sources. Then, simply start the buildwin.cmd script -and pass as argument the version of visual studio (140, 150, 160, 170, etc.). You can customize -what is being built by buildwin.cmd by passing appropriate command line arguments to -it. Call buildwin.cmd without arguments to see what is available. +Developer PowerShell for Visual Studio and cd to the directory where you +have extracted the POCO C++ Libraries sources. Then, run the buildwin.ps1 script +and pass the desired options. + +To show available options, run: + +> buildwin.ps1 -help -To disable certain components (e.g., NetSSL_OpenSSL or Data/MySQL) from the build, -edit the file named "components" and remove the respective lines. +Example: + +> buildwin.ps1 -vs 170 -action build -linkmode shared -config release -platform x64 -samples -tests Certain libraries, like NetSSL_OpenSSL, Crypto or Data/MySQL have dependencies -to other libraries. Since the build script does not know where to find the necessary -header files and import libraries, you have to either add the header file paths to -the INCLUDE environment variable and the library path to the LIB environment variable, -or you'll have to edit the buildwin.cmd script, where these environment variables can -be set as well. +to other libraries. The Visual Studio project files have been configured to +use vcpkg to install the required packages. In order to run the test suite and the samples, the top-most bin directory containing the shared libraries must be in the PATH environment variable. @@ -230,11 +226,11 @@ build and install it prior to building the POCO C++ Libraries. You can check the version of GNU Make installed on your system with -> gmake --version +> make --version or -> make --version +> gmake --version Once you have GNU Make up and running, the rest is quite simple. To extract the sources and build all libraries, testsuites and samples, simply @@ -243,7 +239,7 @@ To extract the sources and build all libraries, testsuites and samples, simply > tar -xf poco-X.Y.tar > cd poco-X.Y > ./configure -> gmake -s +> make -s See the configure script source for a list of possible options. For starters, we recommend --no-tests and --no-samples, to reduce build times. @@ -254,7 +250,7 @@ Once you have successfully built POCO, you can install it to /usr/local (or another directory specified as parameter to configure --prefix=): -> sudo gmake -s install +> sudo make -s install You can omit certain components from the build. For example, you might want to omit Data/ODBC or Data/MySQL if you do not have the corresponding @@ -306,4 +302,4 @@ MORE INFORMATION ================ For more information, see the POCO C++ Libraries website -at . +at . diff --git a/README.md b/README.md index afa11f3182..cf9eb31f3f 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ and [Getting Started](https://pocoproject.org/docs/00200-GettingStarted.html) do - MySQL, PostgreSQL and ODBC client libraries (optional) Most Unix/Linux systems already have OpenSSL preinstalled. If your system -does not have OpenSSL, please get it from or +does not have OpenSSL, please get it from or another source. You do not have to build OpenSSL yourself - a binary distribution is fine. For example, via Debian APT: @@ -48,6 +48,7 @@ The easiest way to install OpenSSL on Windows is to use a binary (prebuild) release, for example the one from Shining Light Productions that comes with a [Windows installer](https://www.slproweb.com/products/Win32OpenSSL.html). +OpenSSL can also be installed via the `vcpkg` package manager. On Windows, POCO can also use the native Windows TLS APIs (SChannel). @@ -58,19 +59,19 @@ All dependencies can be installed with the following commands: #### Debian Linux (including Ubuntu and Raspbian) ``` -$ sudo apt-get -y update && sudo apt-get -y install git g++ make cmake libssl-dev +$ sudo apt-get -y update && sudo apt-get -y install git g++ make cmake libssl-dev libmysqlclient-dev libpq-dev ``` #### RedHat Linux ``` -$ sudo yum install -y git gcc-c++ make cmake3 openssl-devel +$ sudo yum install -y git gcc-c++ make cmake3 openssl-devel mysql-devel postgresql-devel ``` #### macOS (with Homebrew) ``` -$ brew install cmake openssl +$ brew install cmake openssl mysql-client libpq ``` ### Building with CMake (Linux, macOS, Windows) @@ -93,7 +94,13 @@ For example, if OpenSSL has been installed with Homebrew, the `cmake` invocation becomes: ``` -$ cmake .. -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl +$ cmake .. -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl@3 +``` + +Similarly, the locations of other external libraries can be specified: + +``` +$ cmake .. -DOPENSSL_ROOT_DIR=/opt/homebrew/opt/openssl@3 -DMYSQL_ROOT_DIR=/opt/homebrew/opt/mysql-client -DPostgreSQL_ROOT_DIR=/opt/homebrew/opt/libpq ``` Other common ways of building with CMake (e.g., `cmake-gui`) will also work. @@ -139,6 +146,7 @@ The poco port in vcpkg is kept up to date by Microsoft team members and communit If the version is out of date, please [create an issue or pull request](https://github.com/Microsoft/vcpkg) on the vcpkg repository. + #### Building and Installing - Using Conan You can download and install poco using the Conan(https://github.com/conan-io/conan) diff --git a/Redis/Redis_vs160.vcxproj b/Redis/Redis_vs160.vcxproj index 33fc80a730..23249e537e 100644 --- a/Redis/Redis_vs160.vcxproj +++ b/Redis/Redis_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoRedisd PocoRedismdd PocoRedismtd diff --git a/Redis/Redis_vs160.vcxproj.filters b/Redis/Redis_vs160.vcxproj.filters index 9c0cade40f..e0f98809e1 100644 --- a/Redis/Redis_vs160.vcxproj.filters +++ b/Redis/Redis_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {e1cadf5d-7549-4121-8082-54a0c9e04e58} + {d50aa747-bccf-4bcf-b436-c911be1dad6a} - {60094115-1f6d-424e-8638-f076fd287563} + {39b77532-3bc3-45ed-baed-c0f7eaab704e} diff --git a/Redis/Redis_vs170.vcxproj b/Redis/Redis_vs170.vcxproj index 1ce3ece518..5893a6e45f 100644 --- a/Redis/Redis_vs170.vcxproj +++ b/Redis/Redis_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoRedisA64d PocoRedismdd PocoRedismtd diff --git a/Redis/Redis_vs170.vcxproj.filters b/Redis/Redis_vs170.vcxproj.filters index b6b354b651..0785a357ae 100644 --- a/Redis/Redis_vs170.vcxproj.filters +++ b/Redis/Redis_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {07150746-2836-426e-a3b4-cde4cabf3d83} + {1c372c78-aa21-4849-8139-d11ae426cfb8} - {d7af6162-3f3c-4ffa-9d99-65691d86f4fa} + {0919be81-8cc0-4911-908b-7dcb1558ebc9} diff --git a/Redis/testsuite/TestSuite_vs160.vcxproj b/Redis/testsuite/TestSuite_vs160.vcxproj index 8e7f57f2d0..c9c1b3898c 100644 --- a/Redis/testsuite/TestSuite_vs160.vcxproj +++ b/Redis/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Redis/testsuite/TestSuite_vs160.vcxproj.filters b/Redis/testsuite/TestSuite_vs160.vcxproj.filters index a094825d0e..ca7c2b3429 100644 --- a/Redis/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {f882b2f7-b115-4a69-91c5-72dc0764f265} + {56dc75fe-0960-4ede-8c2d-57508e6ed551} - {df501ea3-b827-4fdb-b70c-99f6becd5ee1} + {cd3bf4f4-c1a9-4445-a1d5-81209e45b88d} diff --git a/Redis/testsuite/TestSuite_vs170.vcxproj b/Redis/testsuite/TestSuite_vs170.vcxproj index d286edb51a..bc4b5bb2ec 100644 --- a/Redis/testsuite/TestSuite_vs170.vcxproj +++ b/Redis/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -892,12 +964,18 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Redis/testsuite/TestSuite_vs170.vcxproj.filters b/Redis/testsuite/TestSuite_vs170.vcxproj.filters index 6334de6b56..6a739cfec4 100644 --- a/Redis/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Redis/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {0346d5ed-43df-4fd2-9b71-ea962d2b847b} + {968fdc8b-70f5-4272-913e-bbf4b5f71307} - {0d387e8c-3bf4-4b1d-a17d-589f0233a554} + {c9bb14e7-d416-4959-a9e2-363d135ab845} diff --git a/Util/Util_vs160.vcxproj b/Util/Util_vs160.vcxproj index 8b082ef9b5..6fc152ad36 100644 --- a/Util/Util_vs160.vcxproj +++ b/Util/Util_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoUtild PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_vs160.vcxproj.filters b/Util/Util_vs160.vcxproj.filters index b3205c2c62..4fdc65fe16 100644 --- a/Util/Util_vs160.vcxproj.filters +++ b/Util/Util_vs160.vcxproj.filters @@ -2,58 +2,58 @@ - {f8121bb3-6f75-498c-85da-718a79ce90ee} + {49db567c-4871-4e2e-b540-bf65555bfe15} - {65a332b2-c845-41c4-bfd8-8ce06c4c568f} + {5e7d40a4-9467-45e8-836e-f5deea527c6a} - {dae2e368-3475-43aa-8135-fd972a5b92ae} + {04695522-364b-4d06-931f-2b1c1f7f2058} - {2ce7d858-e098-4373-979e-79dae051ab1e} + {f63ad6c8-99c5-4459-98e7-89af572dda3c} - {f245cb82-df33-4dd2-b80d-1b691d1703ea} + {b804723e-da2c-460e-87ac-398748727a03} - {c3e17d03-03d4-4b10-a230-92a50a552be9} + {b57cf29c-5553-4483-89fa-89bf3cee9d77} - {34b4d4a2-e74c-4a12-8b3d-163f645057ad} + {3c192c03-d922-4d86-b633-c0785b6e451f} - {0772a5ee-784e-45e7-8613-ae45abfd3ebd} + {6d0073dc-8684-4542-bad6-4dafd88ff59e} - {026e070e-8104-4f8c-9b07-f4683ad3d00f} + {433d3a61-9c0d-4b11-bea6-2e713cdf333c} - {9b012c9a-ac3c-4624-b0ac-0d4c9b4ef32d} + {d248de32-24c0-4715-9a8d-6feeded8ff9d} - {bc7ed6ee-59c2-45f6-a15d-56169cdf3f0a} + {582ff646-c385-410f-892b-6b2b65a39354} - {c960bfe7-9652-426c-8939-6ca27b7ca749} + {96781890-fac0-4512-8ec6-ef09ed154919} - {235093b4-a2f9-47d9-9015-9480442b9eb7} + {9ffbd70b-6cfe-442b-8d5c-46221d0f2180} - {720c9317-0291-4cb9-9149-31c43026e178} + {42c2b1ef-c7a4-446d-8dd4-983d9f247454} - {b5f0131b-be85-4157-a232-903072a735e3} + {d68b9e9d-aa5e-4270-bf0f-f795c3bfc286} - {0f0c16d7-30de-4d57-8df6-6061b3bfd1b7} + {deac7f9a-da66-4025-8e77-2e0396d882a0} - {fba5ea82-98af-4f0d-aabc-ecff078f7cb1} + {31d14c6c-57d4-4a31-9ab3-26121dc4ed76} - {e9a2d44b-72b5-40ec-8b84-ae077b834ffc} + {dfe2de67-0565-499c-afe6-d6d6e34c51a7} diff --git a/Util/Util_vs170.vcxproj b/Util/Util_vs170.vcxproj index d5942e8361..01aecd3b69 100644 --- a/Util/Util_vs170.vcxproj +++ b/Util/Util_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoUtilA64d PocoUtilmdd PocoUtilmtd diff --git a/Util/Util_vs170.vcxproj.filters b/Util/Util_vs170.vcxproj.filters index 95006b56ca..c6172a0a8d 100644 --- a/Util/Util_vs170.vcxproj.filters +++ b/Util/Util_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {31dea0da-1610-476c-9b7d-3472427b4641} + {500d648b-5116-4819-b67f-1b2ddabc5ecf} - {1060f661-3e5a-4ae6-af77-5c998f2a04ca} + {49729434-7ce0-4ac1-b149-5a482568f674} - {d3d7ed03-475c-4029-a086-9dc659f6676d} + {a0ee86f8-4aaa-44d4-9501-de7f45025b92} - {b621ef20-0803-4f8d-85e6-78fe62c6f2da} + {78650b84-89b8-490e-b471-923e0548469c} - {f240bd4e-9bc6-4160-8413-b20219dba320} + {292c48dd-79a0-4cae-9c00-806c0c18312c} - {b6592213-0f27-4f53-b6a4-45f8b7d294cb} + {da34ba9e-07d8-485d-bc84-2e33fba16169} - {ae25771c-adbc-4915-9929-49aed8c75203} + {44a34ab9-5c2c-41f5-b297-3bd168d8d421} - {76b34b02-bc40-459d-a93f-4d9e4f6a1cd0} + {c06c4e48-359c-403e-b17c-ffc6da8c6678} - {882878f4-c179-4e84-9027-909a2ae1ffd2} + {e4f8374c-b178-4f09-8550-f7c57f36c695} - {a49cd00b-d063-4906-974a-a1323df809de} + {ffc1a4f9-a78a-4d88-952d-ac0f7ab20af2} - {38fd5a99-3c0d-46b1-809a-82b419ead9d4} + {2a7863de-0b8a-4d5a-94b0-5023458b8550} - {187e3570-fcfa-4503-b6c3-a71d7d02c5a3} + {f8169bc3-1a37-4bf1-9487-8b9f196be1db} - {090c93e6-0af2-4c44-afce-afffc03c105a} + {6f5415a8-5c21-4275-af46-74253518a684} - {a4f42f66-6386-49d2-b550-7cec7a63bf97} + {64111612-381c-4fa7-b5cb-9af5c3894708} - {7307faa2-93c9-489b-9705-08ed7384550c} + {bcfca317-a15a-42a5-b3b8-50143147349d} - {aa55825e-edb4-47fd-9569-28a741f031b1} + {786d14dd-fb76-480d-80fb-b5346c33e2f6} - {f63f6046-0783-4d9b-883f-47f596f96872} + {466cf944-fc6a-4467-8c48-741e89b54ed2} - {0acefac5-7909-4be8-9a8b-e569d49e3084} + {18921ace-40c7-4e96-875a-82cb78efd752} diff --git a/Util/include/Poco/Util/Timer.h b/Util/include/Poco/Util/Timer.h index d41a88ead5..b6bd14a854 100644 --- a/Util/include/Poco/Util/Timer.h +++ b/Util/include/Poco/Util/Timer.h @@ -159,6 +159,9 @@ class Util_API Timer: protected Poco::Runnable /// If task execution takes longer than the given interval, /// further executions are delayed. + bool idle() const; + /// Returns true if the task queue is empty, otherwise false. + template static TimerTask::Ptr func(const Fn& fn) /// Helper function template to use a functor or lambda @@ -188,6 +191,15 @@ class Util_API Timer: protected Poco::Runnable }; +// +// inlines +// +inline bool Timer::idle() const +{ + return _queue.empty(); +} + + } } // namespace Poco::Util diff --git a/Util/samples/SampleApp/SampleApp_vs160.vcxproj b/Util/samples/SampleApp/SampleApp_vs160.vcxproj index b6a32838d1..5ed1a1a6db 100644 --- a/Util/samples/SampleApp/SampleApp_vs160.vcxproj +++ b/Util/samples/SampleApp/SampleApp_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SampleAppd SampleAppd SampleAppd diff --git a/Util/samples/SampleApp/SampleApp_vs160.vcxproj.filters b/Util/samples/SampleApp/SampleApp_vs160.vcxproj.filters index 4d44295a7f..cb93bc02ae 100644 --- a/Util/samples/SampleApp/SampleApp_vs160.vcxproj.filters +++ b/Util/samples/SampleApp/SampleApp_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {23798da7-950a-4a28-b214-023250268588} + {e26dd85a-cb9c-49ca-b5ea-7cb698825c25} - {6c04f5a4-8f91-41b8-886e-74038a4cafd7} + {03f5c629-7b53-4aae-ba6b-2b92318865bd} diff --git a/Util/samples/SampleApp/SampleApp_vs170.vcxproj b/Util/samples/SampleApp/SampleApp_vs170.vcxproj index 9134e4dc48..4a76723123 100644 --- a/Util/samples/SampleApp/SampleApp_vs170.vcxproj +++ b/Util/samples/SampleApp/SampleApp_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SampleApp {C3F12C11-469F-3FB6-8C95-8638F78FF7C0} SampleApp @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + SampleAppd + SampleAppd + SampleAppd + SampleApp + SampleApp + SampleApp SampleAppd SampleAppd SampleAppd @@ -171,6 +250,36 @@ SampleApp SampleApp + + binA64\ + objA64\SampleApp\$(Configuration)\ + true + + + binA64\ + objA64\SampleApp\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SampleApp\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SampleApp\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SampleApp\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SampleApp\$(Configuration)\ + false + bin\ obj\SampleApp\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\SampleApp\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SampleApp.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SampleAppd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SampleApp.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SampleAppd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SampleAppd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -603,6 +967,8 @@ true + stdcpp17 + stdc11 diff --git a/Util/samples/SampleApp/SampleApp_vs170.vcxproj.filters b/Util/samples/SampleApp/SampleApp_vs170.vcxproj.filters index f0c665624e..19e50561a4 100644 --- a/Util/samples/SampleApp/SampleApp_vs170.vcxproj.filters +++ b/Util/samples/SampleApp/SampleApp_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {f7b0911f-4eb0-48d7-b6d8-8a84125229b3} + {80696c1f-ff7f-41f4-a5d2-df95126472ee} - {d8ce126b-477b-4ec7-af87-52d4e2d2276e} + {32b18329-74fd-46de-bb65-2460ba76bdad} diff --git a/Util/samples/SampleServer/SampleServer_vs160.vcxproj b/Util/samples/SampleServer/SampleServer_vs160.vcxproj index 08dc4038ca..4c40e2ae1f 100644 --- a/Util/samples/SampleServer/SampleServer_vs160.vcxproj +++ b/Util/samples/SampleServer/SampleServer_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SampleServerd SampleServerd SampleServerd diff --git a/Util/samples/SampleServer/SampleServer_vs160.vcxproj.filters b/Util/samples/SampleServer/SampleServer_vs160.vcxproj.filters index b0381ae32a..cec00e5875 100644 --- a/Util/samples/SampleServer/SampleServer_vs160.vcxproj.filters +++ b/Util/samples/SampleServer/SampleServer_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {8a3aec76-5187-493b-975c-1d8c3dbb1e28} + {a7cad4be-735b-42a7-94d1-826bd57926ed} - {6bdf0621-31aa-44d7-8ae6-26b6805ec65e} + {772df9d6-2222-483d-8333-ed48e193baa9} diff --git a/Util/samples/SampleServer/SampleServer_vs170.vcxproj b/Util/samples/SampleServer/SampleServer_vs170.vcxproj index ecb08e2ebf..0192019b59 100644 --- a/Util/samples/SampleServer/SampleServer_vs170.vcxproj +++ b/Util/samples/SampleServer/SampleServer_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 SampleServer {F475C5DD-0558-37AF-870B-666DE931B7BA} SampleServer @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + SampleServerd + SampleServerd + SampleServerd + SampleServer + SampleServer + SampleServer SampleServerd SampleServerd SampleServerd @@ -171,6 +250,36 @@ SampleServer SampleServer + + binA64\ + objA64\SampleServer\$(Configuration)\ + true + + + binA64\ + objA64\SampleServer\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\SampleServer\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\SampleServer\$(Configuration)\ + false + + + binA64\static_md\ + objA64\SampleServer\$(Configuration)\ + true + + + binA64\static_md\ + objA64\SampleServer\$(Configuration)\ + false + bin\ obj\SampleServer\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\SampleServer\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\SampleServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SampleServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\SampleServer.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\SampleServerd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\SampleServerd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Util/samples/SampleServer/SampleServer_vs170.vcxproj.filters b/Util/samples/SampleServer/SampleServer_vs170.vcxproj.filters index b736c03116..fe54a1bda1 100644 --- a/Util/samples/SampleServer/SampleServer_vs170.vcxproj.filters +++ b/Util/samples/SampleServer/SampleServer_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {a6e76470-aec2-4a5f-a7fe-9a81cb375ceb} + {90ecbfb3-0571-4749-81db-594c94d3e043} - {d8a834f5-9820-48c0-b66d-ae01d8465668} + {5c60e517-99f6-40e8-8efe-c34e98acf85d} diff --git a/Util/samples/Units/Units_vs160.vcxproj b/Util/samples/Units/Units_vs160.vcxproj index a260190ecb..cf7783cfb4 100644 --- a/Util/samples/Units/Units_vs160.vcxproj +++ b/Util/samples/Units/Units_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 Unitsd Unitsd Unitsd diff --git a/Util/samples/Units/Units_vs160.vcxproj.filters b/Util/samples/Units/Units_vs160.vcxproj.filters index 0a5c83ef13..2778f8226b 100644 --- a/Util/samples/Units/Units_vs160.vcxproj.filters +++ b/Util/samples/Units/Units_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {85e1d920-5b52-477a-ac11-5b1b809a810d} + {68febe9c-eada-41f9-83c1-b247e1b25077} - {5808a610-3907-4e3c-8c2d-047c97597a1e} + {25180120-c963-4178-a06a-891af83979f7} diff --git a/Util/samples/Units/Units_vs170.vcxproj b/Util/samples/Units/Units_vs170.vcxproj index 8ff2fbd735..7bc52210f5 100644 --- a/Util/samples/Units/Units_vs170.vcxproj +++ b/Util/samples/Units/Units_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 Units {A6800637-61D5-39A3-86AA-E180C73D3120} Units @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + Unitsd + Unitsd + Unitsd + Units + Units + Units Unitsd Unitsd Unitsd @@ -171,6 +250,36 @@ Units Units + + binA64\ + objA64\Units\$(Configuration)\ + true + + + binA64\ + objA64\Units\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\Units\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\Units\$(Configuration)\ + false + + + binA64\static_md\ + objA64\Units\$(Configuration)\ + true + + + binA64\static_md\ + objA64\Units\$(Configuration)\ + false + bin\ obj\Units\$(Configuration)\ @@ -231,6 +340,211 @@ obj64\Units\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + binA64\Units.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + binA64\static_mt\Unitsd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + binA64\static_mt\Units.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + binA64\static_md\Unitsd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,14 +561,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 bin\Unitsd.exe ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -278,7 +596,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 bin\Units.exe @@ -306,7 +628,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -314,7 +640,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -338,7 +664,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -367,7 +697,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -375,7 +709,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -399,7 +733,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -428,14 +766,18 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 bin64\Unitsd.exe ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -459,7 +801,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 bin64\Units.exe @@ -487,7 +833,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -495,7 +845,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -519,7 +869,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -548,7 +902,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -556,7 +914,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\Unitsd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -580,7 +938,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;%(AdditionalDependencies) @@ -596,6 +958,8 @@ true + stdcpp17 + stdc11 diff --git a/Util/samples/Units/Units_vs170.vcxproj.filters b/Util/samples/Units/Units_vs170.vcxproj.filters index 031c3c8c02..0f5832cce1 100644 --- a/Util/samples/Units/Units_vs170.vcxproj.filters +++ b/Util/samples/Units/Units_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {cc5ef59d-1274-4692-8a5e-91583358140b} + {02277de5-3f4a-45c7-946b-a04f749e21a2} - {6899d313-fd65-4835-9f8e-c9caa694424a} + {f96810b0-c6c0-4a56-b77d-b64de37f965c} diff --git a/Util/samples/pkill/pkill_vs160.vcxproj b/Util/samples/pkill/pkill_vs160.vcxproj index 1eb0f0b541..27f28a112a 100644 --- a/Util/samples/pkill/pkill_vs160.vcxproj +++ b/Util/samples/pkill/pkill_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 pkilld pkilld pkilld diff --git a/Util/samples/pkill/pkill_vs160.vcxproj.filters b/Util/samples/pkill/pkill_vs160.vcxproj.filters index 3e3cbb2799..bdf88add37 100644 --- a/Util/samples/pkill/pkill_vs160.vcxproj.filters +++ b/Util/samples/pkill/pkill_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {5f039c9d-77de-4930-a95d-629204a004b2} + {0583cd2e-8b63-400e-8630-a26f03281d64} diff --git a/Util/samples/pkill/pkill_vs170.vcxproj b/Util/samples/pkill/pkill_vs170.vcxproj index 3e1e92f32b..dafc6973c8 100644 --- a/Util/samples/pkill/pkill_vs170.vcxproj +++ b/Util/samples/pkill/pkill_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 pkill {63EDD785-29E1-3073-87EB-3CE788A4A1DE} pkill @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + pkilld + pkilld + pkilld + pkill + pkill + pkill pkilld pkilld pkilld @@ -171,6 +250,36 @@ pkill pkill + + binA64\ + objA64\pkill\$(Configuration)\ + true + + + binA64\ + objA64\pkill\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\pkill\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\pkill\$(Configuration)\ + false + + + binA64\static_md\ + objA64\pkill\$(Configuration)\ + true + + + binA64\static_md\ + objA64\pkill\$(Configuration)\ + false + bin\ obj\pkill\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\pkill\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\pkill.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\pkilld.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\pkill.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\pkilld.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\pkilld.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Util/samples/pkill/pkill_vs170.vcxproj.filters b/Util/samples/pkill/pkill_vs170.vcxproj.filters index b50057c33c..924841669c 100644 --- a/Util/samples/pkill/pkill_vs170.vcxproj.filters +++ b/Util/samples/pkill/pkill_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {eabac5f2-924a-4f69-8e1f-92d2e32ee27c} + {8f9a5ae0-c65c-44b2-ab80-06c359ff67ae} diff --git a/Util/samples/samples_vs170.sln b/Util/samples/samples_vs170.sln index 0f1d6f0fdf..8d96d85346 100644 --- a/Util/samples/samples_vs170.sln +++ b/Util/samples/samples_vs170.sln @@ -10,6 +10,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Units", "Units\Units_vs170. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -24,6 +30,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Build.0 = debug_shared|Win32 {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -60,6 +84,24 @@ Global {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.ActiveCfg = release_static_md|x64 {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Build.0 = release_static_md|x64 {63EDD785-29E1-3073-87EB-3CE788A4A1DE}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -96,6 +138,24 @@ Global {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Build.0 = release_static_md|x64 {C3F12C11-469F-3FB6-8C95-8638F78FF7C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Build.0 = debug_shared|Win32 {F475C5DD-0558-37AF-870B-666DE931B7BA}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -132,6 +192,24 @@ Global {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.ActiveCfg = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Build.0 = release_static_md|x64 {F475C5DD-0558-37AF-870B-666DE931B7BA}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {A6800637-61D5-39A3-86AA-E180C73D3120}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Build.0 = debug_shared|Win32 {A6800637-61D5-39A3-86AA-E180C73D3120}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Util/testsuite/TestSuite_vs160.vcxproj b/Util/testsuite/TestSuite_vs160.vcxproj index 4f151642ee..b15792a989 100644 --- a/Util/testsuite/TestSuite_vs160.vcxproj +++ b/Util/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Util/testsuite/TestSuite_vs160.vcxproj.filters b/Util/testsuite/TestSuite_vs160.vcxproj.filters index b78723a126..29db1f2312 100644 --- a/Util/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,64 +2,64 @@ - {c1ee02ad-da9b-4036-af39-1bc7042dc874} + {1c2e2288-6d34-42d1-9e17-eb0c509c4789} - {ec934c54-ea5c-4602-ab1a-49fdaca86177} + {80e83db0-b8a2-489b-96ea-00f990d1c64b} - {f544f580-41a2-4683-afb5-ee89baa2c59c} + {ef3ca30e-7e4f-4420-95bf-3196dc992ba0} - {b123401d-583d-4316-9254-f0685663921d} + {6874db8d-6edf-4827-8c09-ed7127885d7f} - {b5b8e68c-983d-434b-8aca-48255c23c43e} + {2f222862-7962-4bf7-a17a-95d8f0d7729c} - {3bc8e1bc-a8eb-4440-8c42-a61d9496f028} + {9c85a9ee-b71f-4b3d-b55e-820c4c056627} - {8aecfe88-4bbd-41ca-9f5a-798f6512017f} + {28b43bc2-e593-4b91-9ce7-8f820f075731} - {3a93d505-81df-4399-9b2b-87b89dee897e} + {80695914-3b15-4dec-95c2-596fcb337c94} - {49f0c744-b769-4dc6-b0ce-f6232912e8ea} + {9818e509-022f-49fa-a993-98e33c5a3f89} - {c30dd81d-2e47-472e-bac2-40831d2ea6ca} + {cce2e38f-69cd-489b-8bca-3856543d9dde} - {7befe4ef-023e-4bab-9231-ac7387b5dc8c} + {b0e697cd-2683-4b1a-985d-0c0be3734595} - {5d2a883d-6b3f-4113-88d3-6785a09c1394} + {3706c5a9-85d3-4d0a-9cc4-7de73accca9e} - {77252e88-b20d-425f-b979-26e26a0f748e} + {7d5bfc1e-09b8-455b-b138-a857931ff3a6} - {e01d67d5-3851-4f0a-a33d-e6517eabb187} + {109abc0e-047e-42f8-8a21-989b0dd76449} - {082d5d34-3713-42a5-85e7-00bdbd703aa4} + {58ac63a8-236c-41ed-974a-4f8f625afa5e} - {ba4cbf83-181a-4799-9142-3c193a644ed7} + {e00fb964-3310-4a03-8cf3-569ff1d7513b} - {5b6e196d-c0d2-4d14-bb1a-706728ff39b4} + {5349eca6-35b2-4130-afbf-3179a6227f5b} - {eee84383-b9f3-4247-98ca-18c5c0b88e63} + {71046e27-5dec-4e17-82be-ffea86520bb5} - {b4cc23e6-e9d5-4e24-88be-c82f8243d9f8} + {7698eaf9-9e3c-473f-8a20-fc49d1ca77fa} - {cf6c42c2-dd23-4aba-bcc2-d2ad4f0e3adf} + {eb95e4ec-90f4-4175-b3e4-650c37cbdbdd} diff --git a/Util/testsuite/TestSuite_vs170.vcxproj b/Util/testsuite/TestSuite_vs170.vcxproj index b8b109c884..80e486db13 100644 --- a/Util/testsuite/TestSuite_vs170.vcxproj +++ b/Util/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Util/testsuite/TestSuite_vs170.vcxproj.filters b/Util/testsuite/TestSuite_vs170.vcxproj.filters index 2a33cd3da9..20331a51df 100644 --- a/Util/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Util/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,64 +2,64 @@ - {bf120474-4445-4697-b471-7c39e2d38eda} + {89a0c271-69c6-4b56-b582-4b1d69ff1bd9} - {a4f8d012-57ef-474e-9064-b8a9e0677f66} + {149b0e4a-91e7-448f-a939-973d84174677} - {7b1608c9-d746-4dd0-9cab-644082d5da39} + {374b91b4-12a0-4d71-b6a8-c54a76951370} - {cbc96e3c-3fa6-411f-838d-3a3b70bd4c61} + {fcf099cb-a50b-4e7b-98fd-3a6b40c68097} - {adaeedcf-dc9f-4344-8f11-7822e4f05f68} + {af800c67-5f52-4ef5-a5a0-c1052ef6678d} - {f1628bfe-3122-4150-8507-005bb1fe7a48} + {69726f72-ce83-4252-994e-32d15ef50a3e} - {a1aa1385-3f4a-4e93-a3b7-8acb6bcfca47} + {8c808495-b408-484c-8e37-1df163a9646b} - {d8941f75-b04e-42af-92e5-23547495c0be} + {152e852b-5f83-4394-9039-3af5abea42b4} - {711b44f4-7b07-4bb4-af7f-3f411eaa399d} + {d36d1cae-4481-409e-b863-8724455fa6f8} - {05bb7ce7-8584-4ef7-9eea-9729eb085346} + {5d9a364f-66ee-47fe-8542-8b7db667fdcb} - {e1b9169e-7428-4feb-bae2-66cc9f692314} + {946cb72d-c45a-44b7-981b-ace87bf5ca41} - {ff7d389a-f0b6-4743-ac01-ea5914efc867} + {ce0573df-0daa-47f2-896f-96e7a599ea63} - {d49d5ed0-1d68-4307-8a74-31618cab5b25} + {385858d4-d047-42e1-a9f5-68cee240deba} - {f4cd4c4a-54b2-4770-b9bc-c0530ffc8cdb} + {f0211623-82aa-4235-a848-cb20447b5d64} - {941b0937-9f2e-4c77-b23c-a972c206ef70} + {29519bd1-8fcc-485d-9ffb-61074d82994a} - {929ec79c-9067-4356-8107-fb26be88d136} + {5f414f4d-6691-4c10-b699-9992e1fe28d5} - {864bc194-232f-4b00-9e63-6b305a51ae44} + {c652ae3f-ffbf-40f9-a1eb-bd1e7cc8adaa} - {c4b4debe-4e1b-4c83-97e1-77a99a19965d} + {7a67efb3-eb33-484d-8ed8-1a1d9bfe4045} - {d8aa3a59-3d88-43eb-96a2-95d560d02296} + {219551cf-4c4d-4c2e-b17a-4c4ceee9667d} - {ad1052ce-ef60-4667-ad7b-826b3cdcb206} + {07908920-898c-4ba8-b719-80e7519f5a93} diff --git a/Util/testsuite/src/TimerTest.cpp b/Util/testsuite/src/TimerTest.cpp index b5551bdb3f..f3ba220f48 100644 --- a/Util/testsuite/src/TimerTest.cpp +++ b/Util/testsuite/src/TimerTest.cpp @@ -314,6 +314,28 @@ void TimerTest::testFunc() } +void TimerTest::testIdle() +{ + Timer timer; + + assertTrue (timer.idle()); + + Timestamp time; + time += 1000000; + + TimerTask::Ptr pTask = new TimerTaskAdapter(*this, &TimerTest::onTimer); + + timer.schedule(pTask, time); + + assertFalse (timer.idle()); + + _event.wait(); + assertTrue (pTask->lastExecution() >= time); + + assertTrue (timer.idle()); +} + + void TimerTest::setUp() { } @@ -346,6 +368,7 @@ CppUnit::Test* TimerTest::suite() CppUnit_addTest(pSuite, TimerTest, testCancelAllWaitStop); CppUnit_addTest(pSuite, TimerTest, testMultiCancelAllWaitStop); CppUnit_addTest(pSuite, TimerTest, testFunc); + CppUnit_addTest(pSuite, TimerTest, testIdle); return pSuite; } diff --git a/Util/testsuite/src/TimerTest.h b/Util/testsuite/src/TimerTest.h index b88366fd7d..825c5b9b42 100644 --- a/Util/testsuite/src/TimerTest.h +++ b/Util/testsuite/src/TimerTest.h @@ -37,6 +37,7 @@ class TimerTest: public CppUnit::TestCase void testCancelAllWaitStop(); void testMultiCancelAllWaitStop(); void testFunc(); + void testIdle(); void setUp(); void tearDown(); diff --git a/VERSION b/VERSION index 61ce01b301..01b7568230 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.13.2 +1.13.3 diff --git a/XML/XML_vs160.vcxproj b/XML/XML_vs160.vcxproj index acd9c4d937..85ec39a850 100644 --- a/XML/XML_vs160.vcxproj +++ b/XML/XML_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoXMLd PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_vs160.vcxproj.filters b/XML/XML_vs160.vcxproj.filters index 8d66e0505c..499d428b58 100644 --- a/XML/XML_vs160.vcxproj.filters +++ b/XML/XML_vs160.vcxproj.filters @@ -2,40 +2,40 @@ - {cb81f37b-a7e0-430b-946a-9e88ccba5c39} + {36373c57-36d3-410a-a0b5-3317b66928f3} - {b8055a37-ef43-4284-9612-b88fe0f2cdbf} + {e511c8ac-c675-4701-8999-b884bba96208} - {75ffcd0a-6058-4cda-889d-da7add0b0737} + {a27c2273-7118-4da9-9f92-6b29c0bc5072} - {2b1457b4-7256-4387-bea1-a42c225220ef} + {802dcf09-af15-406b-b2fa-a19d50c64f1e} - {febad31a-f868-4c80-b299-68e3f81fa9e8} + {d71e1e8f-9dd1-4674-8f9c-b4b264b8681f} - {1b2d92d4-0629-417b-9abf-524dea4b8995} + {2af9b30d-7763-4d08-aa30-06b10f617840} - {4a364df2-d1d6-417d-8d34-699ac77df096} + {c2f4c0f8-7d85-4c74-918b-3c2697d48b22} - {d36d45e8-7df0-478e-b5fb-2a9f3c9ef9c5} + {739c355c-222f-43b5-a57b-7015e9e56c30} - {4a903e42-0a5d-4ee8-b822-2c140f277302} + {2d9d4050-5f2d-47a3-a78c-4cc9eae0b1e7} - {85d8ec5f-636a-44db-af9f-67f1ba21288b} + {d4e44fc0-c84e-49e9-a2c2-93c9fde77213} - {dde613c6-833a-4b1e-9a9f-018dcde301c8} + {f356e25e-70f0-485a-80f7-11c2f3d79a66} - {1fbfd2fa-5781-4c04-8ee0-049f1a1482d8} + {f68a6bfd-9eb2-43a1-97ee-0a871325afb1} diff --git a/XML/XML_vs170.vcxproj b/XML/XML_vs170.vcxproj index 5084727841..59554a4070 100644 --- a/XML/XML_vs170.vcxproj +++ b/XML/XML_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoXMLA64d PocoXMLmdd PocoXMLmtd diff --git a/XML/XML_vs170.vcxproj.filters b/XML/XML_vs170.vcxproj.filters index 6127e56afd..9a2d5a9e53 100644 --- a/XML/XML_vs170.vcxproj.filters +++ b/XML/XML_vs170.vcxproj.filters @@ -2,40 +2,40 @@ - {96b51512-3a64-46af-ab78-a51faa1cd6df} + {e0593e06-878a-4423-9466-19112f6988b1} - {b9ec7b17-e73d-426e-a76d-eebc7666da78} + {dc148587-17b4-435f-8f0a-264199f525e4} - {9231605d-1428-4e8e-9b05-576974d29681} + {67e3ae5c-3676-4edd-b95c-6b62a144ed7c} - {4a70c9bd-4202-4927-9611-5aec7641a968} + {197f0cab-64d0-4d6e-8254-6fddba7cf3f4} - {cac5dc2f-6bea-4219-9ad0-5746260dd79d} + {a649bbf7-68ad-4465-b094-5145a58ba466} - {aa92d9ae-49a3-40c8-b6b7-e68295c52ff7} + {163ac617-395d-498a-a1e4-79428afc463a} - {b26d1bf0-b484-46d1-886b-06d025bc83fe} + {cd2871bf-fe00-4135-af40-5b82da08fd56} - {796b42b1-952a-4783-8c3a-a0559e181c3a} + {87e7a1d9-62f8-46f3-874b-f8084173462b} - {fc023bda-543a-4828-81a1-d9c1a694badc} + {98e1a73e-2cc4-46ab-b787-cdc855573daf} - {3e03ea7d-3bab-4a12-bfe4-91d9ef4b5901} + {14fb868e-d0ce-4d3e-8e33-1951ae06b1cb} - {7cd33215-14dd-4c36-bb74-0bf0092392e5} + {fb33b064-953a-4ba3-b6b3-42322b22e490} - {d3571ff7-2366-434e-bc0f-20bf9079fc7b} + {0bffb041-80b9-485f-923f-8b484b48b234} diff --git a/XML/include/Poco/XML/expat.h b/XML/include/Poco/XML/expat.h index 95464b0dd1..c2770be389 100644 --- a/XML/include/Poco/XML/expat.h +++ b/XML/include/Poco/XML/expat.h @@ -18,6 +18,7 @@ Copyright (c) 2022 Thijs Schreijer Copyright (c) 2023 Hanno Böck Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2024 Taichi Haradaguchi <20001722@ymail.ne.jp> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -1042,7 +1043,7 @@ typedef struct { XMLPARSEAPI(const XML_Feature *) XML_GetFeatureList(void); -#if XML_GE == 1 +#if defined(XML_DTD) || (defined(XML_GE) && XML_GE == 1) /* Added in Expat 2.4.0 for XML_DTD defined and * added in Expat 2.6.0 for XML_GE == 1. */ XMLPARSEAPI(XML_Bool) @@ -1065,7 +1066,7 @@ XML_SetReparseDeferralEnabled(XML_Parser parser, XML_Bool enabled); */ #define XML_MAJOR_VERSION 2 #define XML_MINOR_VERSION 6 -#define XML_MICRO_VERSION 0 +#define XML_MICRO_VERSION 2 #ifdef __cplusplus } diff --git a/XML/samples/DOMParser/DOMParser_vs160.vcxproj b/XML/samples/DOMParser/DOMParser_vs160.vcxproj index b772183878..d7db79e813 100644 --- a/XML/samples/DOMParser/DOMParser_vs160.vcxproj +++ b/XML/samples/DOMParser/DOMParser_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 DOMParserd DOMParserd DOMParserd diff --git a/XML/samples/DOMParser/DOMParser_vs160.vcxproj.filters b/XML/samples/DOMParser/DOMParser_vs160.vcxproj.filters index 01b1143de1..6a544fd259 100644 --- a/XML/samples/DOMParser/DOMParser_vs160.vcxproj.filters +++ b/XML/samples/DOMParser/DOMParser_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {c54b5d98-2a82-4b09-97df-44222288a4f9} + {051d773a-f323-42fd-81ad-1ad15c2f24dd} - {be5a21b0-9e92-4ec7-9a0b-4af48bc0facd} + {68c0c9bf-8791-4b97-9cd0-8e233705fd6d} diff --git a/XML/samples/DOMParser/DOMParser_vs170.vcxproj b/XML/samples/DOMParser/DOMParser_vs170.vcxproj index 5c7e5d7b4e..81a7e51bde 100644 --- a/XML/samples/DOMParser/DOMParser_vs170.vcxproj +++ b/XML/samples/DOMParser/DOMParser_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 DOMParserd DOMParserd DOMParserd diff --git a/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters b/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters index 6731b18de6..c6841f4d31 100644 --- a/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters +++ b/XML/samples/DOMParser/DOMParser_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {8a08200a-1a12-4da5-a4cb-d6adf507aba0} + {f6316ed1-ad38-4bdc-9304-4b5de89b8aaa} - {d2160a53-12e9-4ffd-ad35-0d25d4bf92b1} + {2702456f-c937-4b9b-b5a1-6fd749a16c47} diff --git a/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj b/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj index 50aaa5f849..9d0764dd5d 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj +++ b/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 DOMWriterd DOMWriterd DOMWriterd diff --git a/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj.filters b/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj.filters index d916101f9f..f8973acaf5 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj.filters +++ b/XML/samples/DOMWriter/DOMWriter_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {acae5be3-4b12-447a-9d8e-9f162f2b16f7} + {4a3aeec4-aac6-4124-98fa-d97403643ede} - {9fcc108e-736d-44d6-8336-56d4bc9f05c7} + {c07cfcf6-6b3a-4e4e-bcc5-1873c9d7ee24} diff --git a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj index d9c5f386bf..c92bbc76ae 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj +++ b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 DOMWriterd DOMWriterd DOMWriterd diff --git a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters index 1f07e8c83c..8d26d5ec61 100644 --- a/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters +++ b/XML/samples/DOMWriter/DOMWriter_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {60a029ee-84d0-4105-9e6e-d95555057208} + {c87cd90b-3779-4b85-b271-d7fe109e2113} - {c072432c-7405-4762-aa49-4eab4b357375} + {ed4c8c86-ec92-4d5f-9f8e-c39dc8cf20e8} diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj b/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj index 1ae244dbd4..c5ae873ab2 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj +++ b/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PrettyPrintd PrettyPrintd PrettyPrintd diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj.filters b/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj.filters index ef3d194f03..7db8a8fb08 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj.filters +++ b/XML/samples/PrettyPrint/PrettyPrint_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {7147e155-1dfc-40d2-a78c-c57cea83bf1c} + {b7249d9c-4ec7-46ed-bb93-bd609612929e} - {84845345-4844-4653-971e-4aa97a764ce1} + {218e59c5-b679-418e-a291-f706dcb4c73b} diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj b/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj index 0e22c2e6bb..d983d8b1df 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj +++ b/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 PrettyPrint {DFA97011-8DD4-3A84-A0C9-EB2101BD6082} PrettyPrint @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + PrettyPrintd + PrettyPrintd + PrettyPrintd + PrettyPrint + PrettyPrint + PrettyPrint PrettyPrintd PrettyPrintd PrettyPrintd @@ -171,6 +250,36 @@ PrettyPrint PrettyPrint + + binA64\ + objA64\PrettyPrint\$(Configuration)\ + true + + + binA64\ + objA64\PrettyPrint\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\PrettyPrint\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\PrettyPrint\$(Configuration)\ + false + + + binA64\static_md\ + objA64\PrettyPrint\$(Configuration)\ + true + + + binA64\static_md\ + objA64\PrettyPrint\$(Configuration)\ + false + bin\ obj\PrettyPrint\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\PrettyPrint\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\PrettyPrint.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\PrettyPrintd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\PrettyPrint.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\PrettyPrintd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\PrettyPrintd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj.filters b/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj.filters index f753ee3a40..4929f2a89f 100644 --- a/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj.filters +++ b/XML/samples/PrettyPrint/PrettyPrint_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {0b25e87e-4a57-45cb-add3-0100c4f14047} + {fce88a9f-f560-48ab-8e32-458977a0e4b1} - {4f1b5178-d16f-4543-9846-988b361bb5f2} + {01938d58-1c22-4a3c-afbf-d8354ed27f91} diff --git a/XML/samples/SAXParser/SAXParser_vs160.vcxproj b/XML/samples/SAXParser/SAXParser_vs160.vcxproj index a2abf50950..d300cb55c1 100644 --- a/XML/samples/SAXParser/SAXParser_vs160.vcxproj +++ b/XML/samples/SAXParser/SAXParser_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 SAXParserd SAXParserd SAXParserd diff --git a/XML/samples/SAXParser/SAXParser_vs160.vcxproj.filters b/XML/samples/SAXParser/SAXParser_vs160.vcxproj.filters index 2672d87461..32528425b8 100644 --- a/XML/samples/SAXParser/SAXParser_vs160.vcxproj.filters +++ b/XML/samples/SAXParser/SAXParser_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {92991b2e-54de-4ad4-9379-943106ab1274} + {637b9b9e-7694-46d3-b00d-c6800fd404e4} - {aa175918-d7ab-45ad-9883-d47929ddcadc} + {92d0137c-fb4c-4593-b05d-8dd8b5ab3075} diff --git a/XML/samples/SAXParser/SAXParser_vs170.vcxproj b/XML/samples/SAXParser/SAXParser_vs170.vcxproj index 466f72605f..c7659678cd 100644 --- a/XML/samples/SAXParser/SAXParser_vs170.vcxproj +++ b/XML/samples/SAXParser/SAXParser_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 SAXParserd SAXParserd SAXParserd diff --git a/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters b/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters index 5d4bdb7073..1388db34ad 100644 --- a/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters +++ b/XML/samples/SAXParser/SAXParser_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {f72f6939-cdf6-4d4b-8201-9f02e0055e05} + {137db4ef-a0f0-484b-ba66-888cb6f2025b} - {dd54e283-1535-4069-a9d9-34be10276285} + {9a222178-cfc7-4af4-a196-cc5b50673232} diff --git a/XML/src/internal.h b/XML/src/internal.h index a82c68b4b2..a27eb20bcc 100644 --- a/XML/src/internal.h +++ b/XML/src/internal.h @@ -28,10 +28,11 @@ Copyright (c) 2002-2003 Fred L. Drake, Jr. Copyright (c) 2002-2006 Karl Waclawek Copyright (c) 2003 Greg Stein - Copyright (c) 2016-2023 Sebastian Pipping + Copyright (c) 2016-2024 Sebastian Pipping Copyright (c) 2018 Yury Gribov Copyright (c) 2019 David Loffredo - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow + Copyright (c) 2024 Taichi Haradaguchi <20001722@ymail.ne.jp> Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -155,14 +156,20 @@ extern "C" { void _INTERNAL_trim_to_complete_utf8_characters(const char *from, const char **fromLimRef); -#if XML_GE == 1 +#if defined(XML_GE) && XML_GE == 1 unsigned long long testingAccountingGetCountBytesDirect(XML_Parser parser); unsigned long long testingAccountingGetCountBytesIndirect(XML_Parser parser); const char *unsignedCharToPrintable(unsigned char c); #endif -extern XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c -extern unsigned int g_parseAttempts; // used for testing only +extern +#if ! defined(XML_TESTING) + const +#endif + XML_Bool g_reparseDeferralEnabledDefault; // written ONLY in runtests.c +#if defined(XML_TESTING) +extern unsigned int g_bytesScanned; // used for testing only +#endif #ifdef __cplusplus } diff --git a/XML/src/xmlparse.cpp b/XML/src/xmlparse.cpp index 8791b8efe3..e9cf7a46a4 100644 --- a/XML/src/xmlparse.cpp +++ b/XML/src/xmlparse.cpp @@ -1,4 +1,4 @@ -/* 628e24d4966bedbd4800f6ed128d06d29703765b4bce12d3b7f099f90f842fc9 (2.6.0+) +/* 2a14271ad4d35e82bde8ba210b4edb7998794bcbae54deab114046a300f9639a (2.6.2+) __ __ _ ___\ \/ /_ __ __ _| |_ / _ \\ /| '_ \ / _` | __| @@ -38,7 +38,7 @@ Copyright (c) 2022 Jann Horn Copyright (c) 2022 Sean McBride Copyright (c) 2023 Owain Davies - Copyright (c) 2023 Sony Corporation / Snild Dolkow + Copyright (c) 2023-2024 Sony Corporation / Snild Dolkow Licensed under the MIT license: Permission is hereby granted, free of charge, to any person obtaining @@ -217,7 +217,7 @@ typedef char ICHAR; #endif /* Round up n to be a multiple of sz, where sz is a power of 2. */ -#define ROUND_UP(n, sz) (((n) + ((sz)-1)) & ~((sz)-1)) +#define ROUND_UP(n, sz) (((n) + ((sz) - 1)) & ~((sz) - 1)) /* Do safe (NULL-aware) pointer arithmetic */ #define EXPAT_SAFE_PTR_DIFF(p, q) (((p) && (q)) ? ((p) - (q)) : 0) @@ -255,7 +255,7 @@ static void copy_salt_to_sipkey(XML_Parser parser, struct sipkey *key); it odd, since odd numbers are always relative prime to a power of 2. */ #define SECOND_HASH(hash, mask, power) \ - ((((hash) & ~(mask)) >> ((power)-1)) & ((mask) >> 2)) + ((((hash) & ~(mask)) >> ((power) - 1)) & ((mask) >> 2)) #define PROBE_STEP(hash, mask, power) \ ((unsigned char)((SECOND_HASH(hash, mask, power)) | 1)) @@ -636,8 +636,14 @@ static unsigned long getDebugLevel(const char *variableName, ? 0 \ : ((*((pool)->ptr)++ = c), 1)) -XML_Bool g_reparseDeferralEnabledDefault = XML_TRUE; // write ONLY in runtests.c -unsigned int g_parseAttempts = 0; // used for testing only +#if ! defined(XML_TESTING) +const +#endif + XML_Bool g_reparseDeferralEnabledDefault + = XML_TRUE; // write ONLY in runtests.c +#if defined(XML_TESTING) +unsigned int g_bytesScanned = 0; // used for testing only +#endif struct XML_ParserStruct { /* The first member must be m_userData so that the XML_GetUserData @@ -1035,7 +1041,9 @@ callProcessor(XML_Parser parser, const char *start, const char *end, return XML_ERROR_NONE; } } - g_parseAttempts += 1; +#if defined(XML_TESTING) + g_bytesScanned += (unsigned)have_now; +#endif const enum XML_Error ret = parser->m_processor(parser, start, end, endPtr); if (ret == XML_ERROR_NONE) { // if we consumed nothing, remember what we had on this parse attempt. @@ -6250,7 +6258,7 @@ storeEntityValue(XML_Parser parser, const ENCODING *enc, dtd->keepProcessing = dtd->standalone; goto endEntityValue; } - if (entity->open) { + if (entity->open || (entity == parser->m_declEntity)) { if (enc == parser->m_encoding) parser->m_eventPtr = entityTextPtr; result = XML_ERROR_RECURSIVE_ENTITY_REF; @@ -7797,6 +7805,8 @@ copyString(const XML_Char *s, const XML_Memory_Handling_Suite *memsuite) { static float accountingGetCurrentAmplification(XML_Parser rootParser) { + // 1.........1.........12 => 22 + const size_t lenOfShortestInclude = sizeof("") - 1; const XmlBigCount countBytesOutput = rootParser->m_accounting.countBytesDirect + rootParser->m_accounting.countBytesIndirect; @@ -7804,7 +7814,9 @@ accountingGetCurrentAmplification(XML_Parser rootParser) { = rootParser->m_accounting.countBytesDirect ? (countBytesOutput / (float)(rootParser->m_accounting.countBytesDirect)) - : 1.0f; + : ((lenOfShortestInclude + + rootParser->m_accounting.countBytesIndirect) + / (float)lenOfShortestInclude); assert(! rootParser->m_parentParser); return amplificationFactor; } diff --git a/XML/testsuite/TestSuite_vs160.vcxproj b/XML/testsuite/TestSuite_vs160.vcxproj index 9bd26dc23c..5c43cd5e07 100644 --- a/XML/testsuite/TestSuite_vs160.vcxproj +++ b/XML/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/XML/testsuite/TestSuite_vs160.vcxproj.filters b/XML/testsuite/TestSuite_vs160.vcxproj.filters index 7c405efe20..e3fabd5542 100644 --- a/XML/testsuite/TestSuite_vs160.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,46 +2,46 @@ - {f06175ff-5f8b-4d11-9361-d5731f8af56d} + {34eb4108-b0cf-46e4-bfa8-a163569005b8} - {e9154a8b-8069-416a-ad22-07587b584353} + {f8bdec76-5d8c-49de-87c8-89d715eab0b3} - {e3a59658-9bbe-46a6-9833-b7e5130b604e} + {233e2d6d-1b50-412e-a3d3-829fcc74b726} - {86e296c7-e286-4084-a11f-6472be34efd8} + {1982c497-ed04-4c1a-871e-9b6672f0ab8c} - {25135764-20e3-48cd-a30f-ebdcf10fc3e5} + {882189e4-06c0-44a1-9845-a2b8e3eb6fe9} - {921420a5-fdd6-4f9e-abf5-8c840f9b2f80} + {f93cb4c9-9e50-4902-99d9-f82b31441bde} - {12daa3a3-1660-40fe-82c6-683fde1180e3} + {45416a24-616e-4c22-aada-ec5b8bf2eba8} - {808e8303-33e3-4c0d-98ac-532d386290a2} + {2a9d742e-5f17-442a-94d4-7325c26b3673} - {bdc45c2a-39e7-4a16-8eb5-54764c7ef42f} + {d4854344-a38f-4866-8f8a-bff6e26d53c0} - {d9ea0431-ff51-482a-868d-9b998b43b0ee} + {43fd9815-fadf-44a9-871f-567975121fc3} - {6566e7d1-a361-4f29-8257-d089fba073a7} + {a108704e-105d-4825-aec7-5087b3e54727} - {e830d081-9e40-472e-9502-4a4bbd62a7d6} + {194af78f-40e2-4c09-be54-31133d0a8f7e} - {d8f08009-0a23-4def-a1e5-089fb4cc4e66} + {592fd5db-1336-419b-a74c-d33fac83646b} - {d53aece3-454a-4e15-9dd9-c9affe6981a7} + {6fe081a1-6675-4e9a-a3c4-423311d68f37} diff --git a/XML/testsuite/TestSuite_vs170.vcxproj b/XML/testsuite/TestSuite_vs170.vcxproj index dd76a0e2d7..8d6a19a1a8 100644 --- a/XML/testsuite/TestSuite_vs170.vcxproj +++ b/XML/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -915,69 +987,113 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/XML/testsuite/TestSuite_vs170.vcxproj.filters b/XML/testsuite/TestSuite_vs170.vcxproj.filters index ebcec4fd49..0beb266bea 100644 --- a/XML/testsuite/TestSuite_vs170.vcxproj.filters +++ b/XML/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,46 +2,46 @@ - {267dc191-c17a-40c7-b031-e4062ef685ef} + {25f68958-7e15-4df1-8051-e5cdbbd06b5e} - {ed0acb37-2e7b-4fb3-9e4f-bcca6737286e} + {eba6271c-cfa1-4784-bb91-760b5ce0b646} - {cabd32b6-bf1e-4fd0-bf00-83b66f87c283} + {3ed278f0-7d32-4187-b16c-eb53fa192f1f} - {82379ce0-5ff2-4c21-9a50-182ba826e3d6} + {3db3e122-0492-4904-88fb-adb6b27e42bb} - {e5e9b84d-0444-491c-a94c-860fea6c5dba} + {419c07f5-175d-4c54-b9e3-4f0cbc2c09d4} - {e81a05f0-8560-49c6-b545-52cd1985e47c} + {92a2e33d-a758-425b-968d-ef9a1bf8617e} - {baf873a5-c67b-4c0c-b43c-8d551efecbaf} + {fbf0fcad-0781-4965-884e-54e8f0f03e02} - {6453d96f-21a9-4601-93ee-a73402b79aea} + {d921874a-45d0-49f7-aa1a-b040057118d3} - {5d76fdeb-b462-4181-bf28-79334afd95ec} + {fb36dfca-b784-4db2-a2c7-a3e7b7a7a2dc} - {3de96171-216f-46e9-bde5-d59932c4e3fa} + {9c805026-b3eb-4241-bd4e-d29b0a3adce1} - {d76562a5-ae1b-44e0-9522-c6b29ab995b4} + {9fb442d6-255d-4d9c-bbfd-bcc9c954863c} - {4ac25127-ec4b-4cd0-9529-e3183239ba98} + {c0390adc-9b66-429a-b426-403ac33d88f5} - {15b79584-f97b-4e6b-a25d-bf5449b9058b} + {f1ab9f77-f6d1-4c12-aeeb-30f404017bea} - {1db3521f-175e-4bea-94dd-f7a6bcab3835} + {ce00027c-8ce6-4dde-842d-558143c576de} diff --git a/Zip/Zip_vs160.vcxproj b/Zip/Zip_vs160.vcxproj index 8f721f720b..b6bf8ff45f 100644 --- a/Zip/Zip_vs160.vcxproj +++ b/Zip/Zip_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 PocoZipd PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_vs160.vcxproj.filters b/Zip/Zip_vs160.vcxproj.filters index c4a0164e0a..06830df51f 100644 --- a/Zip/Zip_vs160.vcxproj.filters +++ b/Zip/Zip_vs160.vcxproj.filters @@ -2,22 +2,22 @@ - {e6984a0b-7d61-4787-9157-e5a19e0ecd86} + {cae287d2-930b-4f3e-beb3-278aa1347a3a} - {ab34883f-872a-4f92-9c9f-7d15bc7a0056} + {e177c642-c8c1-4ec7-b362-743d7eb366c8} - {85f70d16-1966-4cbe-9708-38a37e0e0c90} + {0d365b0d-af2a-4a42-a35f-15c80576edf5} - {f576f3e7-304d-4c81-89d0-db620bf7f12a} + {e5c27443-5a78-40bd-9eb7-4f1913cbe446} - {773e9e06-f07b-48fb-99bf-13983ae753b2} + {d5096e35-064f-4ee1-83d5-f8593e145721} - {03439319-0a8b-4b1d-bf7e-fd3124613a80} + {f5954fba-30d2-42df-85ea-be9a089bb42f} diff --git a/Zip/Zip_vs170.vcxproj b/Zip/Zip_vs170.vcxproj index af0765c634..36b4501551 100644 --- a/Zip/Zip_vs170.vcxproj +++ b/Zip/Zip_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.34322.80 + <_ProjectFileVersion>17.0.34714.143 PocoZipA64d PocoZipmdd PocoZipmtd diff --git a/Zip/Zip_vs170.vcxproj.filters b/Zip/Zip_vs170.vcxproj.filters index 4dd0b077a2..eaf6f9dd05 100644 --- a/Zip/Zip_vs170.vcxproj.filters +++ b/Zip/Zip_vs170.vcxproj.filters @@ -2,22 +2,22 @@ - {690a8469-95ed-462d-972f-79391d782dcc} + {b70f1df2-9603-4371-8ad2-bbc1b1971032} - {c3628cbf-b2f9-4ea7-8503-ba643b4e855f} + {409442a7-40a6-4cc9-b8e6-5a57ddda1c25} - {59b6e61c-93ab-4dbd-aa27-56fbb3960e30} + {0a29bb11-abbd-47fc-b3a9-0ec6aad90d1a} - {0a8e2b79-875a-42c4-8879-933845e48657} + {1419173c-b713-43cc-b53d-4a1e450f3206} - {2947c209-69d5-4657-ad85-67745de8389f} + {fd919c49-3754-4311-8954-c26adfe368d2} - {891520ba-8a6a-4469-ab40-d2838d46a3f7} + {833373bc-aaf2-4804-b69f-23abad85cbbf} diff --git a/Zip/samples/samples_vs170.sln b/Zip/samples/samples_vs170.sln index c29ef01f31..830d33cdc2 100644 --- a/Zip/samples/samples_vs170.sln +++ b/Zip/samples/samples_vs170.sln @@ -6,6 +6,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "unzip", "unzip\unzip_vs170. EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution + debug_shared|ARM64 = debug_shared|ARM64 + release_shared|ARM64 = release_shared|ARM64 + debug_static_mt|ARM64 = debug_static_mt|ARM64 + release_static_mt|ARM64 = release_static_mt|ARM64 + debug_static_md|ARM64 = debug_static_md|ARM64 + release_static_md|ARM64 = release_static_md|ARM64 debug_shared|Win32 = debug_shared|Win32 release_shared|Win32 = release_shared|Win32 debug_static_mt|Win32 = debug_static_mt|Win32 @@ -20,6 +26,24 @@ Global release_static_md|x64 = release_static_md|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Build.0 = debug_shared|Win32 {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 @@ -56,6 +80,24 @@ Global {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.ActiveCfg = release_static_md|x64 {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Build.0 = release_static_md|x64 {7F3AD0E5-A150-3AE7-9041-9086C45020C0}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|ARM64.ActiveCfg = debug_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|ARM64.Build.0 = debug_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|ARM64.Deploy.0 = debug_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|ARM64.ActiveCfg = release_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|ARM64.Build.0 = release_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_shared|ARM64.Deploy.0 = release_shared|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|ARM64.ActiveCfg = debug_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|ARM64.Build.0 = debug_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_mt|ARM64.Deploy.0 = debug_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|ARM64.ActiveCfg = release_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|ARM64.Build.0 = release_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_mt|ARM64.Deploy.0 = release_static_mt|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|ARM64.ActiveCfg = debug_static_md|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|ARM64.Build.0 = debug_static_md|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_static_md|ARM64.Deploy.0 = debug_static_md|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|ARM64.ActiveCfg = release_static_md|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|ARM64.Build.0 = release_static_md|ARM64 + {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.release_static_md|ARM64.Deploy.0 = release_static_md|ARM64 {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Build.0 = debug_shared|Win32 {9FE5275A-E14A-30C2-9C5B-AEBDE780608F}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 diff --git a/Zip/samples/unzip/unzip_vs160.vcxproj b/Zip/samples/unzip/unzip_vs160.vcxproj index 979139ba06..bd10dc4387 100644 --- a/Zip/samples/unzip/unzip_vs160.vcxproj +++ b/Zip/samples/unzip/unzip_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 unzipd unzipd unzipd diff --git a/Zip/samples/unzip/unzip_vs160.vcxproj.filters b/Zip/samples/unzip/unzip_vs160.vcxproj.filters index 004f290d2d..5e4c4f8e59 100644 --- a/Zip/samples/unzip/unzip_vs160.vcxproj.filters +++ b/Zip/samples/unzip/unzip_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {5dafba7e-63be-4000-acfd-03e528326e50} + {a15f530c-0ce8-4475-905c-b7b9508d5c86} - {d03f80c1-5292-48af-a984-80161672a93a} + {15b4a3dd-119d-4977-8d3e-8864da0fbd80} diff --git a/Zip/samples/unzip/unzip_vs170.vcxproj b/Zip/samples/unzip/unzip_vs170.vcxproj index 3edff62b11..19dce65874 100644 --- a/Zip/samples/unzip/unzip_vs170.vcxproj +++ b/Zip/samples/unzip/unzip_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 unzip {9FE5275A-E14A-30C2-9C5B-AEBDE780608F} unzip @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + unzipd + unzipd + unzipd + unzip + unzip + unzip unzipd unzipd unzipd @@ -171,6 +250,36 @@ unzip unzip + + binA64\ + objA64\unzip\$(Configuration)\ + true + + + binA64\ + objA64\unzip\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\unzip\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\unzip\$(Configuration)\ + false + + + binA64\static_md\ + objA64\unzip\$(Configuration)\ + true + + + binA64\static_md\ + objA64\unzip\$(Configuration)\ + false + bin\ obj\unzip\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\unzip\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\unzip.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\unzipd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\unzip.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\unzipd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\unzipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Zip/samples/unzip/unzip_vs170.vcxproj.filters b/Zip/samples/unzip/unzip_vs170.vcxproj.filters index 5f0cee1a65..60faf0fa68 100644 --- a/Zip/samples/unzip/unzip_vs170.vcxproj.filters +++ b/Zip/samples/unzip/unzip_vs170.vcxproj.filters @@ -2,10 +2,10 @@ - {ce5d1ea3-7a1b-46a8-93ee-ebbc120b182b} + {1ca94e34-1578-4266-8995-97814c76b390} - {cea1b680-6108-41a4-a781-a1d3ad78f961} + {5f06c831-78e7-45ca-96d6-268099e71c44} diff --git a/Zip/samples/zip/zip_vs160.vcxproj b/Zip/samples/zip/zip_vs160.vcxproj index a64f8c5b3e..54a87fa384 100644 --- a/Zip/samples/zip/zip_vs160.vcxproj +++ b/Zip/samples/zip/zip_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 zipd zipd zipd diff --git a/Zip/samples/zip/zip_vs160.vcxproj.filters b/Zip/samples/zip/zip_vs160.vcxproj.filters index da7bcc5309..758561cdb9 100644 --- a/Zip/samples/zip/zip_vs160.vcxproj.filters +++ b/Zip/samples/zip/zip_vs160.vcxproj.filters @@ -2,7 +2,7 @@ - {e6ac32d4-902b-49a8-8d1b-c332142dd44c} + {2c34866a-c41e-43d0-906c-5f05dae685f8} diff --git a/Zip/samples/zip/zip_vs170.vcxproj b/Zip/samples/zip/zip_vs170.vcxproj index 5118d9ab37..c762d1dcb9 100644 --- a/Zip/samples/zip/zip_vs170.vcxproj +++ b/Zip/samples/zip/zip_vs170.vcxproj @@ -1,6 +1,10 @@ - + + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -51,6 +75,7 @@ + 17.0 zip {7F3AD0E5-A150-3AE7-9041-9086C45020C0} zip @@ -87,6 +112,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +192,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +230,13 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34714.143 + zipd + zipd + zipd + zip + zip + zip zipd zipd zipd @@ -171,6 +250,36 @@ zip zip + + binA64\ + objA64\zip\$(Configuration)\ + true + + + binA64\ + objA64\zip\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\zip\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\zip\$(Configuration)\ + false + + + binA64\static_md\ + objA64\zip\$(Configuration)\ + true + + + binA64\static_md\ + objA64\zip\$(Configuration)\ + false + bin\ obj\zip\$(Configuration)\ @@ -231,6 +340,213 @@ obj64\zip\$(Configuration)\ false + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\zip.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\zipd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_mt\zip.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\zipd.exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + true + true + $(OutDir)$(TargetName).pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Zip\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) + true + stdcpp17 + stdc11 + + + iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + $(OutDir)$(TargetName).exe + ..\..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled @@ -247,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -255,7 +575,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -279,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -308,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -316,7 +644,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -340,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -369,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -377,7 +713,7 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -401,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -430,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -438,7 +782,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -462,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -491,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -499,7 +851,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -523,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -552,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -560,7 +920,7 @@ ..\..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\zipd.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -584,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,6 +964,8 @@ true + stdcpp17 + stdc11 diff --git a/Zip/samples/zip/zip_vs170.vcxproj.filters b/Zip/samples/zip/zip_vs170.vcxproj.filters index 38c7f7bf56..3da4607195 100644 --- a/Zip/samples/zip/zip_vs170.vcxproj.filters +++ b/Zip/samples/zip/zip_vs170.vcxproj.filters @@ -2,7 +2,7 @@ - {46cef2f1-2f4e-456a-a552-313411a7b680} + {72e61b43-a3f2-4fdd-8078-35173042b09d} diff --git a/Zip/testsuite/TestSuite_vs160.vcxproj b/Zip/testsuite/TestSuite_vs160.vcxproj index 4304aeb12f..08ca4c9b8d 100644 --- a/Zip/testsuite/TestSuite_vs160.vcxproj +++ b/Zip/testsuite/TestSuite_vs160.vcxproj @@ -158,7 +158,7 @@ - <_ProjectFileVersion>17.0.34511.75 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited diff --git a/Zip/testsuite/TestSuite_vs160.vcxproj.filters b/Zip/testsuite/TestSuite_vs160.vcxproj.filters index 6fb10e6f9e..9df200b59a 100644 --- a/Zip/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {7936c8e0-12af-451d-9a14-b532b681c080} + {3a9508a0-d9b3-4799-b5d6-05fd115ae21b} - {eaf69858-1fe3-400b-ab2c-9c3df327938b} + {b54648e9-1303-4ab7-9c6e-7cfd916bccac} - {0b96f029-fea6-45c0-8e61-c34cb7957b98} + {f3e37991-97d9-40fb-ac66-eec5276a9966} - {5168582c-2347-490b-bb96-a09405d34609} + {ac74c17f-a196-40b7-8c8f-289df785d22a} - {de54f02b-997f-4295-a6aa-87edb08e7eab} + {482b52ad-1182-4dbc-b4dd-3385cf5eea08} - {44f1bc18-16e3-4b1e-8c81-35aec752c305} + {434ddf83-c7e6-4fe6-a6d2-c3d8ed8c2a12} - {2c394f46-0a18-4511-b796-1b3a82368df5} + {2e314ff6-b34c-4057-879c-6ee20c268fc4} - {5b58fc19-f1cf-49aa-963e-c66b74e162e8} + {76c62c79-7805-40cb-93a4-7d1a9516fd34} diff --git a/Zip/testsuite/TestSuite_vs170.vcxproj b/Zip/testsuite/TestSuite_vs170.vcxproj index fcd8642506..62021345c3 100644 --- a/Zip/testsuite/TestSuite_vs170.vcxproj +++ b/Zip/testsuite/TestSuite_vs170.vcxproj @@ -230,7 +230,7 @@ - <_ProjectFileVersion>17.0.32505.173 + <_ProjectFileVersion>17.0.34714.143 TestSuited TestSuited TestSuited @@ -356,15 +356,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -388,11 +392,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -417,15 +425,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -449,11 +461,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_mt\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -478,15 +494,19 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuited.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) true true - binA64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineARM64 @@ -510,11 +530,15 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) - binA64\static_md\TestSuite.exe + $(OutDir)$(TargetName).exe ..\..\libA64;%(AdditionalLibraryDirectories) false Console @@ -539,7 +563,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -547,7 +575,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -571,7 +599,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -600,7 +632,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -608,7 +644,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -632,7 +668,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -661,7 +701,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -669,7 +713,7 @@ ..\..\lib;%(AdditionalLibraryDirectories) true true - bin\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX86 @@ -693,7 +737,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -722,7 +770,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitd.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -730,7 +782,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -754,7 +806,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnit.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -783,7 +839,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -791,7 +851,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_mt\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -815,7 +875,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -844,7 +908,11 @@ Level3 ProgramDatabase Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -852,7 +920,7 @@ ..\..\lib64;%(AdditionalLibraryDirectories) true true - bin64\static_md\TestSuited.pdb + $(OutDir)$(TargetName).pdb Console MachineX64 @@ -876,7 +944,11 @@ Level3 Default + $(OutDir)$(TargetName).pdb + /Zc:__cplusplus %(AdditionalOptions) true + stdcpp17 + stdc11 CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;%(AdditionalDependencies) @@ -898,18 +970,28 @@ true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 true + stdcpp17 + stdc11 diff --git a/Zip/testsuite/TestSuite_vs170.vcxproj.filters b/Zip/testsuite/TestSuite_vs170.vcxproj.filters index 5b5d021b6a..a145f19bcd 100644 --- a/Zip/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Zip/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {23c1aa9e-466b-4eea-8f18-32fc55ba7773} + {7f1f88f3-e2b5-4a9a-91e5-d6ed6c0e2722} - {9ae8df80-c242-40bd-868b-6bf57480554d} + {3a3a3f09-1949-486c-b675-4898f4c6de5d} - {2f0f0e3e-e3e3-46fc-9379-e62e26115a32} + {e7989bcc-0bef-4651-971d-2187ae7f348a} - {18efbedd-4e30-4bca-b1b3-5ddf85cf467a} + {690c2fc6-3462-4420-a200-bf3be21be1cd} - {f66c2e7a-ed68-42fb-b5b7-53feb76990a0} + {8d114936-ed5b-466a-83bf-e8350a589ab8} - {2458906b-62ad-4a03-bf2c-9e4bb11b6938} + {d5af5016-16a5-4720-8060-2c5a91e3f814} - {dc4d5a8f-21b8-42a0-aea3-c58d02dc0d74} + {c758b3b0-6266-4868-9f5f-dcf89e7b0a10} - {9512e0d9-232e-441a-9969-67ccb9dd2c39} + {6254b733-280c-4b06-824a-8f5d0a9d8ce2} diff --git a/build/config/FreeBSD b/build/config/FreeBSD index c851bf3a66..8777783f6b 100644 --- a/build/config/FreeBSD +++ b/build/config/FreeBSD @@ -1,7 +1,7 @@ # # FreeBSD # -# Make settings for FreeBSD 12.x/clang +# Make settings for FreeBSD/clang # # @@ -9,6 +9,13 @@ # LINKMODE ?= SHARED +# arm sanitizers available in >=13.3 and >=14.1 +SANITIZEFLAGS ?= +# sanitize flags: +# -fsanitize=address +# -fsanitize=undefined +# -fsanitize=thread + # # Define Tools # @@ -35,13 +42,13 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = +CFLAGS = $(SANITIZEFLAGS) -std=c11 CFLAGS32 = CFLAGS64 = -CXXFLAGS = +CXXFLAGS = $(SANITIZEFLAGS) -std=c++17 -Wall CXXFLAGS32 = CXXFLAGS64 = -LINKFLAGS = +LINKFLAGS = $(SANITIZEFLAGS) LINKFLAGS32 = LINKFLAGS64 = STATICOPT_CC = diff --git a/build/config/FreeBSD-Linux-compat b/build/config/FreeBSD-Linux-compat index 6c09650daa..52f9190297 100644 --- a/build/config/FreeBSD-Linux-compat +++ b/build/config/FreeBSD-Linux-compat @@ -1,5 +1,5 @@ # -# FreeBSD-Linux-Compat +# FreeBSD-Linux-compat # # Make settings for FreeBSD Linux Compatibility Mode (linux_base_fc10) # @@ -10,6 +10,13 @@ # LINKMODE ?= SHARED +# arm sanitizers available in >=13.3 and >=14.1 +SANITIZEFLAGS ?= +# sanitize flags: +# -fsanitize=address +# -fsanitize=undefined +# -fsanitize=thread + # # Define Tools # @@ -36,13 +43,13 @@ SHAREDLIBLINKEXT = .so # # Compiler and Linker Flags # -CFLAGS = +CFLAGS = $(SANITIZEFLAGS) -std=c11 CFLAGS32 = CFLAGS64 = -CXXFLAGS = -Wall -Wno-sign-compare +CXXFLAGS = $(SANITIZEFLAGS) -std=c++17 -Wall -Wno-sign-compare CXXFLAGS32 = CXXFLAGS64 = -LINKFLAGS = +LINKFLAGS = $(SANITIZEFLAGS) LINKFLAGS32 = LINKFLAGS64 = STATICOPT_CC = diff --git a/buildwin.ps1 b/buildwin.ps1 index 80462a778a..09e6ecfcdb 100644 --- a/buildwin.ps1 +++ b/buildwin.ps1 @@ -8,7 +8,7 @@ # [-action build | rebuild | clean] # [-linkmode shared | static_mt | static_md | all] # [-config release | debug | both] -# [-platform Win32 | x64 | ARM64 | WEC2013] +# [-platform Win32 | x64 | ARM64] # [-samples] # [-tests] # [-omit "Lib1X,LibY,LibZ,..."] @@ -42,7 +42,7 @@ Param [string] $config = 'release', [Parameter()] - [ValidateSet('Win32', 'x64', 'ARM64', 'WEC2013')] + [ValidateSet('Win32', 'x64', 'ARM64')] [string] $platform = 'x64', [switch] $tests = $false, @@ -218,7 +218,7 @@ function Process-Input Write-Host ' [-action build | rebuild | clean]' Write-Host ' [-linkmode shared | static_mt | static_md | all]' Write-Host ' [-config release | debug | both]' - Write-Host ' [-platform Win32 | x64 | WEC2013 | ARM64]' + Write-Host ' [-platform Win32 | x64 | ARM64]' Write-Host ' [-samples]' Write-Host ' [-tests]' Write-Host ' [-omit "Lib1X,LibY,LibZ,..."]' diff --git a/doc/99100-ReleaseNotes.page b/doc/99100-ReleaseNotes.page index 25f9f56671..516b5ddc5e 100644 --- a/doc/99100-ReleaseNotes.page +++ b/doc/99100-ReleaseNotes.page @@ -1,6 +1,35 @@ POCO C++ Libraries Release Notes AAAIntroduction +!!!Release 1.13.3 + +!!Summary of Changes + +This is a bugfix release. + +!!Security Fixes + + - GH #4496 Upgrade bundled libexpat to 2.6.2 + +!!Features, Enhancements and Third Party Updates + + - GH #4488 Add Poco::Util::Timer::idle() method to check if timer has any tasks scheduled + - GH #3807 DNS.resolve() should not be sorted in HostEntry::removeDuplicates() + - GH #4515 Upgrade bundled SQLite to 3.45.2 + - PR #4517 Optimize Net module for Android + +!!Bug Fixes and Improvements: + + - GH #4505 ODBC Unicode wrappers do not check for null length pointers + - GH #4492 Poco::BasicMemoryStreamBuf is missing seekpos() + - GH #4486 DateTimeFormat RFC1036 Sunday name is short (should be long) + - GH #4468 Poco::URI: don't lowercase host part if it's a Unix domain socket + - GH #4450 Error between Poco::ActiveRecord and Poco::Data::PostgreSQL + - GH #4435 SecureStreamSocket is not thread-safe + - GH #4415 SecureSocketImpl::reset shouldn't close socket + - GH #3857 Thread_POSIX.cpp shouldn't convert thread IDs to long + - GH #3725 secure socket receiveTimeout throwing after configured timeout * 2 + !!!Release 1.13.2 diff --git a/gh-cli-for-release-notes.sh b/gh-cli-for-release-notes.sh index 565f345efe..9a27d6c27f 100755 --- a/gh-cli-for-release-notes.sh +++ b/gh-cli-for-release-notes.sh @@ -32,20 +32,30 @@ echo gh issue list -S 'milestone:"'"${MILESTONE}"'" label:breaking' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' gh pr list -S 'milestone:"'"${MILESTONE}"'" label:breaking' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' + +echo +echo "Security Fixes:" +echo + +gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking label:security' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' +gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking label:security' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' + echo -echo "Features and Enhancements:" +echo "Features, Enhancements and Third Party Updates:" echo -gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking label:enhancement' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' -gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement label:feature' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' -gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking label:enhancement' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' -gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement label:feature' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' +gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security label:enhancement' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' +gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security -label:enhancement label:feature' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' +gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security -label:enhancement -label:feature label:third-party' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' +gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security label:enhancement' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' +gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security -label:enhancement label:feature' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' +gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:security -label:enhancement -label:feature label:third-party' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' echo echo "Bug Fixes and Improvements:" echo -gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement -label:feature' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' -gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement -label:feature' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' +gh issue list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement -label:feature -label:security -label:third-party' -s all -L 500 --json number,title --jq '.[] | "- GH #\(.number) \(.title)"' +gh pr list -S 'milestone:"'"${MILESTONE}"'" -label:breaking -label:enhancement -label:feature -label:security -label:third-party' -s all -L 500 --json number,title --jq '.[] | "- PR #\(.number) \(.title)"' echo diff --git a/libversion b/libversion index 257e563266..a9c8fe8292 100644 --- a/libversion +++ b/libversion @@ -1 +1 @@ -102 +103 diff --git a/release/script/cpproj b/release/script/cpproj index 4adc582876..f561a44d69 100755 --- a/release/script/cpproj +++ b/release/script/cpproj @@ -51,6 +51,10 @@ if [ -d ${src}/cmake ] ; then cp -R ${src}/cmake/* ${dst}/cmake >/dev/null 2>&1 fi +if [ -f ${src}/vcpkg.json ] ; then + cp ${src}/vcpkg*.json ${dst} +fi + if [ -d ${src}/testsuite ] ; then mkdir -p ${dst}/testsuite mkdir -p ${dst}/testsuite/src