diff --git a/CppUnit/CppUnit_vs170.vcxproj b/CppUnit/CppUnit_vs170.vcxproj
index 62ac2bd10..d135a2314 100644
--- a/CppUnit/CppUnit_vs170.vcxproj
+++ b/CppUnit/CppUnit_vs170.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -80,9 +80,8 @@
{138BB448-808A-4FE5-A66D-78D1F8770F59}
CppUnit
Win32Proj
- 10.0
-
+
StaticLibrary
MultiByte
@@ -173,65 +172,65 @@
MultiByte
v143
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>17.0.32505.173
+ <_ProjectFileVersion>17.0.34202.158
CppUnitA64d
CppUnitmdd
CppUnitmtd
@@ -341,16 +340,15 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- true
$(OutDir)$(TargetName).pdb
- stdcpp17
+ true
- ..\binA64\$(TargetName).dll
+ ..\binA64\CppUnitA64d.dll
true
true
$(OutDir)$(TargetName).pdb
@@ -375,15 +373,15 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
- stdcpp17
- ..\binA64\$(TargetName).dll
+ ..\binA64\CppUnitA64.dll
true
false
..\libA64;%(AdditionalLibraryDirectories)
@@ -406,16 +404,15 @@
true
true
true
-
+
$(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
true
- stdcpp17
- ..\libA64\$(TargetName).lib
+ ..\libA64\CppUnitmtd.lib
@@ -433,15 +430,15 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
- stdcpp17
- ..\libA64\$(TargetName).lib
+ ..\libA64\CppUnitmt.lib
@@ -456,16 +453,15 @@
true
true
true
-
+
$(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
true
- stdcpp17
- ..\libA64\$(TargetName).lib
+ ..\libA64\CppUnitmdd.lib
@@ -483,15 +479,15 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
- stdcpp17
- ..\libA64\$(TargetName).lib
+ ..\libA64\CppUnitmd.lib
@@ -506,17 +502,18 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
+ $(OutDir)$(TargetName).pdb
true
..\bin\CppUnitd.dll
true
true
- ..\bin\CppUnitd.pdb
+ $(OutDir)$(TargetName).pdb
..\lib;%(AdditionalLibraryDirectories)
Console
..\lib\CppUnitd.lib
@@ -538,10 +535,11 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
@@ -568,8 +566,8 @@
true
true
true
-
- ..\lib\CppUnitmtd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
@@ -594,10 +592,11 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
@@ -616,8 +615,8 @@
true
true
true
-
- ..\lib\CppUnitmdd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
@@ -642,10 +641,10 @@
true
true
true
-
- ..\lib\CppUnitmd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
-
+
Default
true
@@ -665,17 +664,18 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
+ $(OutDir)$(TargetName).pdb
true
..\bin64\CppUnit64d.dll
true
true
- ..\bin64\CppUnit64d.pdb
+ $(OutDir)$(TargetName).pdb
..\lib64;%(AdditionalLibraryDirectories)
Console
..\lib64\CppUnitd.lib
@@ -697,10 +697,11 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
@@ -727,8 +728,8 @@
true
true
true
-
- ..\lib64\CppUnitmtd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
@@ -753,10 +754,11 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
@@ -775,8 +777,8 @@
true
true
true
-
- ..\lib64\CppUnitmdd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
@@ -801,10 +803,11 @@
true
true
true
-
+
Level3
-
+
Default
+ $(OutDir)$(TargetName).pdb
true
@@ -838,23 +841,23 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
\ No newline at end of file
+
+
+
diff --git a/CppUnit/CppUnit_vs170.vcxproj.filters b/CppUnit/CppUnit_vs170.vcxproj.filters
index cdac40a9c..03c16c4ec 100644
--- a/CppUnit/CppUnit_vs170.vcxproj.filters
+++ b/CppUnit/CppUnit_vs170.vcxproj.filters
@@ -2,11 +2,11 @@
- {52c8067a-54e6-44bf-a510-eb95e4ec9865}
+ {84e2f454-350e-4e2b-8bfd-f3cbbb62f23c}
cpp;c;cxx;rc;def;r;odl;idl;hpj;bat
- {d1a255dc-fbfb-43a1-ad75-b34778d06787}
+ {e32858e2-8161-4416-aa5b-e230b409f24b}
*.h
diff --git a/Net/Net_vs170.vcxproj b/Net/Net_vs170.vcxproj
index 4b18dea60..4be3ef120 100644
--- a/Net/Net_vs170.vcxproj
+++ b/Net/Net_vs170.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+
debug_shared
@@ -75,41 +75,42 @@
+ 17.0
Net
{B057A1FE-09F7-465E-B8B5-E1B659051D76}
Net
Win32Proj
-
+
StaticLibrary
- v143
MultiByte
+ v143
StaticLibrary
- v143
MultiByte
+ v143
StaticLibrary
- v143
MultiByte
+ v143
StaticLibrary
- v143
MultiByte
+ v143
DynamicLibrary
- v143
MultiByte
+ v143
DynamicLibrary
- v143
MultiByte
+ v143
StaticLibrary
@@ -163,34 +164,33 @@
DynamicLibrary
- v143
MultiByte
+ v143
DynamicLibrary
- v143
MultiByte
+ v143
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -211,26 +211,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>16.0.32602.291
+ <_ProjectFileVersion>17.0.34202.158
+ PocoNetA64d
+ PocoNetmdd
+ PocoNetmtd
+ PocoNetA64
+ PocoNetmd
+ PocoNetmt
+ PocoNetd
+ PocoNetmdd
+ PocoNetmtd
+ PocoNet
+ PocoNetmd
+ PocoNetmt
+ PocoNet64d
+ PocoNetmdd
+ PocoNetmtd
+ PocoNet64
+ PocoNetmd
+ PocoNetmt
..\binA64\
@@ -326,7 +344,8 @@
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -334,7 +353,7 @@
..\binA64\PocoNetA64d.dll
true
true
- ..\binA64\PocoNetA64d.pdb
+ $(OutDir)$(TargetName).pdb
..\libA64;%(AdditionalLibraryDirectories)
Console
..\libA64\PocoNetd.lib
@@ -360,7 +379,8 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -389,11 +409,11 @@
true
true
- ..\libA64\PocoNetmtd.pdb
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -419,7 +439,8 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -439,11 +460,11 @@
true
true
- ..\libA64\PocoNetmdd.pdb
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -469,7 +490,8 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
@@ -488,18 +510,20 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
..\bin\PocoNetd.dll
true
true
- ..\bin\PocoNetd.pdb
+ $(OutDir)$(TargetName).pdb
..\lib;%(AdditionalLibraryDirectories)
Console
..\lib\PocoNetd.lib
@@ -521,11 +545,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -552,12 +578,13 @@
true
true
true
-
- ..\lib\PocoNetmtd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib\PocoNetmtd.lib
@@ -578,11 +605,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib\PocoNetmt.lib
@@ -600,12 +629,13 @@
true
true
true
-
- ..\lib\PocoNetmdd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib\PocoNetmdd.lib
@@ -626,12 +656,13 @@
true
true
true
-
- ..\lib\PocoNetmd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -650,18 +681,20 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
..\bin64\PocoNet64d.dll
true
true
- ..\bin64\PocoNet64d.pdb
+ $(OutDir)$(TargetName).pdb
..\lib64;%(AdditionalLibraryDirectories)
Console
..\lib64\PocoNetd.lib
@@ -683,11 +716,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies)
@@ -714,12 +749,13 @@
true
true
true
-
- ..\lib64\PocoNetmtd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib64\PocoNetmtd.lib
@@ -740,11 +776,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib64\PocoNetmt.lib
@@ -762,12 +800,13 @@
true
true
true
-
- ..\lib64\PocoNetmdd.pdb
+
+ $(OutDir)$(TargetName).pdb
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib64\PocoNetmdd.lib
@@ -788,244 +827,460 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
..\lib64\PocoNetmd.lib
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
@@ -1043,7 +1298,6 @@
true
-
-
-
+
+
diff --git a/Net/Net_vs170.vcxproj.filters b/Net/Net_vs170.vcxproj.filters
index a81c5cd6b..8ba36682f 100644
--- a/Net/Net_vs170.vcxproj.filters
+++ b/Net/Net_vs170.vcxproj.filters
@@ -2,166 +2,166 @@
- {0327a3ad-30cf-4db6-a801-53911cef2882}
+ {90277211-36fe-44fa-8779-bee1b27c0b33}
- {5bb088f8-9b67-443b-ba87-88c89083d108}
+ {dde6886a-711b-4b19-8ede-16e0946b3dd3}
- {c2212b81-c615-43ae-bc4b-538ea9acbd0c}
+ {225e8c7b-6770-4930-a8a6-de55b4e51c6f}
- {22aeb535-82d3-48de-bcc1-4855d0fa6957}
+ {89f0837c-8470-476c-872e-2feb780c3755}
- {7c491825-976b-44a7-a830-3bf552a20300}
+ {2adaae0b-b111-47fc-8613-a8eda7c657b8}
- {0ee833b1-e45b-4288-ae5e-91b76b4df09a}
+ {6b763933-275b-43db-8351-c759be910124}
- {972bf346-2819-4b15-a005-ee821590335d}
+ {c8823488-ff33-4000-bc95-a32a4962bc5f}
- {790ee1d2-7e0b-4db9-b4a1-ed41b7577deb}
+ {66abd578-d1d6-4f71-b3b6-6442be8027ea}
- {55ac476f-f77d-4bfa-a347-3e9d62a154bb}
+ {04a41c32-4f81-4630-8251-aebaac657dde}
- {1121319e-26fe-4b5e-a99c-a9ad657feb1c}
+ {a1b32860-4beb-44c8-be19-9ce8f80a8628}
- {66afe532-112f-4a65-8a48-6c283fe312ca}
+ {f3e1e652-16e3-4251-953d-dfbe62ea3982}
- {010f68d2-86e0-4871-a30d-80e385d03fc9}
+ {eb9d676b-c46b-4256-a316-d50aa6d696db}
- {c1508524-5428-4ed9-80bd-42156bc3f7e3}
+ {be5fbb21-ee3d-4a3b-824d-a93663d3b5b5}
- {512b50b6-03cd-4491-897f-8eaaceef5fa4}
+ {4bf59802-369d-44b5-b5e2-27de877443b7}
- {7a34e468-42db-41db-99b6-1c5143cf4720}
+ {2d040338-7189-4832-885f-c35df5e0261e}
- {6a67a7a9-4e13-4aa9-a393-7d2bec8dfb40}
+ {65ff22c9-dc2e-4dd6-806f-112e50a728a3}
- {2d54ebba-8e9d-417e-9da3-e02e349e3b64}
+ {171a9cfa-0f74-4258-b1cb-e8bc2f542719}
- {9f7d4901-70e6-4271-8063-e1fce4ab7021}
+ {700a3455-e21e-4b83-bbde-3bbf58da3ac2}
- {06bdc7d7-2fbd-4b4d-b2aa-c9ecb51c7bc5}
+ {491c59ae-0899-40d7-88e8-27b4b3bd341c}
- {82980e3e-becb-4db7-9fd3-5e33aa1c8abc}
+ {e318a0ee-2d73-454f-a372-1cb32986fcbf}
- {5cc883c1-7f7a-4444-81ea-fffa841fad3c}
+ {7bbbe1fd-5699-4d47-aeea-5c4ae76e0ed1}
- {5069cc08-95e8-438c-a95c-3bfb44046feb}
+ {e1c20e0e-cf9d-4388-ae15-747c642452ee}
- {7f600cd5-030c-416a-83bd-b55f27861921}
+ {e7c37000-31b5-4d4d-8b8e-ebb4b91e22aa}
- {5e34956e-7957-4a58-9d36-3a41b799fdd7}
+ {303f1252-d50c-45f5-ad39-9538d48e7da8}
- {b4a00fb0-4b7a-4f84-8c4f-bc3f54f0801e}
+ {64d4ca86-bc0e-47cd-93cb-1688b08c7dbc}
- {a4548540-c2f7-47d4-a163-7420617948da}
+ {ac6da4d0-ff1d-4845-8655-c1d7bb8af706}
- {8772fa07-ac53-41cd-aa2b-c99d1cde05c7}
+ {59dfc623-2f30-4dee-9e7f-b9ea32311877}
- {826fb5ae-5563-45ac-bce3-24414626f0a8}
+ {e35f97d2-6c4e-4101-b8d9-2d40a6e1f8d6}
- {df60d666-f912-4618-9bba-72e28295cb94}
+ {d4f6b235-3727-43b1-a45c-97634a88bcb5}
- {1787e2b6-d541-4b16-93a2-e66e636f4770}
+ {729c6f41-45c3-445c-9eaf-adc6fa2ab957}
- {4d782d56-61d9-423e-b668-07358c5acf2e}
+ {1c1aa126-7035-4c6c-b4a6-6db4bb9ba7b8}
- {ac70d310-02cd-4084-b6e8-a8394c3da327}
+ {697d988f-e82e-4b9a-a763-4e20e959246e}
- {87711a59-71ae-41ed-9058-a7f975bb4cd6}
+ {5f209277-2d19-4d78-b6f6-eb69ff9d169a}
- {891c3f22-1a25-4d1c-af8c-92621b530082}
+ {97dc13ec-7fd0-4bd0-88d7-d3f4e8b5aaf0}
- {61cd8667-c43a-42ad-80ad-2c012e3a63a8}
+ {82036806-9daf-40ea-97a9-7fa9d48d2c76}
- {2d2fc73b-7622-4cdf-b9a2-431d8cef5b6d}
+ {d44c2015-66b4-41bb-bab8-ce94e0642356}
- {ec40a7ac-6125-4cc1-b6ae-25f245629278}
+ {67442bc4-3f65-4814-8a73-98a91d70f29d}
- {50f1d5a8-30e3-44a0-a52e-5a3445aa6638}
+ {bd80dc76-0f7c-4c57-b1d6-1211abc0b0f1}
- {f5c8df69-6521-4f35-a31c-103322795b54}
+ {6a5f03bb-b749-40b5-86a2-8662f0ff7dfe}
- {8fe68575-229a-4caa-8f62-ee1cce1856fe}
+ {f535b5d2-7a50-45aa-8ce1-d427d3a7e54c}
- {d7259566-fbb7-4998-a4e4-56dae77866a7}
+ {575be2dd-dcee-4599-a534-e51c4cbab323}
- {47d3ce03-365c-4c13-86d0-342e99ebe32c}
+ {60d2fad0-8bae-4b91-a14c-f9b782c0d8ba}
- {1bc55eb6-3c68-44e9-a929-ae46d1d11922}
+ {26842ddd-3b15-47f6-a5a0-b4044213e4b5}
- {d79dbf11-3184-4558-acb9-a94cb0f0a461}
+ {db4b2298-756d-4f33-8047-e122cbf5ee67}
- {b99e11f4-018c-45c9-84d4-47c1c17fd78b}
+ {4f92c211-e6a2-401d-b04e-887f42165a06}
- {b35c8bbe-07c0-4f48-8236-5ffde07e185d}
+ {66d9c5ee-26b0-43d1-9a58-e257d9a76b59}
- {b56349c5-6624-47fd-aeb6-0d48502db985}
+ {c0fc6593-fd16-4366-a83a-cae87e1fae2f}
- {6df2f132-e07c-4ec2-b2fc-10262a58892b}
+ {08828b81-6913-4920-9f47-369439c27b3a}
- {a313fb55-54b0-487c-86e6-fd0b3de340f0}
+ {1ba12463-f782-4a94-9113-acfe835a2b8a}
- {65812101-be4a-4c49-912a-49eb9ea65cca}
+ {692613dc-6b1e-4ffb-9c28-47282f9b119f}
- {f6c00d82-d1e8-4dd8-9fc2-b95d376662a6}
+ {2df8e415-77bd-41b2-b770-ec4bfaee9e00}
- {34e35154-1aef-4fcf-991f-b3db9b4cbfc5}
+ {ccae9a0d-6819-45e0-af22-a5b2ff8b429b}
- {8c5c3d52-4e1d-4d0e-b5c6-a1199900e823}
+ {7f1a06da-5317-4803-9f4c-a13acd1e3959}
- {112649bf-0779-4de5-b573-cd0c0a2c3b78}
+ {d1384c8b-86bb-4d26-a6cf-06b490284056}
diff --git a/Net/testsuite/TestSuite_vs170.vcxproj b/Net/testsuite/TestSuite_vs170.vcxproj
index 0ad896704..edd84e7b5 100644
--- a/Net/testsuite/TestSuite_vs170.vcxproj
+++ b/Net/testsuite/TestSuite_vs170.vcxproj
@@ -1,5 +1,5 @@
-
-
+
+
debug_shared
@@ -75,36 +75,37 @@
+ 17.0
TestSuite
{D5EFBF27-B934-4B8D-8AE5-6EC00374819C}
TestSuite
Win32Proj
-
+
Application
- v143
MultiByte
+ v143
Application
- v143
MultiByte
+ v143
Application
- v143
MultiByte
+ v143
Application
- v143
MultiByte
+ v143
Application
- v143
MultiByte
+ v143
Application
@@ -168,29 +169,28 @@
Application
- v143
MultiByte
+ v143
-
-
-
+
+
-
+
-
+
-
+
-
+
-
+
-
+
@@ -211,26 +211,44 @@
-
+
-
+
-
+
-
+
-
+
-
+
-
+
- <_ProjectFileVersion>16.0.32602.291
+ <_ProjectFileVersion>17.0.34202.158
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
+ TestSuited
+ TestSuited
+ TestSuited
+ TestSuite
+ TestSuite
+ TestSuite
binA64\
@@ -338,16 +356,17 @@
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\TestSuited.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
true
true
- binA64\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineARM64
@@ -371,12 +390,13 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\TestSuite.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
false
Console
@@ -401,16 +421,17 @@
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\static_mt\TestSuited.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
true
true
- binA64\static_mt\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineARM64
@@ -434,12 +455,13 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\static_mt\TestSuite.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
false
Console
@@ -464,16 +486,17 @@
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\static_md\TestSuited.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
true
true
- binA64\static_md\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineARM64
@@ -497,12 +520,13 @@
Level3
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
true
CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
- binA64\static_md\TestSuite.exe
+ $(OutDir)$(TargetName).exe
..\..\libA64;%(AdditionalLibraryDirectories)
false
Console
@@ -523,11 +547,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -535,7 +561,7 @@
..\..\lib;%(AdditionalLibraryDirectories)
true
true
- bin\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX86
@@ -555,11 +581,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -584,11 +612,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -596,7 +626,7 @@
..\..\lib;%(AdditionalLibraryDirectories)
true
true
- bin\static_mt\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX86
@@ -616,11 +646,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -645,11 +677,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -657,7 +691,7 @@
..\..\lib;%(AdditionalLibraryDirectories)
true
true
- bin\static_md\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX86
@@ -677,11 +711,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -706,11 +742,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitd.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -718,7 +756,7 @@
..\..\lib64;%(AdditionalLibraryDirectories)
true
true
- bin64\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX64
@@ -738,11 +776,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnit.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -767,11 +807,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmtd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -779,7 +821,7 @@
..\..\lib64;%(AdditionalLibraryDirectories)
true
true
- bin64\static_mt\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX64
@@ -799,11 +841,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmt.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -828,11 +872,13 @@
true
true
true
-
+
Level3
ProgramDatabase
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmdd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -840,7 +886,7 @@
..\..\lib64;%(AdditionalLibraryDirectories)
true
true
- bin64\static_md\TestSuited.pdb
+ $(OutDir)$(TargetName).pdb
Console
MachineX64
@@ -860,11 +906,13 @@
true
true
true
-
+
Level3
-
+
Default
- /Zc:__cplusplus %(AdditionalOptions)
+ $(OutDir)$(TargetName).pdb
+ /Zc:__cplusplus /std:c++17 %(AdditionalOptions)
+ true
CppUnitmd.lib;iphlpapi.lib;winmm.lib;iphlpapi.lib;ws2_32.lib;%(AdditionalDependencies)
@@ -878,143 +926,276 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
+
+ true
+
-
-
-
-
\ No newline at end of file
+
+
+
diff --git a/Net/testsuite/TestSuite_vs170.vcxproj.filters b/Net/testsuite/TestSuite_vs170.vcxproj.filters
index 4771142e6..8f5123de3 100644
--- a/Net/testsuite/TestSuite_vs170.vcxproj.filters
+++ b/Net/testsuite/TestSuite_vs170.vcxproj.filters
@@ -2,172 +2,172 @@
- {bb5f99a4-076d-40f6-bd03-b605e2f78942}
+ {1de7c206-c047-4fa9-9f70-76fba36d6357}
- {370ee1f9-94d6-46c9-9cfd-ae9a82e4215e}
+ {b8067e77-98a2-483f-9ac4-87f6926e781d}
- {659db2c3-80b4-4646-9df5-9ea4def9cb97}
+ {21307ccd-54fb-4e34-b214-d1445abb7f49}
- {135d073c-c9d2-46f3-9f18-8692661c6a80}
+ {50f284c2-4fae-4db8-b938-edc31f894396}
- {4cea6005-eb6b-4067-8254-b2c023c162b1}
+ {88476b8b-c763-4846-9332-faa616e0af8e}
- {3718fde6-4856-4136-8951-ec466b8db23d}
+ {745ac167-857f-462c-ba8d-b77e85c3f0f8}
- {ef1aacf2-69b0-4f45-a2fa-d6273e7de591}
+ {782f1313-d76f-43f8-b194-4db6d179c288}
- {4379c133-cd56-4860-9c0e-1c3169ab30ee}
+ {7e31d1a5-174b-4d94-b66f-5306fc1d0516}
- {c913a0b8-78bf-41ad-bded-a1f9a8b37902}
+ {f069a939-12ee-4950-a2be-ac79d0633704}
- {057f1290-2c76-46e8-8dfc-da11d02253ef}
+ {1ff556e1-f288-4a77-9af3-2d8dcba443cb}
- {5a50683c-8e6a-400b-a50f-9eb7b74a6b12}
+ {b8e2bd2b-b893-4ce1-ac58-af41715c1d74}
- {32ed4d09-4da4-4316-8211-0dabc2ecba44}
+ {a0aca32e-b4d1-46a1-8389-65ea253b36d6}
- {a9b5b4c6-2436-46aa-bc18-79d150dc29c7}
+ {eacb0411-250d-436e-8d2f-e7177d116ec0}
- {ca0b80f5-478b-497c-bf9e-7bb0d3b0eb62}
+ {d9e4d8e8-d182-4dea-9b5b-b89962403176}
- {7f42dbcb-7c13-42ff-9f99-d4ce0d333515}
+ {b6edc3f3-cc59-494b-a71d-4f8c14ce3e39}
- {a8ace8af-b953-4ee5-9e7a-3cd7a54a78c0}
+ {458168b2-eebc-4dd4-9a03-d9f0f9a2a6c9}
- {ea6141c5-7525-4a5b-b339-cd124ed4f22b}
+ {838e9f23-65d9-411d-ad98-865282c4b124}
- {53842cf1-f516-431d-8eb5-e82dd686a69a}
+ {6790685c-24ac-4168-b7ec-11a33c69eecc}
- {b416b22f-fbf5-40c0-87db-11757f720182}
+ {e275504a-869c-4e49-8efb-5d761f5fa689}
- {61beb9b6-7056-4521-84b3-fae105421be5}
+ {eee2aa8f-28a6-4b90-9620-7074523024ed}
- {0e63a36b-a325-42da-8557-9be5b90249f9}
+ {17bcc15e-9b80-4a1f-b001-0c5c87e1c174}
- {f1394d79-96e4-4eed-bfc4-d20f25b9430b}
+ {5045634b-9e56-4776-9d49-e636e35f53f2}
- {ddabcfb2-56ba-49be-adb7-af8fb9d3ef97}
+ {08c36bec-040b-40f4-aff2-62b9285dc941}
- {021d4d11-8236-4574-a893-53d52a246d4f}
+ {b2e93dbe-aa43-4d42-a7f8-15eff701159f}
- {3ce8c86d-1258-488f-84be-7e95b3e0a540}
+ {91b9a556-e17f-4ed2-8362-0bc461cfa9d3}
- {10ac33f6-f9c0-4caa-8bf4-e0d27328842d}
+ {78fe40f0-075d-4204-8585-bf075d34845c}
- {244449a7-8c64-48e7-9112-209ef80e7cc3}
+ {d1d5fce3-0238-4e76-a858-cfd624518677}
- {39201469-efa7-45cc-89d4-41e6126221e0}
+ {d60f9e62-cc72-485e-9560-03e039bb99d7}
- {1f58cb9c-30a1-4dff-813a-c315c41e1540}
+ {ffab98d4-0d10-4316-998e-64f2a7c1e420}
- {dbc10ea1-5b42-469b-9358-ff12f39d8682}
+ {72bc5ba0-b4bc-45a7-887b-4f26d11c3388}
- {2f616086-6096-4c84-9622-6fffc25be1e0}
+ {cb750701-7d58-4b83-96bd-3e20c101dc88}
- {f9cd5b41-fc85-4e81-a08b-69f11f9aa058}
+ {c8829492-7db9-4fa8-bde1-8fec56ec7760}
- {0a43d4b7-1310-420d-9d69-b1deb7e0be39}
+ {9b7bd1fc-4765-492c-b1fc-e8cd0dbf2901}
- {aa486584-1762-4de5-abc4-0bca8749ef07}
+ {eaab7fac-663b-488c-a432-cee5c82c803a}
- {800eea8c-e13c-40aa-a581-b3af74ef6a74}
+ {acd6ae16-7521-4502-a85e-f7c260ad252e}
- {897be9b0-379b-4005-b6ec-c633df4aa0a6}
+ {d5c53961-e5cf-4d89-8077-b1146b50ff9c}
- {5326e350-6c82-4b47-b8bb-acf10c40f9a7}
+ {78abd5c7-e162-40db-bae9-187a17af9b5e}
- {f2edd76d-ba16-4ee2-a68b-7d9e9f800879}
+ {bb0aaf00-be64-401b-b847-5968d682bf75}
- {db1a8466-0305-4faa-9fe6-20fa535c1d80}
+ {9a43adf5-9118-437e-bd3f-979da977ac57}
- {2d22c5e1-721b-4d19-b698-8773ddc4dabc}
+ {ed4fe2e4-debb-4b0a-9b8a-434970c01115}
- {0bbba14e-6a39-455c-aec1-15af68b3bc73}
+ {18b22b60-08c4-44a3-8915-ec192e8a3fb0}
- {c92f3301-00f6-4491-beba-14937b1f3e68}
+ {3db6f9e0-ec17-41de-ad4b-48af29dc4ac1}
- {f6af5476-f273-4302-9e9b-5b6d0d1cbfb2}
+ {bec0a34f-958b-40d2-b6d6-bc6b6b147113}
- {804c7c07-44a1-4d61-be02-c6cc8b279420}
+ {8195d3bf-855d-4817-89ea-a58eff8c03c4}
- {b8618dd9-3ad3-4ace-94e8-a74c69d9d2e7}
+ {6333479e-c8ff-44f7-a50d-085523e5105f}
- {5696d5bc-86ff-43a9-b49c-9f9d45940500}
+ {72b65c24-6964-4b98-a113-329343f32ebd}
- {08a48a0b-85b2-43c9-b359-f08ae91631d5}
+ {09e33a50-8379-46db-8e79-e41018ee0d8f}
- {c5cf5e44-9907-4ecd-9fcd-075c862a0282}
+ {bd402350-2d9d-4a4a-852d-be89ac05db28}
- {ebe4a4ae-edae-4c4f-9f4c-c05da0288028}
+ {f4cd0903-39ed-40f7-9e92-c4e7cbe35ef0}
- {57c8332e-5bc0-464a-ba23-717a5ad8d7e0}
+ {68a90000-19f3-4d13-8fae-e9b6e5716652}
- {d8b00c86-03af-40df-8e84-2ba586a9e97c}
+ {66c54799-5c41-46f8-ae7a-58942ad4705b}
- {0ed1b87d-86e0-4883-9889-f8ca060cb9ad}
+ {f8351074-43b3-486c-b17c-1d3e97afa010}
- {f3304f4b-f410-46d9-879d-66f81e13e1cc}
+ {2cfcb915-097f-4a15-861f-69087117bc54}
- {fa35d4ea-24c8-4d08-a14d-d92fd1cb7d9f}
+ {160bf970-48eb-490c-a1c7-ada4205e3b04}
- {494ab2d2-7191-46ce-adfa-12fe16cd45e6}
+ {bd7d0bc2-d6a3-40fb-889d-3a9908f761b2}
- {3cb06642-ffbd-4684-b1f0-cfe3f3ad4bff}
+ {704cd365-f4d0-41dc-8509-02627e48fc33}