From b6d91eaef6198f8c337eab4465aa1d6ecc1cab88 Mon Sep 17 00:00:00 2001 From: Hernan Martinez Date: Mon, 1 Aug 2022 00:42:45 -0600 Subject: [PATCH] Crypto: Progen again to add new files and bring back ARM64 configuration (#3724) * Progen Crypto to re-add ARM64 * Add new files --- Crypto/Crypto_vs140.vcxproj | 8 + Crypto/Crypto_vs140.vcxproj.filters | 48 +-- Crypto/Crypto_vs150.vcxproj | 8 + Crypto/Crypto_vs150.vcxproj.filters | 48 +-- Crypto/Crypto_vs160.vcxproj | 8 + Crypto/Crypto_vs160.vcxproj.filters | 48 +-- Crypto/Crypto_vs170.vcxproj | 264 +++++++++++++++- Crypto/Crypto_vs170.vcxproj.filters | 36 +-- Crypto/testsuite/TestSuite_vs140.vcxproj | 4 + .../testsuite/TestSuite_vs140.vcxproj.filters | 22 +- Crypto/testsuite/TestSuite_vs150.vcxproj | 4 + .../testsuite/TestSuite_vs150.vcxproj.filters | 22 +- Crypto/testsuite/TestSuite_vs160.vcxproj | 6 +- .../testsuite/TestSuite_vs160.vcxproj.filters | 22 +- Crypto/testsuite/TestSuite_vs170.vcxproj | 287 +++++++++++++++++- .../testsuite/TestSuite_vs170.vcxproj.filters | 16 +- 16 files changed, 744 insertions(+), 107 deletions(-) diff --git a/Crypto/Crypto_vs140.vcxproj b/Crypto/Crypto_vs140.vcxproj index 7a618a37c..09fa0045e 100644 --- a/Crypto/Crypto_vs140.vcxproj +++ b/Crypto/Crypto_vs140.vcxproj @@ -559,6 +559,8 @@ + + @@ -607,6 +609,12 @@ true + + true + + + true + true diff --git a/Crypto/Crypto_vs140.vcxproj.filters b/Crypto/Crypto_vs140.vcxproj.filters index d270f7e75..489e410f6 100644 --- a/Crypto/Crypto_vs140.vcxproj.filters +++ b/Crypto/Crypto_vs140.vcxproj.filters @@ -2,58 +2,58 @@ - {04b70b04-697e-42a9-9aeb-e9ce6c343be9} + {60a8c7e2-2faa-4d2f-9395-a8a7b0b27799} - {75a7f23f-980b-4c33-b078-16605d946917} + {5810f1ac-f1a0-4eec-805c-4f10c8731258} - {af502e4d-9e80-4ff0-8e62-177ccd345d80} + {079a0514-d9e9-4c7e-814e-7bc6941f7492} - {ee9d5c88-630f-41f3-9e82-4c7dd16e8125} + {d9e32eb5-0f20-4262-8c04-ce30a11b5278} - {ac0454d9-cb57-4244-b7be-2dc1b78415bd} + {4d5ddd1e-5b34-493d-b3e6-696b3950239d} - {9356d389-2a2b-4bbb-9a48-0069ebce4ac6} + {52e2d122-9409-4b00-bb5d-8596e350271f} - {9edcc672-ed8e-493a-8a98-716bcc14c6e9} + {dc9887bc-80fa-4400-8ae3-798d0216e70e} - {e07cca81-0e0c-45ca-85f7-901a3ad549de} + {9af8f56b-58e6-471c-99dd-649f82bb513d} - {3cb68e52-e52f-453e-b02a-e88618254bcb} + {e986c9a0-8d5f-4ece-b226-97b00f75c36b} - {4ad478a3-34ab-4eb5-aff3-f3c6c93f4c5d} + {815003c3-868c-4edb-b8fc-71239f111d12} - {2af5aa00-cfb8-4d7a-9aed-fed3ee3f9ca1} + {83254184-d4b3-4e90-aaf8-6185be913f80} - {7cec80c3-6ea2-43cc-ada1-53605f124468} + {975ee625-4d9c-42c8-a51a-5ae6c152f3f7} - {f76416de-9deb-4dba-b54f-35ed9e474073} + {3ab5ac8f-2b83-4dfc-9603-0dac69d52013} - {696a1fff-7f4d-4595-9c40-e6596ef086b6} + {8b978dca-eb5f-4437-a1c2-4491c531c24e} - {9e86ecc5-a026-4432-8b10-45b575c1fa87} + {0a3d66e4-a2fd-41a2-b579-95aa9bd44595} - {edffd197-3071-4677-bdff-b0a00c7a014a} + {a612ef80-bf86-4cd6-912c-ba726353cc2a} - {dc754ea7-075d-48ff-9777-ff9aa6c9ddac} + {c46a2637-5bab-4cf6-93c0-d09d784e65f6} - {7a39a221-fafa-4375-9b1b-19488f30606b} + {e84f7326-3466-4a9e-bba3-1b0c4885717a} @@ -102,6 +102,9 @@ CryptoCore\Header Files + + CryptoCore\Header Files + CryptoCore\Header Files @@ -126,6 +129,9 @@ EC\Header Files + + EC\Header Files + @@ -170,6 +176,9 @@ CryptoCore\Source Files + + CryptoCore\Source Files + CryptoCore\Source Files @@ -194,6 +203,9 @@ EC\Source Files + + EC\Source Files + diff --git a/Crypto/Crypto_vs150.vcxproj b/Crypto/Crypto_vs150.vcxproj index 53f4b5d2b..66fe82987 100644 --- a/Crypto/Crypto_vs150.vcxproj +++ b/Crypto/Crypto_vs150.vcxproj @@ -559,6 +559,8 @@ + + @@ -607,6 +609,12 @@ true + + true + + + true + true diff --git a/Crypto/Crypto_vs150.vcxproj.filters b/Crypto/Crypto_vs150.vcxproj.filters index a30052634..3e30674e9 100644 --- a/Crypto/Crypto_vs150.vcxproj.filters +++ b/Crypto/Crypto_vs150.vcxproj.filters @@ -2,58 +2,58 @@ - {d9c44334-4a59-4b62-9f69-ceece97c18ed} + {75698788-03bc-4370-ab55-99d48c973dce} - {b8ed2f18-0b9c-4769-bc96-7a08bbdf8467} + {bcaac4d6-7340-4f39-9b36-724a1408f06c} - {42d8ab87-49fa-462d-8eab-709bb5c01557} + {e455849b-48cb-431b-983f-30c955a93552} - {b9a6f7a6-4b5c-4098-9d5c-65c2c2c394ef} + {b3905243-9455-4c38-a56e-1edaf52d18c3} - {29984b35-3df8-42a1-a712-2aecf201add5} + {8541c53c-aa29-4062-9029-6ba5ab950d9a} - {d33e4790-ed28-418b-9833-4bc1076e96f5} + {43690a3d-2085-46bd-8722-a153c2170f3e} - {646c27d1-6e6e-4637-88b3-4319186e3c55} + {c7c75237-17b5-443e-b48d-d276bedafb7e} - {3524e378-6f24-42ad-b273-c566e755b3ef} + {ca5d30c0-a95e-413d-a182-8ee7dfed0bff} - {47293d8d-14cd-43a0-b269-750216980bf1} + {cd24b06b-7900-4c1f-b1a3-8d5b2110ef46} - {e7a8b613-2fca-4175-8c42-19f40617fff7} + {ef3bafde-f2e0-4779-b50a-bcb066c09583} - {b9e2d34e-d0d6-49c5-912b-745b2d6aef07} + {deb5208b-9e44-47da-b191-718552850f5f} - {e07d97b9-8fd9-4c1d-bf49-65bce81a160d} + {01df9f00-078a-4cca-829a-d7421dfe4a43} - {cb31088c-c4cd-4a55-85a2-b59ac56cdecf} + {08b5b434-275e-46a4-a528-b6da06cc5691} - {9fc80937-4552-4263-b935-d62b68bfb981} + {d7cb049c-8340-4eda-899a-27c4d0ff3746} - {45c655ac-89aa-41b9-8d45-22b15ae4d07e} + {7e05b39f-e6ff-4225-8527-eb37bbcdfb18} - {ed9f6c2f-b58a-4306-b9aa-2142ebb895dd} + {3c7f4c55-1189-43b5-a9f6-5debd66906ba} - {61b07ccd-ce5a-4b1b-9254-8925309edbda} + {c3c69023-452b-455e-902a-684735fc89c7} - {3daecefa-a485-48f9-8297-854d4ca4b2ae} + {f3238968-0490-44f5-8031-00edec99904c} @@ -102,6 +102,9 @@ CryptoCore\Header Files + + CryptoCore\Header Files + CryptoCore\Header Files @@ -126,6 +129,9 @@ EC\Header Files + + EC\Header Files + @@ -170,6 +176,9 @@ CryptoCore\Source Files + + CryptoCore\Source Files + CryptoCore\Source Files @@ -194,6 +203,9 @@ EC\Source Files + + EC\Source Files + diff --git a/Crypto/Crypto_vs160.vcxproj b/Crypto/Crypto_vs160.vcxproj index 2ed57cca2..833edebbb 100644 --- a/Crypto/Crypto_vs160.vcxproj +++ b/Crypto/Crypto_vs160.vcxproj @@ -559,6 +559,8 @@ + + @@ -607,6 +609,12 @@ true + + true + + + true + true diff --git a/Crypto/Crypto_vs160.vcxproj.filters b/Crypto/Crypto_vs160.vcxproj.filters index 3ebeca3fb..f50401387 100644 --- a/Crypto/Crypto_vs160.vcxproj.filters +++ b/Crypto/Crypto_vs160.vcxproj.filters @@ -2,58 +2,58 @@ - {3ecf5332-c0c0-4122-b6e6-5dfabcb3b7fa} + {3e947499-e07e-49ae-9368-67ebdce7e2d9} - {4f8087f2-96ea-4728-8555-d1188d7dc40a} + {56cd8b79-7799-4706-be30-2f2551da9b06} - {546fc14e-2cad-438b-9670-e97a20c93227} + {ba015481-3cdc-4b4e-979f-73af16c9f113} - {78b6b52e-8707-4bad-8e63-a00446e610b5} + {29330975-8f63-4932-ae8b-2fc823bb5729} - {8da8d37c-0726-4c66-8375-9c2215bfdb6e} + {0de2d2fa-d52e-4b93-8429-1cc40ac5d89c} - {b33478ac-7764-436b-9419-797b445d9e83} + {73da9949-c7b1-450e-bfca-78e4fbaf01d0} - {9f50f3b5-a45f-45cd-a667-5c287f5f9025} + {56b61611-cae5-4a96-bec3-89dce21181c0} - {9d19bec5-a10f-4327-b252-0d33d1b4364f} + {7c16cc60-1306-47e1-aebf-18a33bbc40d3} - {d4e7ac76-ba3e-42d8-a8fb-1657f654d44b} + {15ccacc4-e673-4461-979f-862c147d2d0b} - {c0e23a57-a0d8-46aa-b1c5-977e4e8f95d1} + {26ce3381-5dc3-4241-8d27-09e14c4043b6} - {20f51cfd-b923-4182-a7ab-31806eccc848} + {9c578c8e-c65f-4088-9ca6-7609d2e7ebc0} - {765d54fc-025a-4e99-9274-a88d057bb402} + {418ebbbe-2a7d-4015-adf8-2e86566935a2} - {f5523a96-c1d3-493a-bc12-5033ec02d098} + {0a5aa58f-8179-480c-8805-7b64cb7c282a} - {ae54a1d7-7704-4a81-a841-ea05b0dc149c} + {66cbfe0e-ff30-42fe-9736-9fe8afad9463} - {e5b2f762-c12e-4cb6-9800-3df0cfcf2359} + {5ef84937-9e64-4f4a-af40-1118ac399fdc} - {95bc93c4-7fa9-4859-81b8-e7e886e927fe} + {59903614-4362-40ca-90f9-61958a40bf02} - {a996aa2c-ddc3-433f-9c82-a45e8e2ed763} + {6f907377-ea23-41d7-8008-63bf458c1a99} - {f39359ba-7374-4c3a-a42e-d9bafcf29f3e} + {e724e3f7-8adc-4738-8be3-fb6edbd76351} @@ -102,6 +102,9 @@ CryptoCore\Header Files + + CryptoCore\Header Files + CryptoCore\Header Files @@ -126,6 +129,9 @@ EC\Header Files + + EC\Header Files + @@ -170,6 +176,9 @@ CryptoCore\Source Files + + CryptoCore\Source Files + CryptoCore\Source Files @@ -194,6 +203,9 @@ EC\Source Files + + EC\Source Files + diff --git a/Crypto/Crypto_vs170.vcxproj b/Crypto/Crypto_vs170.vcxproj index 8e9558369..ca4d885d4 100644 --- a/Crypto/Crypto_vs170.vcxproj +++ b/Crypto/Crypto_vs170.vcxproj @@ -1,6 +1,10 @@ + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -87,6 +111,36 @@ MultiByte v143 + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + StaticLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + + + DynamicLibrary + MultiByte + v143 + StaticLibrary MultiByte @@ -137,6 +191,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +229,7 @@ - <_ProjectFileVersion>15.0.28127.55 + <_ProjectFileVersion>16.0.32629.160 PocoCryptoA64d PocoCryptomdd PocoCryptomtd @@ -177,6 +249,32 @@ PocoCryptomd PocoCryptomt + + ..\binA64\ + objA64\Crypto\$(Configuration)\ + true + + + ..\binA64\ + objA64\Crypto\$(Configuration)\ + false + + + ..\libA64\ + objA64\Crypto\$(Configuration)\ + + + ..\libA64\ + objA64\Crypto\$(Configuration)\ + + + ..\libA64\ + objA64\Crypto\$(Configuration)\ + + + ..\libA64\ + objA64\Crypto\$(Configuration)\ + ..\bin\ obj\Crypto\$(Configuration)\ @@ -229,6 +327,166 @@ ..\lib64\ obj64\Crypto\$(Configuration)\ + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + true + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\binA64\PocoCryptoA64d.dll + true + true + ..\binA64\PocoCryptoA64d.pdb + ..\libA64;%(AdditionalLibraryDirectories) + Console + ..\libA64\PocoCryptod.lib + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;_USRDLL;Crypto_EXPORTS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + true + + + ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + ..\binA64\PocoCryptoA64.dll + true + false + ..\libA64;%(AdditionalLibraryDirectories) + Console + true + true + ..\libA64\PocoCrypto.lib + MachineARM64 + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + ..\libA64\PocoCryptomtd.pdb + Level3 + ProgramDatabase + Default + true + + + ..\libA64\PocoCryptomtd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + true + + + ..\libA64\PocoCryptomt.lib + + + + + Disabled + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + ..\libA64\PocoCryptomdd.pdb + Level3 + ProgramDatabase + Default + true + + + ..\libA64\PocoCryptomdd.lib + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + .\include;..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;POCO_STATIC;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + true + + + ..\libA64\PocoCryptomd.lib + + Disabled @@ -654,12 +912,16 @@ + true true true + true true true + true true true + true true true diff --git a/Crypto/Crypto_vs170.vcxproj.filters b/Crypto/Crypto_vs170.vcxproj.filters index 446d5a992..151ae5735 100644 --- a/Crypto/Crypto_vs170.vcxproj.filters +++ b/Crypto/Crypto_vs170.vcxproj.filters @@ -2,58 +2,58 @@ - {34541de2-597d-4d85-a8bd-f614628ef41f} + {956bb6d7-1946-4d8e-a988-6f840553f433} - {933d6ab7-83f3-42b7-852e-64488c271fe2} + {ac7c9562-5031-4fd3-bf00-58ee2afd58f1} - {091793de-2462-453c-9bfa-f185f38ac872} + {bc2c461a-a460-43c5-9dda-e1ac05590b4a} - {a4e6ad94-27fd-4971-8e21-162977b2be38} + {6f66dac0-646c-425e-98f9-0443b14bea15} - {b6bc364f-786c-4284-aee8-81e1088fe438} + {3cd7a042-61b8-4430-88a3-96de91011504} - {6e17a26e-6936-46f0-b870-cfbcabe7b288} + {5480a739-70e8-4989-9388-858bc73745bf} - {5a817c98-3372-4aa9-96dc-c1564632dab8} + {10a1798e-fd19-4a4b-a4fa-078316b35b4a} - {2068d274-1332-493f-a895-cb1f649d51a9} + {948b072b-d50b-4e17-bed4-3bae8345be51} - {34141b79-001e-4e62-91dc-599310762221} + {984e69ae-d972-430f-84ad-885ce648930e} - {e72e2777-a7c9-4ed9-84e4-fb1d408b62af} + {c4a637d7-9aad-4d1b-b9ce-b00a3a9bf47c} - {fa3e0f90-c8ef-487a-b5d8-e8d333bd8e66} + {ef263eac-80d3-4c1a-abee-af439456b293} - {b89ccefd-a917-40c5-8f42-d9283c85a4d1} + {2af1dbe7-277e-4ab3-b8ad-255c4cf4f3ac} - {7b1ed31a-460f-4bf8-b2cc-3acce21eafc9} + {8d350d20-818d-4e10-8a87-6df008441927} - {b39c2113-8808-4ede-9a19-7683fdfce054} + {a6bd57e4-6d39-4a42-aa3d-4b1ad9e262fa} - {5ff76458-e3f3-47fd-a04f-5438823403c7} + {1c3b1b7c-2a2b-4eba-bc22-cedfdcc12b48} - {2632fac3-9ea8-40e5-b6c9-dd80dcbf90fc} + {a692dced-8e66-4531-9567-6b57a3f9d89f} - {2f3a3bec-8324-4747-8702-68ce13ed18df} + {d6b09c46-8d74-4ab2-99b0-31923c880bed} - {037bc715-5031-4d0e-bd7b-740d4d730424} + {b0414365-c964-4c45-a80e-8539c5fe0b5b} diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj b/Crypto/testsuite/TestSuite_vs140.vcxproj index 63f4268ef..de77af4b0 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj @@ -602,6 +602,7 @@ + @@ -622,6 +623,9 @@ true + + true + true diff --git a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters index 92766ad14..dec7fb619 100644 --- a/Crypto/testsuite/TestSuite_vs140.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs140.vcxproj.filters @@ -2,28 +2,28 @@ - {0307e461-0372-4b61-b88a-24f59d5291f5} + {9dff95b8-7a0a-42a2-882d-240353eebc86} - {ea60f0b1-8f41-4785-b21c-ea51871b27b6} + {c461d935-f1d4-468f-8e89-a06090c1b7d6} - {73a5e4b2-0a40-4682-adcd-f76a09839671} + {dcfe4ffa-6b62-4c48-9625-6fa8d16841f6} - {1cf95bad-cc85-45a5-82db-4348109089a6} + {66610ad9-d08d-4cd7-b3d2-d6d71a7d9ac5} - {e596f9e4-e909-41be-9311-df2d6d3747aa} + {0cfb4e9f-5fe7-42dd-96f1-3dc5e779bf88} - {4484ecb8-1194-4fc5-bb53-264ad9a608b2} + {0cd7e466-afb0-40c7-abff-08147e0e6da7} - {4d620dde-5cd7-4b0e-a142-d965960c8a72} + {89a0f0f0-fd2a-49aa-91f2-5b766adcd945} - {be860c27-4ecf-4076-bf9a-214fec9a6bb5} + {e110d68e-1724-4d5e-8ab5-f774c2735147} @@ -42,6 +42,9 @@ Crypto\Header Files + + Crypto\Header Files + Crypto\Header Files @@ -65,6 +68,9 @@ Crypto\Source Files + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj b/Crypto/testsuite/TestSuite_vs150.vcxproj index b57bc883b..1167f02c1 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj @@ -602,6 +602,7 @@ + @@ -622,6 +623,9 @@ true + + true + true diff --git a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters index 3c4912f82..ab329fa92 100644 --- a/Crypto/testsuite/TestSuite_vs150.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs150.vcxproj.filters @@ -2,28 +2,28 @@ - {2bb088de-648b-44f3-a6da-7e01203baa0c} + {c36620ad-ed1f-44db-b632-628f09517b5a} - {b0434cc3-d68a-4a24-a60e-ba34498152ea} + {93ac862f-ef66-4c96-82c6-82f03c87b786} - {c7b2facf-5022-4c9b-85b2-55ca7ff19a47} + {c59358e6-8395-4e21-b952-d8f99d0805c9} - {cbd4a023-92b8-4bb5-a9df-435c6a7afe13} + {f96aacb4-a5dc-4cd9-9af3-9181ca3d08e8} - {2a3ebbe8-0b82-4b0b-b75a-2a14e7cf8510} + {0f12e848-51bd-4dcb-ac5a-21cfe7a2d3f9} - {6384c5af-9c91-4a65-b82a-f21cd1e0889e} + {79f7b368-e662-4165-b04b-4a1d652b6a32} - {c41d57c8-f31f-4791-ba37-a1976e798c72} + {4c17d29d-4e86-4175-8704-3d1374a9e47c} - {4c8e8c4a-0480-47c4-ab2e-0271c7874e63} + {d54ac5e8-d98b-4c54-a8a4-8553a21a9ac7} @@ -42,6 +42,9 @@ Crypto\Header Files + + Crypto\Header Files + Crypto\Header Files @@ -65,6 +68,9 @@ Crypto\Source Files + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs160.vcxproj b/Crypto/testsuite/TestSuite_vs160.vcxproj index adf780891..4ff3fed0a 100644 --- a/Crypto/testsuite/TestSuite_vs160.vcxproj +++ b/Crypto/testsuite/TestSuite_vs160.vcxproj @@ -157,7 +157,7 @@ - <_ProjectFileVersion>15.0.28307.799 + <_ProjectFileVersion>16.0.32629.160 TestSuited TestSuited TestSuited @@ -602,6 +602,7 @@ + @@ -622,6 +623,9 @@ true + + true + true diff --git a/Crypto/testsuite/TestSuite_vs160.vcxproj.filters b/Crypto/testsuite/TestSuite_vs160.vcxproj.filters index 10566c169..9319e7674 100644 --- a/Crypto/testsuite/TestSuite_vs160.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs160.vcxproj.filters @@ -2,28 +2,28 @@ - {0dc0ac78-ca59-458b-8c95-bb50bba12e83} + {8e27cadf-c720-479f-92da-b1e97f437438} - {7ab4046f-488c-47f4-b6db-18fe2cc37af5} + {91a5793c-8b68-45d0-b350-877dd6cf2c02} - {a2b63aa7-58ba-4f3a-b391-a3f32a67bce7} + {a14e5add-e33d-424b-be23-0b8371e22609} - {92de59df-1db3-4ac4-a545-9e16c5a4aaeb} + {f231f366-be62-4292-ab26-f91a41191403} - {859f2c78-4de9-4aa2-b113-d5b2fc4fda8f} + {ec44c7f3-b2a1-4b59-9081-8e61ddef1c44} - {62840282-6976-4ef5-934c-9e7ef7f4aad1} + {728bece6-f76d-483c-a028-52f91599a7e7} - {c2dfb797-2cf1-48e9-a3db-9578c1be834d} + {57064194-c6d7-414b-9f0d-a1707f6e0c8d} - {68a624c7-5f73-4259-9035-b8c7eb047dd9} + {60671a47-3546-4b5d-b1e9-275110dd36ca} @@ -42,6 +42,9 @@ Crypto\Header Files + + Crypto\Header Files + Crypto\Header Files @@ -65,6 +68,9 @@ Crypto\Source Files + + Crypto\Source Files + Crypto\Source Files diff --git a/Crypto/testsuite/TestSuite_vs170.vcxproj b/Crypto/testsuite/TestSuite_vs170.vcxproj index 912cf48a5..0cb17b77c 100644 --- a/Crypto/testsuite/TestSuite_vs170.vcxproj +++ b/Crypto/testsuite/TestSuite_vs170.vcxproj @@ -1,6 +1,10 @@ + + debug_shared + ARM64 + debug_shared Win32 @@ -9,6 +13,10 @@ debug_shared x64 + + debug_static_md + ARM64 + debug_static_md Win32 @@ -17,6 +25,10 @@ debug_static_md x64 + + debug_static_mt + ARM64 + debug_static_mt Win32 @@ -25,6 +37,10 @@ debug_static_mt x64 + + release_shared + ARM64 + release_shared Win32 @@ -33,6 +49,10 @@ release_shared x64 + + release_static_md + ARM64 + release_static_md Win32 @@ -41,6 +61,10 @@ release_static_md x64 + + release_static_mt + ARM64 + release_static_mt Win32 @@ -87,6 +111,36 @@ MultiByte v143 + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + + + Application + MultiByte + v143 + Application MultiByte @@ -137,6 +191,24 @@ + + + + + + + + + + + + + + + + + + @@ -157,7 +229,7 @@ - <_ProjectFileVersion>15.0.28127.55 + <_ProjectFileVersion>16.0.32629.160 TestSuited TestSuited TestSuited @@ -177,6 +249,36 @@ TestSuite TestSuite + + binA64\ + objA64\TestSuite\$(Configuration)\ + true + + + binA64\ + objA64\TestSuite\$(Configuration)\ + false + + + binA64\static_mt\ + objA64\TestSuite\$(Configuration)\ + true + + + binA64\static_mt\ + objA64\TestSuite\$(Configuration)\ + false + + + binA64\static_md\ + objA64\TestSuite\$(Configuration)\ + true + + + binA64\static_md\ + objA64\TestSuite\$(Configuration)\ + false + bin\ obj\TestSuite\$(Configuration)\ @@ -237,6 +339,189 @@ obj64\TestSuite\$(Configuration)\ false + + + Disabled + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + true + + + CppUnitd.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\TestSuited.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + true + true + binA64\TestSuited.pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + true + + + CppUnit.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\TestSuite.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebug + true + true + true + true + + Level3 + ProgramDatabase + Default + true + + + CppUnitmtd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + binA64\static_mt\TestSuited.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + true + true + binA64\static_mt\TestSuited.pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreaded + false + true + true + true + + Level3 + + Default + true + + + CppUnitmt.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;Crypt32.lib;%(AdditionalDependencies) + binA64\static_mt\TestSuite.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + + + + Disabled + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;_DEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + EnableFastChecks + MultiThreadedDebugDLL + true + true + true + true + + Level3 + ProgramDatabase + Default + true + + + CppUnitmdd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\TestSuited.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + true + true + binA64\static_md\TestSuited.pdb + Console + MachineARM64 + + + + + MaxSpeed + OnlyExplicitInline + true + Speed + true + ..\include;..\..\CppUnit\include;..\..\Foundation\include;%(AdditionalIncludeDirectories) + WIN32;NDEBUG;_WINDOWS;WINVER=0x0600;POCO_STATIC;_CRT_SECURE_NO_WARNINGS;%(PreprocessorDefinitions) + true + MultiThreadedDLL + false + true + true + true + + Level3 + + Default + true + + + CppUnitmd.lib;iphlpapi.lib;winmm.lib;ws2_32.lib;iphlpapi.lib;%(AdditionalDependencies) + binA64\static_md\TestSuite.exe + ..\..\libA64;%(AdditionalLibraryDirectories) + false + Console + true + true + MachineARM64 + + Disabled diff --git a/Crypto/testsuite/TestSuite_vs170.vcxproj.filters b/Crypto/testsuite/TestSuite_vs170.vcxproj.filters index f28f21f73..ffa5b9bc9 100644 --- a/Crypto/testsuite/TestSuite_vs170.vcxproj.filters +++ b/Crypto/testsuite/TestSuite_vs170.vcxproj.filters @@ -2,28 +2,28 @@ - {14a92b17-ccd2-41af-91c5-8d8028d7f001} + {acf5407e-78f8-481f-aede-24ca7504422d} - {81e2f3da-1bb6-458c-b2e3-294772042110} + {ed75d974-1e6e-4d97-83fb-7111122dba8b} - {814664db-96c2-4d3d-8392-d1200eda6f75} + {0271bc10-a0c8-408a-8b2b-64e557c63f32} - {47d2f389-1744-4a41-ae50-b743870298c2} + {30319608-5ad4-43c1-af6e-84729e9e9aa6} - {25457524-6b58-4e6a-883f-dcc38cfba1c0} + {aa5fc0e5-cee3-4f44-8a6a-7f64fbbda341} - {bc6f72f9-c09b-4a5f-8215-9fde66436a47} + {d2e3ae91-4bc3-4259-ab5d-9bc19d47d37c} - {18987f34-e726-48c2-8436-41837a46e87c} + {9e497b70-abc5-4962-8853-36eb7d61b4ba} - {0250e776-8f04-4d59-8ac5-fdffb431e39b} + {d16fc517-f3ee-4181-acac-c11efb90d9e8}