From 1022d495b4d475252a0cbb30969dc0be3d99e315 Mon Sep 17 00:00:00 2001 From: Aleksandar Fabijanic Date: Fri, 10 Nov 2023 10:09:51 +0100 Subject: [PATCH] fix(build): regenerate vs160 Data-dependent projects; temporarily disable all CI jobs except VS2019 buildwin --- .github/workflows/ci.yml | 400 +++++++++--------- ActiveRecord/ActiveRecord_vs160.vcxproj | 29 +- .../ActiveRecord_vs160.vcxproj.filters | 6 +- .../testsuite/TestSuite_vs160.vcxproj | 29 +- .../testsuite/TestSuite_vs160.vcxproj.filters | 8 +- Data/Data_vs160.sln | 74 ++-- Data/Data_vs160.vcxproj | 111 +++-- Data/Data_vs160.vcxproj.filters | 174 +++++++- Data/ODBC/ODBC_vs160.vcxproj | 29 +- Data/ODBC/ODBC_vs160.vcxproj.filters | 6 +- Data/ODBC/testsuite/TestSuite_vs160.vcxproj | 29 +- .../testsuite/TestSuite_vs160.vcxproj.filters | 16 +- Data/samples/Binding/Binding_vs160.vcxproj | 29 +- .../Binding/Binding_vs160.vcxproj.filters | 4 +- .../samples/RecordSet/RecordSet_vs160.vcxproj | 29 +- .../RecordSet/RecordSet_vs160.vcxproj.filters | 4 +- .../RowFormatter/RowFormatter_vs160.vcxproj | 29 +- .../RowFormatter_vs160.vcxproj.filters | 4 +- Data/samples/Tuple/Tuple_vs160.vcxproj | 29 +- .../samples/Tuple/Tuple_vs160.vcxproj.filters | 4 +- .../TypeHandler/TypeHandler_vs160.vcxproj | 29 +- .../TypeHandler_vs160.vcxproj.filters | 4 +- .../WebNotifier/WebNotifier_vs160.vcxproj | 29 +- .../WebNotifier_vs160.vcxproj.filters | 4 +- .../testsuite/DataTest/DataTest_vs160.vcxproj | 126 +++--- .../DataTest/DataTest_vs160.vcxproj.filters | 4 +- Data/testsuite/TestSuite_vs160.vcxproj | 45 +- .../testsuite/TestSuite_vs160.vcxproj.filters | 43 +- 28 files changed, 788 insertions(+), 539 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 140433953..85a8395b6 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -5,197 +5,197 @@ concurrency: cancel-in-progress: true jobs: - linux-gcc-make: - runs-on: ubuntu-22.04 - services: - mysql: - image: mysql:latest - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_USER: pocotest - MYSQL_PASSWORD: pocotest - MYSQL_DATABASE: pocotest - ports: - - 3306:3306 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev - - run: ./configure --everything --omit=PDF && make all -s -j4 && sudo make install - - run: >- - sudo -s - EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB" - ./ci/runtests.sh +### linux-gcc-make: +### runs-on: ubuntu-22.04 +### services: +### mysql: +### image: mysql:latest +### env: +### MYSQL_ALLOW_EMPTY_PASSWORD: yes +### MYSQL_USER: pocotest +### MYSQL_PASSWORD: pocotest +### MYSQL_DATABASE: pocotest +### ports: +### - 3306:3306 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev +### - run: ./configure --everything --omit=PDF && make all -s -j4 && sudo make install +### - run: >- +### sudo -s +### EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB" +### ./ci/runtests.sh - linux-gcc-make-cxx20: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev - - run: ./configure --config=Linux-c++20 --everything --omit=PDF && make all -s -j4 && sudo make install - - run: >- - sudo -s - EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB" - ./ci/runtests.sh +### linux-gcc-make-cxx20: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev redis-server libmysqlclient-dev +### - run: ./configure --config=Linux-c++20 --everything --omit=PDF && make all -s -j4 && sudo make install +### - run: >- +### sudo -s +### EXCLUDE_TESTS="Data/ODBC Data/MySQL Data/PostgreSQL MongoDB" +### ./ci/runtests.sh - linux-gcc-make-asan: - runs-on: ubuntu-22.04 - services: - mysql: - image: mysql:latest - env: - MYSQL_ALLOW_EMPTY_PASSWORD: yes - MYSQL_USER: pocotest - MYSQL_PASSWORD: pocotest - MYSQL_DATABASE: pocotest - ports: - - 3306:3306 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server - - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install - - run: >- - sudo -s - EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB" - ./ci/runtests.sh +### linux-gcc-make-asan: +### runs-on: ubuntu-22.04 +### services: +### mysql: +### image: mysql:latest +### env: +### MYSQL_ALLOW_EMPTY_PASSWORD: yes +### MYSQL_USER: pocotest +### MYSQL_PASSWORD: pocotest +### MYSQL_DATABASE: pocotest +### ports: +### - 3306:3306 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server +### - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install +### - run: >- +### sudo -s +### EXCLUDE_TESTS="Data/ODBC Data/PostgreSQL MongoDB" +### ./ci/runtests.sh - linux-gcc-make-asan-no-soo: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server - - run: ./configure --everything --no-samples --omit=PDF --no-soo && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install - - run: >- - sudo -s - EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB" - ./ci/runtests.sh +### linux-gcc-make-asan-no-soo: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server +### - run: ./configure --everything --no-samples --omit=PDF --no-soo && make all -s -j4 SANITIZEFLAGS=-fsanitize=address && sudo make install +### - run: >- +### sudo -s +### EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB" +### ./ci/runtests.sh +### +### linux-gcc-make-ubsan: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server +### - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=undefined && sudo make install +### - run: >- +### sudo -s +### EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB" +### ./ci/runtests.sh - linux-gcc-make-ubsan: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server - - run: ./configure --everything --no-samples --omit=PDF && make all -s -j4 SANITIZEFLAGS=-fsanitize=undefined && sudo make install - - run: >- - sudo -s - EXCLUDE_TESTS="Data/MySQL Data/ODBC Data/PostgreSQL MongoDB" - ./ci/runtests.sh +### linux-gcc-make-tsan: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server +### - run: ./configure --everything --no-samples --omit=CppParser,Encodings,Data/MySQL,Data/ODBC,Data/PostgreSQL,MongoDB,PageCompiler,PDF,PocoDoc,ProGen,Redis,SevenZip && make all -s -j4 SANITIZEFLAGS=-fsanitize=thread && sudo make install +### - run: >- +### sudo -s +### ./ci/runtests.sh TSAN +### +### linux-gcc-cmake: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server +### - run: cmake -H. -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all +### - run: >- +### cd cmake-build && +### sudo -s +### PWD=`pwd` +### ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)" - linux-gcc-make-tsan: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install libssl-dev unixodbc-dev libmysqlclient-dev redis-server - - run: ./configure --everything --no-samples --omit=CppParser,Encodings,Data/MySQL,Data/ODBC,Data/PostgreSQL,MongoDB,PageCompiler,PDF,PocoDoc,ProGen,Redis,SevenZip && make all -s -j4 SANITIZEFLAGS=-fsanitize=thread && sudo make install - - run: >- - sudo -s - ./ci/runtests.sh TSAN +### linux-gcc-make-cross-armhf: +### runs-on: ubuntu-22.04 +### steps: +### - uses: actions/checkout@v3 +### - run: >- +### sudo apt-get -y update && +### sudo apt-get -y install crossbuild-essential-armhf +### - run: >- +### ./configure --config=ARM-Linux --everything --omit=PDF,Crypto,NetSSL_OpenSSL,JWT,Data/MySQL,Data/ODBC,Data/PostgreSQL,PageCompiler,PageCompiler/File2Page && +### make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf - linux-gcc-cmake: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: sudo apt -y update && sudo apt -y install cmake ninja-build libssl-dev unixodbc-dev libmysqlclient-dev redis-server - - run: cmake -H. -Bcmake-build -GNinja -DENABLE_PDF=OFF -DENABLE_TESTS=ON && cmake --build cmake-build --target all - - run: >- - cd cmake-build && - sudo -s - PWD=`pwd` - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)" +### macos-clang-make: +### runs-on: macos-12 +### steps: +### - uses: actions/checkout@v3 +### - run: brew install openssl@1.1 mysql-client unixodbc libpq +### - run: >- +### ./configure --everything --no-prefix --omit=PDF +### --odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib +### --mysql-include=/usr/local/opt/mysql-client/include --mysql-lib=/usr/local/opt/mysql-client/lib && +### make all -s -j4 +### - run: >- +### sudo -s +### CPPUNIT_IGNORE=" +### CppUnit::TestCaller.testTrySleep, +### CppUnit::TestCaller.testTimestamp, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testOldBSD" +### EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF" +### ./ci/runtests.sh - linux-gcc-make-cross-armhf: - runs-on: ubuntu-22.04 - steps: - - uses: actions/checkout@v3 - - run: >- - sudo apt-get -y update && - sudo apt-get -y install crossbuild-essential-armhf - - run: >- - ./configure --config=ARM-Linux --everything --omit=PDF,Crypto,NetSSL_OpenSSL,JWT,Data/MySQL,Data/ODBC,Data/PostgreSQL,PageCompiler,PageCompiler/File2Page && - make all -s -j4 ARCHFLAGS="-mcpu=cortex-a8 -mfloat-abi=hard -mfpu=neon" TOOL=arm-linux-gnueabihf +### macos-clang-cmake: +### runs-on: macos-12 +### steps: +### - uses: actions/checkout@v3 +### - run: brew install openssl@1.1 mysql-client unixodbc libpq +### - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all +### - run: >- +### cd cmake-build && +### sudo -s +### CPPUNIT_IGNORE=" +### CppUnit::TestCaller.testTrySleep, +### CppUnit::TestCaller.testTimestamp, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testPollClosedServer" +### PWD=`pwd` +### ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" - macos-clang-make: - runs-on: macos-12 - steps: - - uses: actions/checkout@v3 - - run: brew install openssl@1.1 mysql-client unixodbc libpq - - run: >- - ./configure --everything --no-prefix --omit=PDF - --odbc-include=/usr/local/opt/unixodbc/include --odbc-lib=/usr/local/opt/unixodbc/lib - --mysql-include=/usr/local/opt/mysql-client/include --mysql-lib=/usr/local/opt/mysql-client/lib && - make all -s -j4 - - run: >- - sudo -s - CPPUNIT_IGNORE=" - CppUnit::TestCaller.testTrySleep, - CppUnit::TestCaller.testTimestamp, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testOldBSD" - EXCLUDE_TESTS="Redis Data/MySQL Data/ODBC Data/PostgreSQL MongoDB PDF" - ./ci/runtests.sh +### macos-clang-cmake-openssl3: +### runs-on: macos-12 +### steps: +### - uses: actions/checkout@v3 +### - run: brew install openssl@3 mysql-client unixodbc libpq +### - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all +### - run: >- +### cd cmake-build && +### sudo -s +### CPPUNIT_IGNORE=" +### CppUnit::TestCaller.testTrySleep, +### CppUnit::TestCaller.testTimestamp, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testExpireN, +### CppUnit::TestCaller.testAccessExpireN, +### CppUnit::TestCaller.testPollClosedServer" +### PWD=`pwd` +### ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" - macos-clang-cmake: - runs-on: macos-12 - steps: - - uses: actions/checkout@v3 - - run: brew install openssl@1.1 mysql-client unixodbc libpq - - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@1.1 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all - - run: >- - cd cmake-build && - sudo -s - CPPUNIT_IGNORE=" - CppUnit::TestCaller.testTrySleep, - CppUnit::TestCaller.testTimestamp, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testPollClosedServer" - PWD=`pwd` - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" +### windows-2019-msvc-cmake: +### runs-on: windows-2019 +### env: +### CPPUNIT_IGNORE: >- +### class CppUnit::TestCaller.testFind, +### class CppUnit::TestCaller.testSendToReceiveFrom, +### class CppUnit::TestCaller.testPing, +### class CppUnit::TestCaller.testBigPing, +### class CppUnit::TestCaller.testMTU, +### class CppUnit::TestCaller.testProxy, +### class CppUnit::TestCaller.testProxy, +### class CppUnit::TestCaller.testPollClosedServer +### steps: +### - uses: actions/checkout@v3 +### - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON +### - run: cmake --build cmake-build --config Release +### - run: >- +### cd cmake-build; +### ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release - macos-clang-cmake-openssl3: - runs-on: macos-12 - steps: - - uses: actions/checkout@v3 - - run: brew install openssl@3 mysql-client unixodbc libpq - - run: cmake -H. -Bcmake-build -DENABLE_PDF=OFF -DENABLE_TESTS=ON -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl@3 -DMYSQL_ROOT_DIR=/usr/local/opt/mysql-client && cmake --build cmake-build --target all - - run: >- - cd cmake-build && - sudo -s - CPPUNIT_IGNORE=" - CppUnit::TestCaller.testTrySleep, - CppUnit::TestCaller.testTimestamp, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testExpireN, - CppUnit::TestCaller.testAccessExpireN, - CppUnit::TestCaller.testPollClosedServer" - PWD=`pwd` - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(PostgreSQL)|(MongoDB)|(Redis)" - - windows-2019-msvc-cmake: - runs-on: windows-2019 - env: - CPPUNIT_IGNORE: >- - class CppUnit::TestCaller.testFind, - class CppUnit::TestCaller.testSendToReceiveFrom, - class CppUnit::TestCaller.testPing, - class CppUnit::TestCaller.testBigPing, - class CppUnit::TestCaller.testMTU, - class CppUnit::TestCaller.testProxy, - class CppUnit::TestCaller.testProxy, - class CppUnit::TestCaller.testPollClosedServer - steps: - - uses: actions/checkout@v3 - - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON - - run: cmake --build cmake-build --config Release - - run: >- - cd cmake-build; - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release - windows-2019-msvc-buildwin-x64: runs-on: windows-2019 env: @@ -210,7 +210,7 @@ jobs: steps: - uses: actions/checkout@v3 - run: .\buildwin.ps1 -poco_base . -vs 160 -action build -linkmode all -config release -platform x64 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT" - + # windows-2019-msvc-buildwin-win32: # runs-on: windows-2019 # env: @@ -249,24 +249,24 @@ jobs: # - uses: actions/checkout@v3 # - run: .\buildwin.ps1 -poco_base . -vs 170 -action build -linkmode all -config release -platform Win32 -samples -tests -omit "Crypto,NetSSL_OpenSSL,Data/MySQL,Data/PostgreSQL,JWT" - windows-2022-msvc-cmake: - runs-on: windows-2022 - env: - CPPUNIT_IGNORE: >- - class CppUnit::TestCaller.testFind, - class CppUnit::TestCaller.testSendToReceiveFrom, - class CppUnit::TestCaller.testPing, - class CppUnit::TestCaller.testBigPing, - class CppUnit::TestCaller.testMTU, - class CppUnit::TestCaller.testProxy, - class CppUnit::TestCaller.testProxy - steps: - - uses: actions/checkout@v3 - - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON - - run: cmake --build cmake-build --config Release - - run: >- - cd cmake-build; - ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release +### windows-2022-msvc-cmake: +### runs-on: windows-2022 +### env: +### CPPUNIT_IGNORE: >- +### class CppUnit::TestCaller.testFind, +### class CppUnit::TestCaller.testSendToReceiveFrom, +### class CppUnit::TestCaller.testPing, +### class CppUnit::TestCaller.testBigPing, +### class CppUnit::TestCaller.testMTU, +### class CppUnit::TestCaller.testProxy, +### class CppUnit::TestCaller.testProxy +### steps: +### - uses: actions/checkout@v3 +### - run: cmake -S. -Bcmake-build -DENABLE_NETSSL_WIN=ON -DENABLE_NETSSL=OFF -DENABLE_CRYPTO=OFF -DENABLE_JWT=OFF -DENABLE_DATA=ON -DENABLE_DATA_ODBC=ON -DENABLE_DATA_MYSQL=OFF -DENABLE_DATA_POSTGRESQL=OFF -DENABLE_TESTS=ON +### - run: cmake --build cmake-build --config Release +### - run: >- +### cd cmake-build; +### ctest --output-on-failure -E "(DataMySQL)|(DataODBC)|(Redis)|(MongoDB)" -C Release # missing asan dll path # windows-2022-msvc-cmake-asan: diff --git a/ActiveRecord/ActiveRecord_vs160.vcxproj b/ActiveRecord/ActiveRecord_vs160.vcxproj index d6663ac5c..1ee839cb0 100644 --- a/ActiveRecord/ActiveRecord_vs160.vcxproj +++ b/ActiveRecord/ActiveRecord_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 ActiveRecord {CCC0A578-E065-4CBA-BB8D-F02BB2C24E7E} ActiveRecord @@ -157,7 +158,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>17.0.34202.158 PocoActiveRecordd PocoActiveRecordmdd PocoActiveRecordmtd @@ -226,7 +227,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -259,7 +260,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -288,7 +289,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -315,7 +316,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -336,7 +337,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -363,7 +364,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -385,7 +386,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -418,7 +419,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;ActiveRecordLib_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -447,7 +448,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -474,7 +475,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -495,7 +496,7 @@ Disabled - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -522,7 +523,7 @@ true Speed true - .\include;..\Foundation\include; ..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\Foundation\include;..\Data\include;..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/ActiveRecord_vs160.vcxproj.filters b/ActiveRecord/ActiveRecord_vs160.vcxproj.filters index f97048f13..ec9568e29 100644 --- a/ActiveRecord/ActiveRecord_vs160.vcxproj.filters +++ b/ActiveRecord/ActiveRecord_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {0c7ca2fc-405c-41cb-8a85-0c0be704bb61} + {28dd6b11-317a-48e6-b680-ad6a817cbec3} - {dc022939-cad7-4896-a860-11904f78b5e8} + {331ea644-41fa-430e-8e0d-672a7371118c} - {ff728db9-1520-40b8-89fd-93aa9669be62} + {2fcea3ab-7133-4bb4-be47-8b6a6c1c931f} diff --git a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj index f552c3180..08cacbce7 100644 --- a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj +++ b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 TestSuite {16B8C4E7-6F29-4910-9350-848730F9EF77} TestSuite @@ -157,7 +158,7 @@ - <_ProjectFileVersion>14.0.25420.1 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -234,7 +235,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src; ..\..\Data\SQLite\include;..\..\ActiveRecord\include;.\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters index ae99c9914..823a823a2 100644 --- a/ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters +++ b/ActiveRecord/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,16 +2,16 @@ - {50b5d6b1-711a-40b7-85fb-33c942328403} + {d195900b-a711-4532-aa25-5e5f0696f7ce} - {e893dccc-0b77-4350-9d63-692dd9dde5fa} + {75bdd16b-c424-440c-a778-e6c040418f1f} - {333120d3-2230-44ba-a64d-d480996fa66d} + {7f1b72cc-467e-46fe-b821-c6da44a434a1} - {39342b6b-82bb-4269-a9c6-42525f863ec3} + {794b4ed4-42e7-410c-91b2-24e920b43b69} diff --git a/Data/Data_vs160.sln b/Data/Data_vs160.sln index ebf71b52f..2f0f1e28c 100644 --- a/Data/Data_vs160.sln +++ b/Data/Data_vs160.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Data", "Data_vs160.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestSuite", "testsuite\TestSuite_vs160.vcxproj", "{1813A463-E349-4FEA-8A8E-4A41E41C0DC7}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "DataTest", "testsuite\DataTest\DataTest_vs160.vcxproj", "{240E83C3-368D-11DB-9FBC-00123FC423B5}" ProjectSection(ProjectDependencies) = postProject {240E83C3-368D-11DB-9FBC-00123FC423B5} = {240E83C3-368D-11DB-9FBC-00123FC423B5} EndProjectSection @@ -59,42 +59,42 @@ Global {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Build.0 = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.ActiveCfg = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Build.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|Win32.Deploy.0 = release_shared|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Build.0 = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.ActiveCfg = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Build.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_shared|x64.Deploy.0 = debug_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.ActiveCfg = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Build.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_shared|x64.Deploy.0 = release_shared|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 - {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 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Build.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.ActiveCfg = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Build.0 = release_static_md|x64 - {1813A463-E349-4FEA-8A8E-4A41E41C0DC7}.release_static_md|x64.Deploy.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.ActiveCfg = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Build.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|Win32.Deploy.0 = debug_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.ActiveCfg = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Build.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|Win32.Deploy.0 = release_shared|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.ActiveCfg = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Build.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|Win32.Deploy.0 = debug_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.ActiveCfg = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Build.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|Win32.Deploy.0 = release_static_mt|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.ActiveCfg = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Build.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|Win32.Deploy.0 = debug_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.ActiveCfg = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Build.0 = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|Win32.Deploy.0 = release_static_md|Win32 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.ActiveCfg = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Build.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_shared|x64.Deploy.0 = debug_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.ActiveCfg = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Build.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_shared|x64.Deploy.0 = release_shared|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.ActiveCfg = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Build.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_mt|x64.Deploy.0 = debug_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.ActiveCfg = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Build.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_mt|x64.Deploy.0 = release_static_mt|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.ActiveCfg = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Build.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.debug_static_md|x64.Deploy.0 = debug_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.ActiveCfg = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Build.0 = release_static_md|x64 + {240E83C3-368D-11DB-9FBC-00123FC423B5}.release_static_md|x64.Deploy.0 = release_static_md|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Data/Data_vs160.vcxproj b/Data/Data_vs160.vcxproj index 829557603..07cca1e02 100644 --- a/Data/Data_vs160.vcxproj +++ b/Data/Data_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Data {240E83C3-368D-11DB-9FBC-00123FC423B5} Data @@ -157,7 +158,7 @@ - <_ProjectFileVersion>16.0.32002.118 + <_ProjectFileVersion>17.0.34202.158 PocoDatad PocoDatamdd PocoDatamtd @@ -226,8 +227,8 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -239,6 +240,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -259,8 +261,8 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -271,6 +273,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -288,7 +291,7 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -302,6 +305,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -315,7 +319,7 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -327,6 +331,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -336,7 +341,7 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -350,6 +355,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -363,7 +369,7 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -376,6 +382,7 @@ Level3 Default + /Zc:__cplusplus %(AdditionalOptions) true @@ -385,8 +392,8 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebugDLL @@ -398,7 +405,7 @@ Level3 ProgramDatabase Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -419,8 +426,8 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;%(PreprocessorDefinitions) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Data_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -431,7 +438,7 @@ Level3 Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -449,7 +456,7 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -463,7 +470,7 @@ Level3 ProgramDatabase Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -477,7 +484,7 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -489,7 +496,7 @@ Level3 Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -499,7 +506,7 @@ Disabled - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -513,7 +520,7 @@ Level3 ProgramDatabase Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -527,7 +534,7 @@ true Speed true - .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -539,7 +546,7 @@ Level3 Default - /bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true @@ -591,6 +598,7 @@ + @@ -598,6 +606,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + @@ -690,6 +723,36 @@ true + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + + + true + true diff --git a/Data/Data_vs160.vcxproj.filters b/Data/Data_vs160.vcxproj.filters index eed50b05b..8b8ddcc50 100644 --- a/Data/Data_vs160.vcxproj.filters +++ b/Data/Data_vs160.vcxproj.filters @@ -2,31 +2,67 @@ - {ca802690-e052-4003-ae74-b2cd7e2c95f9} + {c03ff8c4-8b7e-4fdc-a268-709322472159} - {c9a3889d-4e2d-43ac-887e-3b22b1cf4ba9} + {9a23b528-2531-44aa-8d43-726f323ffc99} - {b6b0997e-c4d7-4526-88c6-614fba4407cf} + {00830c67-613c-4796-9fb0-040a48f12882} - {ca986e9c-3287-419e-8f6a-7472a96c71b9} + {98fddf5f-d853-4bff-8d97-76472d7ad823} - {33a16a37-8706-47fb-ac35-f3e913ff6a03} + {b7ef9ec6-fd35-4cc1-92e0-c8c9d7c882a8} - {934c7f71-50fb-452a-94a6-c123cdaa043e} + {5349df12-1923-44ae-8183-8fb838eeee13} + + + {2ef77b83-0fc5-456b-b951-9c92c7bee3c3} + + + {b63e58be-4bbc-47b9-a8bf-e0448fef4f59} + + + {087be81f-8245-4139-823d-763aac0291db} + + + {50155fee-d8ab-4019-bf65-ee51ae880fed} + + + {488b9194-dbab-4ef5-b9ce-3524673580d6} + + + {7d187a76-cd8f-43a1-88b3-9c4df2102301} + + + {d6e4e4fe-0a7e-4340-ae08-6535f8b0473d} + + + {70e4617b-3c43-4c1b-aa8b-396883bf8d83} + + + {a05db2e4-d3a1-4b7c-b4ff-0bd71821bdab} + + + {2b5f602b-14d7-4bf9-95d9-6502044dea10} + + + {490613de-8e49-47aa-91b9-afefbca8cbf9} + + + {8c2b6618-3a46-4d65-9f5d-0cc213a8cc2e} - {e6946b3f-5400-4275-a315-25a8db846def} + {f8120323-9741-4afd-93f2-d94fec707930} - {6fd48faa-50da-4192-bf66-27068d6b2156} + {5c86ff4b-d4ca-43a3-afad-f5ba79bd4756} - {71eaafa2-e2fe-4cb8-80e2-82ea694abeec} + {5007e3df-6ea5-4a11-a030-8f2b1f2c6314} @@ -144,6 +180,12 @@ DataCore\Header Files + + DataCore\Header Files + + + DataCore\Header Files + DataCore\Header Files @@ -177,10 +219,82 @@ SessionPooling\Header Files - - Logging\Header Files + + SQLParser\Header Files - + + SQLParser\Header Files + + + SQLParser\Header Files + + + SQLParser\parser\Header Files + + + SQLParser\parser\Header Files + + + SQLParser\parser\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\sql\Header Files + + + SQLParser\util\Header Files + + Logging\Header Files @@ -260,6 +374,9 @@ DataCore\Source Files + + DataCore\Source Files + DataCore\Source Files @@ -290,10 +407,37 @@ SessionPooling\Source Files - - Logging\Source Files + + SQLParser\Source Files - + + SQLParser\Source Files + + + SQLParser\parser\Source Files + + + SQLParser\parser\Source Files + + + SQLParser\sql\Source Files + + + SQLParser\sql\Source Files + + + SQLParser\sql\Source Files + + + SQLParser\sql\Source Files + + + SQLParser\sql\Source Files + + + SQLParser\util\Source Files + + Logging\Source Files diff --git a/Data/ODBC/ODBC_vs160.vcxproj b/Data/ODBC/ODBC_vs160.vcxproj index 8d4d6ea61..9a398a943 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj +++ b/Data/ODBC/ODBC_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 ODBC {1B29820D-375F-11DB-837B-00123FC423B5} ODBC @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 PocoDataODBCd PocoDataODBCmdd PocoDataODBCmtd @@ -226,7 +227,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -260,7 +261,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -290,7 +291,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -317,7 +318,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -338,7 +339,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -365,7 +366,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -388,7 +389,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -422,7 +423,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;THREADSAFE;ODBC_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -452,7 +453,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -479,7 +480,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreaded @@ -500,7 +501,7 @@ Disabled - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true EnableFastChecks @@ -527,7 +528,7 @@ true Speed true - .\include;..\..\Foundation\include;..\..\Data\include;%(AdditionalIncludeDirectories) + .\include;..\..\Foundation\include;..\..\Data\include;..\..\Data\src;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;THREADSAFE;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/ODBC_vs160.vcxproj.filters b/Data/ODBC/ODBC_vs160.vcxproj.filters index 7e60d14d9..f614bd33f 100644 --- a/Data/ODBC/ODBC_vs160.vcxproj.filters +++ b/Data/ODBC/ODBC_vs160.vcxproj.filters @@ -2,13 +2,13 @@ - {01707a8d-a3d6-4b70-8f70-7287a14b1746} + {e2a5414c-2ea8-4332-8e66-e425df38839d} - {411e4e11-ca0d-496b-a136-d225efd991b8} + {ea8d6d0f-1dcc-4992-bb60-7a201b6e70de} - {ecf8fac7-8acd-482d-b81c-88d9e282f0e5} + {fc6df9a9-e096-4f48-93ea-83e59cadce4c} diff --git a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj index df4337d9f..99fce8dde 100644 --- a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj +++ b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 TestSuite {00627063-395B-4413-9099-23BDB56562FA} TestSuite @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -234,7 +235,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\WinTestRunner\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - ..\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;%(AdditionalIncludeDirectories) + ..\include;..\..\..\CppUnit\include;..\..\..\CppUnit\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\testsuite\DataTest\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters index 5d00f6a6b..34fd3c6f2 100644 --- a/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/ODBC/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {e2bd62e2-949b-437b-971b-48484d6a0d72} + {22a759ed-26a8-4379-9e4f-ca8209204c81} - {44c93e62-417f-40e6-b4ed-7af5f6bbeea3} + {18baf03f-b45b-471c-9d3f-ebc8b978bea1} - {f77ee3ee-39ea-4276-9f42-e6719c76c567} + {4c2012a0-d52d-4f89-b618-078cc929ff6a} - {548bf7c2-04c3-490d-ae1f-61a4fe93b7d6} + {971b1b28-f835-4aab-89de-0de1474e1d76} - {66c8a268-e4e4-4edb-83a8-83cb1e5c028f} + {a46fd561-4196-4c2e-aba8-704e5f9c15be} - {17121a95-2f6b-430c-af19-1dd77b2f9558} + {35623448-5963-40e5-a05c-c69a6cda43e7} - {180f1b2b-e1aa-481c-a794-aa41d763aa0e} + {a224e65a-c791-404c-9767-756328215455} - {00cb3142-6543-4572-b3c6-5d6081e36d3d} + {fc7d8085-883f-422c-bd7e-8399b1dc1f52} diff --git a/Data/samples/Binding/Binding_vs160.vcxproj b/Data/samples/Binding/Binding_vs160.vcxproj index 3f8694cd0..feb0a75d4 100644 --- a/Data/samples/Binding/Binding_vs160.vcxproj +++ b/Data/samples/Binding/Binding_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Binding {0F0DF069-83D1-378D-A949-8DF9A883B627} Binding @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 Bindingd Bindingd Bindingd @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/Binding/Binding_vs160.vcxproj.filters b/Data/samples/Binding/Binding_vs160.vcxproj.filters index 109af540e..050744c40 100644 --- a/Data/samples/Binding/Binding_vs160.vcxproj.filters +++ b/Data/samples/Binding/Binding_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {8ee507ee-3aa1-4d49-9ef3-44d85cf0e693} + {6be20fef-8856-47c8-a8b1-17fd30ab14d4} - {fc183b74-19a5-4af3-bfb9-081d7b793dc8} + {596a7322-f960-4b6f-8f15-4cf616e140bc} diff --git a/Data/samples/RecordSet/RecordSet_vs160.vcxproj b/Data/samples/RecordSet/RecordSet_vs160.vcxproj index 9716e1ac8..05a06154c 100644 --- a/Data/samples/RecordSet/RecordSet_vs160.vcxproj +++ b/Data/samples/RecordSet/RecordSet_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 RecordSet {FEE20DCE-B9E3-30AB-A40C-B6A324997328} RecordSet @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 RecordSetd RecordSetd RecordSetd @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters b/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters index 62051007d..57d8e4f5e 100644 --- a/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters +++ b/Data/samples/RecordSet/RecordSet_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {8520b6ad-a899-436e-8a95-071b48aff857} + {a2633deb-2af8-46ce-a0f9-c2d880e077fd} - {56295ad1-b4ed-45b1-9a2d-a45649e8fc84} + {3262c8ac-33d1-462c-aab8-d112306ce791} diff --git a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj index 3ec6a370a..687b4b249 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj +++ b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 RowFormatter {133C62C7-3301-3F43-9ABF-14DF094A042F} RowFormatter @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 RowFormatterd RowFormatterd RowFormatterd @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters index 7c230599a..5e2cd2a58 100644 --- a/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters +++ b/Data/samples/RowFormatter/RowFormatter_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {fc0f9cfa-2465-463b-a683-b7406ecd5e92} + {b9d6aa62-3694-4755-b00c-1b809e0a8cf6} - {9de77a46-8474-45aa-9724-85957b200684} + {386743cd-a052-4ed7-b72c-ae801934da44} diff --git a/Data/samples/Tuple/Tuple_vs160.vcxproj b/Data/samples/Tuple/Tuple_vs160.vcxproj index bd57e58aa..ddf3aa8c3 100644 --- a/Data/samples/Tuple/Tuple_vs160.vcxproj +++ b/Data/samples/Tuple/Tuple_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 Tuple {F143DA5A-221A-3737-BCBA-F5BFD977038F} Tuple @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 Tupled Tupled Tupled @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/Tuple/Tuple_vs160.vcxproj.filters b/Data/samples/Tuple/Tuple_vs160.vcxproj.filters index 0bb960acf..2e24e1705 100644 --- a/Data/samples/Tuple/Tuple_vs160.vcxproj.filters +++ b/Data/samples/Tuple/Tuple_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {5bfd42b3-29cd-4440-a0c3-d0fc68f77f81} + {b5101158-cfe5-4fba-a045-69b5f17da5c3} - {dc7e3860-dfcf-410b-aad1-2ea1832f0268} + {2c118573-3105-485e-8d30-be4f02ee79e4} diff --git a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj index 564135db7..13e837f9d 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj +++ b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 TypeHandler {65A12348-CA20-324E-9F5E-7F82753C2C65} TypeHandler @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 TypeHandlerd TypeHandlerd TypeHandlerd @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\XML\include;..\..\..\Util\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters index 2e224ca21..ad451c847 100644 --- a/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters +++ b/Data/samples/TypeHandler/TypeHandler_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {48b989ac-6dce-4853-bbec-b89f0469081a} + {02dbb876-36e1-4bcf-896a-726a0954ae2d} - {0f9f5c5d-3119-447f-b446-d788c4952f18} + {7898bceb-09b3-41ee-91b1-2745ac74f96e} diff --git a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj index 8aa2e312b..ae6764c50 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj +++ b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 WebNotifier {BACF8377-AD61-3B07-9BD5-6AEFCB0EC754} WebNotifier @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 WebNotifierd WebNotifierd WebNotifierd @@ -234,7 +235,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -267,7 +268,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -295,7 +296,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -328,7 +329,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -356,7 +357,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -389,7 +390,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -417,7 +418,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true EnableFastChecks @@ -450,7 +451,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -478,7 +479,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -511,7 +512,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -539,7 +540,7 @@ Disabled - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -572,7 +573,7 @@ true Speed true - .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) + .\include;..\..\..\Foundation\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Data\SQLite\include;..\..\..\Net\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0500;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL diff --git a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters index 3aa01efb0..d2688d4ac 100644 --- a/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters +++ b/Data/samples/WebNotifier/WebNotifier_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {5216e52f-9c81-4b5e-8073-e4e320c5664d} + {91bd5b6a-0e13-4e60-981a-ad0e6c69eb71} - {6d4b6f71-3e84-495c-820a-b08181d12bcb} + {116b5d1b-034d-497b-b3ea-0ddedb47343d} diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj b/Data/testsuite/DataTest/DataTest_vs160.vcxproj index acfb9d6bc..87a846dfd 100644 --- a/Data/testsuite/DataTest/DataTest_vs160.vcxproj +++ b/Data/testsuite/DataTest/DataTest_vs160.vcxproj @@ -173,61 +173,61 @@ PocoDataTestmt - ..\bin\ + ..\..\..\bin\ obj\DataTest\$(Configuration)\ true - ..\bin\ + ..\..\..\bin\ obj\DataTest\$(Configuration)\ false - ..\lib\ + ..\..\..\lib\ obj\DataTest\$(Configuration)\ - ..\lib\ + ..\..\..\lib\ obj\DataTest\$(Configuration)\ - ..\lib\ + ..\..\..\lib\ obj\DataTest\$(Configuration)\ - ..\lib\ + ..\..\..\lib\ obj\DataTest\$(Configuration)\ - ..\bin64\ + ..\..\..\bin64\ obj64\DataTest\$(Configuration)\ true - ..\bin64\ + ..\..\..\bin64\ obj64\DataTest\$(Configuration)\ false - ..\lib64\ + ..\..\..\lib64\ obj64\DataTest\$(Configuration)\ - ..\lib64\ + ..\..\..\lib64\ obj64\DataTest\$(Configuration)\ - ..\lib64\ + ..\..\..\lib64\ obj64\DataTest\$(Configuration)\ - ..\lib64\ + ..\..\..\lib64\ obj64\DataTest\$(Configuration)\ Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -240,17 +240,17 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\bin\PocoDataTestd.dll + ..\..\..\bin\PocoDataTestd.dll true true - ..\bin\PocoDataTestd.pdb - ..\lib;%(AdditionalLibraryDirectories) + ..\..\..\bin\PocoDataTestd.pdb + ..\..\..\lib;%(AdditionalLibraryDirectories) Console - ..\lib\PocoDataTestd.lib + ..\..\..\lib\PocoDataTestd.lib MachineX86 @@ -261,7 +261,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -273,25 +273,25 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\bin\PocoDataTest.dll + ..\..\..\bin\PocoDataTest.dll true false - ..\lib;%(AdditionalLibraryDirectories) + ..\..\..\lib;%(AdditionalLibraryDirectories) Console true true - ..\lib\PocoDataTest.lib + ..\..\..\lib\PocoDataTest.lib MachineX86 Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -301,15 +301,15 @@ true true - ..\lib\PocoDataTestmtd.pdb + ..\..\..\lib\PocoDataTestmtd.pdb Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\lib\PocoDataTestmtd.lib + ..\..\..\lib\PocoDataTestmtd.lib @@ -319,7 +319,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -331,17 +331,17 @@ Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\lib\PocoDataTestmt.lib + ..\..\..\lib\PocoDataTestmt.lib Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -351,15 +351,15 @@ true true - ..\lib\PocoDataTestmdd.pdb + ..\..\..\lib\PocoDataTestmdd.pdb Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\lib\PocoDataTestmdd.lib + ..\..\..\lib\PocoDataTestmdd.lib @@ -369,7 +369,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -378,21 +378,21 @@ true true - ..\lib\PocoDataTestmd.pdb + ..\..\..\lib\PocoDataTestmd.pdb Level3 Default - /Zc:__cplusplus /std:c++17 %(AdditionalOptions) + /Zc:__cplusplus %(AdditionalOptions) true - ..\lib\PocoDataTestmd.lib + ..\..\..\lib\PocoDataTestmd.lib Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true EnableFastChecks @@ -405,17 +405,17 @@ Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\bin64\PocoDataTest64d.dll + ..\..\..\bin64\PocoDataTest64d.dll true true - ..\bin64\PocoDataTest64d.pdb - ..\lib64;%(AdditionalLibraryDirectories) + ..\..\..\bin64\PocoDataTest64d.pdb + ..\..\..\lib64;%(AdditionalLibraryDirectories) Console - ..\lib64\PocoDataTestd.lib + ..\..\..\lib64\PocoDataTestd.lib MachineX64 @@ -426,7 +426,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;_USRDLL;DataTest_EXPORTS;SQLParser_EXPORTS;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -438,25 +438,25 @@ Level3 Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\bin64\PocoDataTest64.dll + ..\..\..\bin64\PocoDataTest64.dll true false - ..\lib64;%(AdditionalLibraryDirectories) + ..\..\..\lib64;%(AdditionalLibraryDirectories) Console true true - ..\lib64\PocoDataTest.lib + ..\..\..\lib64\PocoDataTest.lib MachineX64 Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -466,15 +466,15 @@ true true - ..\lib64\PocoDataTestmtd.pdb + ..\..\..\lib64\PocoDataTestmtd.pdb Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\lib64\PocoDataTestmtd.lib + ..\..\..\lib64\PocoDataTestmtd.lib @@ -484,7 +484,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -496,17 +496,17 @@ Level3 Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\lib64\PocoDataTestmt.lib + ..\..\..\lib64\PocoDataTestmt.lib Disabled - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -516,15 +516,15 @@ true true - ..\lib64\PocoDataTestmdd.pdb + ..\..\..\lib64\PocoDataTestmdd.pdb Level3 ProgramDatabase Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\lib64\PocoDataTestmdd.lib + ..\..\..\lib64\PocoDataTestmdd.lib @@ -534,7 +534,7 @@ true Speed true - .\include;.\src;..\Foundation\include;%(AdditionalIncludeDirectories) + .\include;.\src;..\..\..\CppUnit\include;..\..\..\Data\include;..\..\..\Data\src;..\..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -546,11 +546,11 @@ Level3 Default - /Zc:__cplusplus /std:c++17%3b/bigobj %(AdditionalOptions) + /Zc:__cplusplus%3b/bigobj /std:c++17 %(AdditionalOptions) true - ..\lib64\PocoDataTestmd.lib + ..\..\..\lib64\PocoDataTestmd.lib diff --git a/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters b/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters index 526420e8d..960c53a77 100644 --- a/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters +++ b/Data/testsuite/DataTest/DataTest_vs160.vcxproj.filters @@ -2,10 +2,10 @@ - {8a77203b-f433-458d-8414-77fc321bd4b1} + {9ed3013f-fb42-4ea8-b9a2-57ac9aea5410} - {4a07844d-3afc-46d5-977f-86d98fc91159} + {ee8a15fa-6a19-46f9-83cf-7ca7689668e1} diff --git a/Data/testsuite/TestSuite_vs160.vcxproj b/Data/testsuite/TestSuite_vs160.vcxproj index 753289d4d..1deb4bcc0 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj +++ b/Data/testsuite/TestSuite_vs160.vcxproj @@ -1,5 +1,5 @@ - + debug_shared @@ -51,6 +51,7 @@ + 17.0 TestSuite {1813A463-E349-4FEA-8A8E-4A41E41C0DC7} TestSuite @@ -157,7 +158,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>17.0.34202.158 TestSuited TestSuited TestSuited @@ -234,7 +235,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -247,6 +248,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -267,7 +269,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -279,6 +281,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -295,7 +298,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -308,6 +311,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -328,7 +332,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -340,6 +344,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -356,7 +361,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\..\CppUnit\WinTestRunner\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -369,6 +374,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -389,7 +395,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -401,6 +407,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -417,7 +424,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true EnableFastChecks @@ -430,6 +437,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -450,7 +458,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -462,6 +470,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -478,7 +487,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -491,6 +500,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -511,7 +521,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreaded @@ -523,6 +533,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -539,7 +550,7 @@ Disabled - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true EnableFastChecks @@ -552,6 +563,7 @@ Level3 ProgramDatabase Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -572,7 +584,7 @@ true Speed true - ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + ..\include;..\..\CppUnit\include;..\src;..\..\Foundation\include;%(AdditionalIncludeDirectories) WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;%(PreprocessorDefinitions) true MultiThreadedDLL @@ -584,6 +596,7 @@ Level3 Default + /Zc:__cplusplus /std:c++17 %(AdditionalOptions) true @@ -606,6 +619,7 @@ + @@ -636,6 +650,9 @@ true + + true + true diff --git a/Data/testsuite/TestSuite_vs160.vcxproj.filters b/Data/testsuite/TestSuite_vs160.vcxproj.filters index 0a17d578a..1e9696fed 100644 --- a/Data/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Data/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,46 +2,55 @@ - {7e84ee0f-ec22-4e97-aeea-a8bd0ce4152e} + {2110cb77-2dd9-4fc9-b23c-7ffa01780b10} - {f4d0b95b-288c-4d87-adc2-05a8e804d138} + {7e659760-f611-4c4c-aa87-ab2735f50f1f} - {67638b50-3c9a-49fd-8830-878198b44a4b} + {8b4dde88-f590-4fd5-a3e2-c96b5bad09d7} - {aa2eca34-420d-4002-a647-522105462d3c} + {89ce8418-6b41-4fb6-af39-5b0f063ff8f9} - {77380bae-42e2-4730-bdf5-029a46b7de60} + {374575a8-73d9-472d-92a1-5952e25976e1} - {bf7ee855-8def-49be-bbeb-b343f1af6e25} + {3ad16fb0-d990-496a-a475-c7f8f25cdd76} - {71b40c25-0a71-4af1-9c24-bd19e9f05ee5} + {bd48e2d8-fa49-47cf-92ee-aaba8c3865dc} - {18542fbd-0f3f-4ded-bbd8-3187dacda5b9} + {f27a4252-9660-4011-a8fd-c3f11a8a829d} - {391c5e24-2daa-4267-95ba-ab8e4a678121} + {71478dc8-bf46-499c-a9d7-66f198e19bb0} - {0ae4b178-a34b-40fe-81eb-46e86815153a} + {95a357b7-739e-42ce-8e75-a84fb4a76224} - {bd5d5609-7342-4cfb-95fa-4057043b296f} + {0a3e2b11-5212-435f-b32d-d18ae3216a5f} - {5f59170e-8a51-4ec5-acc8-bab9e3f5c427} + {06592de6-8082-4b23-b3d0-f4322f4eb826} - {a03c48d7-ad5a-4962-ac25-f8d3b10fc4c0} + {629e12d4-340b-4da8-9606-8477affad287} - {777f4515-c6c8-4df2-9f01-661d208a7534} + {64fc97a7-e16f-4c74-95dd-9bfa176d9fe3} + + + {02bd5950-0a8d-43a0-a9c4-a125d402cc08} + + + {91d4e4e3-c6c6-4c93-9dba-3d996c4c9274} + + + {68eb2f3e-441a-484a-8dec-aa91e5129f40} @@ -72,6 +81,9 @@ SessionPooling\Header Files + + SQLParser\Header Files + @@ -104,5 +116,8 @@ SessionPooling\Source Files + + SQLParser\Source Files + \ No newline at end of file