diff --git a/change/react-native-windows-9e6d1974-bb89-4edb-8898-662918068e7d.json b/change/react-native-windows-9e6d1974-bb89-4edb-8898-662918068e7d.json new file mode 100644 index 00000000000..5831c34f1dd --- /dev/null +++ b/change/react-native-windows-9e6d1974-bb89-4edb-8898-662918068e7d.json @@ -0,0 +1,7 @@ +{ + "type": "prerelease", + "comment": "Remove dependency ReactWindows.OpenSSL.StdCall.Static", + "packageName": "react-native-windows", + "email": "julio.rocha@microsoft.com", + "dependentChangeType": "patch" +} diff --git a/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json b/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json index 9f043abef17..2bc8e4de21e 100644 --- a/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json +++ b/packages/e2e-test-app/windows/RNTesterApp/packages.lock.json @@ -12,7 +12,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -53,7 +53,7 @@ "Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.12-rel-31116-00", - "contentHash": "91INue1M3Zap/S6yaglXMEq1UvirknZmzwFZiP0fs3Su5MhWUEJoBJK3BsPsiImnII2NGhrYKrJd+QW7zfClyA==", + "contentHash": "DuANSYEBO7qcIeqzI1mShJMweuQVBycbCRUW6mIb1QxorSiWLSWEJZNv/X7TdW3dcjfZdZFVsEWDCnJUolIPrQ==", "dependencies": { "runtime.win10-arm.Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", "runtime.win10-arm64.Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -64,7 +64,7 @@ "Microsoft.Net.UWPCoreRuntimeSdk": { "type": "Transitive", "resolved": "2.2.14", - "contentHash": "qPR/lie8X3I82ZnZbdqyl27Z/J9mJapSEbnz7CX4kGgc5LNwjoLlUnaQjilDQsTcYfmSg8EcvcLJy9mBSY+GVA==", + "contentHash": "THMsLyB29wqd9ZI9c05hoMb788QQ5ClsXwLjpt7omTk/OvtUERWgwD6q85s5aSMdze50uhPZDRF/+uju8Lqhgw==", "dependencies": { "runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk": "2.2.14", "runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk": "2.2.14", @@ -74,7 +74,7 @@ "Microsoft.NETCore.Platforms": { "type": "Transitive", "resolved": "2.1.0", - "contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ==" + "contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA==" }, "Microsoft.SourceLink.Common": { "type": "Transitive", @@ -98,7 +98,7 @@ "NETStandard.Library": { "type": "Transitive", "resolved": "2.0.3", - "contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==", + "contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", "dependencies": { "Microsoft.NETCore.Platforms": "1.1.0" } @@ -106,7 +106,7 @@ "runtime.win10-arm.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.12-rel-31116-00", - "contentHash": "s2CrbBYdAZa9aR4dlq2sOfJrRf4uOZHgEYGmWyxW4mz+//0vlGSJxUYAiKUotMwa4+fu+PAh2ANKRdU9o06C3w==", + "contentHash": "JAieAWjpAsAKq2OLgJpKHafrk1gxHTq0nSie1sEKAYjnlBhVIx17ypAX1NLhjMJZ3TkqhktOGm/2r0qTXBAqWg==", "dependencies": { "runtime.win10-arm.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00" } @@ -114,17 +114,17 @@ "runtime.win10-arm.Microsoft.Net.Native.SharedLibrary": { "type": "Transitive", "resolved": "2.2.8-rel-31116-00", - "contentHash": "3F8B17d60HssS/BBlmRs4X8TuvOVRRQjSP8uOhTweZS1ZsmlreKqV9YPXwyN0kpu32StTdqYIt1i9vV4nZZoOQ==" + "contentHash": "bdNrkqMK7TUyqJjMJj9sXFpTtJg5+cKmGTPERymWldQ7/OxzoA1VGV4nFFRS4ciycxIqoA9amP0sr5SdTaSjDg==" }, "runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk": { "type": "Transitive", "resolved": "2.2.14", - "contentHash": "gr1abg5qNrM14Ng9NTFuzY/A3BLDQFfWrKgjmzr6AlhUsq/QZ7Hny62rLZ3ONVHSN0Bo0QuwKe2KLmBTLTyItg==" + "contentHash": "eEtdvL57LKF3/AKuSqk9bJeUaPm0rPMCs36halkQwyTsaykEwzaV634jxpsg9Oneru4DvFW1vlRISdiW2929jA==" }, "runtime.win10-arm64.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.12-rel-31116-00", - "contentHash": "ELSl50UCnJSPeSfwRnXe4S+Ito58dpWhm6pEyxtIMiiuLcJsfr7rTxPR05Pijta5ru4KZu0or5PUePjGgKyC2A==", + "contentHash": "Rs9fywhVdnJTqegZnSXJ2v0w7oX3xyZ5P1+v9wNlm7mkSb+dEcxgXwrkqTJe9shmLUOOFz8Dm37LbtIPHNzR1A==", "dependencies": { "runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00" } @@ -132,12 +132,12 @@ "runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary": { "type": "Transitive", "resolved": "2.2.8-rel-31116-00", - "contentHash": "mkSKguVkHl8W7/uS8SgXz5t7aI4QvF7BPd+WzcdOdMU5g/gnXmcWZAlSr1RrSTjTS1P3sxOE15XMFJs0nPCI8w==" + "contentHash": "mNZPhhxOKUQSgYuBDezHPYFMwP9LYDmVEEHl7bTVAPbfcnxPHdSv6WwJglYlwQRQh+3NSgYRW4WcTxpETkD0AA==" }, "runtime.win10-x64.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.12-rel-31116-00", - "contentHash": "ZRYTWtC+lManfqDHmIpqlv/UG6nQfn4URqMEmoc1k/DI1pMBo4jCov5VoFIGHHd1/AXXsK6Hdd2TDbexH0PozQ==", + "contentHash": "dAJj40m9Tm6AQ/P7iQxuEN8sVvj6v9TDyulcP7ayvp+FkpR8VyGZWJMSxaMEjr1qVeMRuMCv1JV5DLMCWZvisg==", "dependencies": { "runtime.win10-x64.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00" } @@ -145,17 +145,17 @@ "runtime.win10-x64.Microsoft.Net.Native.SharedLibrary": { "type": "Transitive", "resolved": "2.2.8-rel-31116-00", - "contentHash": "pt7vQLpa95Cpif7oHXkLPsvcJ6tfdc8bvOxiJzjXlTTOjefsX4xmkSU+buuu/KbE8YDs1VEyxu0zcjpIMuVkmQ==" + "contentHash": "kXqhwE+XmgRn9Z1QWkGfIcDKg/pCLJcbRL5w8NWT6jliAx81sjHzquDut3ljPwOC856AUI2WMnBopu0Bf/m4BQ==" }, "runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk": { "type": "Transitive", "resolved": "2.2.14", - "contentHash": "LQ+8pXMZVsd1yEzcYHZvSKTbjjnLZYj5tWCOAOcgzF9ojX8+geT35rAcndhCRJAeAvARgv9/7yapnK86UPzpyQ==" + "contentHash": "a/ONxs2DxZcBnlDo7LDtH4t6imrEuSbf9KxWWBUCP+yCquVFyqtWAt2Z4hiT++yOIz2OMZT9Hmv1VzrgecpQkQ==" }, "runtime.win10-x86.Microsoft.Net.Native.Compiler": { "type": "Transitive", "resolved": "2.2.12-rel-31116-00", - "contentHash": "hVlpnwSdqYizm+nigl3t3/fVd/D0COJ4doLJIa66GkNmPSL5VeHCPAynZi+oO9rqCFKDX+Tmbn+NO9zygWJB/A==", + "contentHash": "9T8n/l5Ny4rOlL4yGs81wy4AzypMhUgrrtPBqlv46QbKWhHf44EpFKfI6JU+MkJbSh7mZYywBEfmivT0v6gnNA==", "dependencies": { "runtime.win10-x86.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00" } @@ -163,12 +163,12 @@ "runtime.win10-x86.Microsoft.Net.Native.SharedLibrary": { "type": "Transitive", "resolved": "2.2.8-rel-31116-00", - "contentHash": "A7J5S5ZZZCXexFp6xXG2CaMwZPSahpPdorzx6VbWJzfHDU0x1VvulYd8hSfi/KtJ/fG0tr8mpdnT7NZsrXP7+g==" + "contentHash": "5RGA27cl3z0lf9zsctLBjW2GQoGYeBrg8pesqWLQnb1Ch8q8IZ6pyOwWFUsnXGuYW59OyCfoQGzHFq5Q/73EiQ==" }, "runtime.win10-x86.Microsoft.Net.UWPCoreRuntimeSdk": { "type": "Transitive", "resolved": "2.2.14", - "contentHash": "3JRNswnc8LnxAofuv5hq9iRAnZ49w2J5DK/JaLL2uSFRRnaCS9atpXBG+EdpbJHyJxRxDPslkRLkH5ZUOIaCwQ==" + "contentHash": "V/hZioMMAwoKZFmfq/SuMA/mfoNFu4+Aedwdld/tpL8ZheehFab0RlAR3pgsPgOWOU+GjyePNIgyUXM5J/Y3Ig==" }, "automationchannel": { "type": "Project", @@ -240,7 +240,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -257,7 +257,7 @@ "runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "PXwPeV73TQGLoREzwlZd/FT/xxb3tV6OpjRQdymOPJfMQme/ST9sX3OZAmmIUdio1LaWnNbB600Vtg2XvRItzw==" + "contentHash": "TKCMvB+6izAQSl7kWimKU2W9iN7gXSMc1Lah3dpY+/PuUjAfSNvfv2HW/mK3TdmjW631/4S9wWYmplLh6ao91w==" } }, "UAP,Version=v10.0.17763/win10-arm-aot": { @@ -265,7 +265,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -282,7 +282,7 @@ "runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "+CthZPP4ssmK5j7NC0S+nqvjJkL0qZ3Z5E272Bhl44GT1qPJzt/jL1rkeA2y2+Qy5YAWe5SRoOhbTzmK1hzxwA==" + "contentHash": "4/GjCV7KtJz7is13eUXxIj4AHn8WTqmQ1u6wx7J4piJYkwViMVz0sGvzwXDt5oSSTvVdsDpa/EQUUBtFyGnmbg==" } }, "UAP,Version=v10.0.17763/win10-arm64-aot": { @@ -290,7 +290,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -307,7 +307,7 @@ "runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "evExmzlwZuWfzNvu+HAKQ8sWg5BKqWqvShpFPs6V72s78BzC+8Wl6T+H0rmuF3fZ+W6yhlM8dfusaj+w9D0GhA==" + "contentHash": "8QVHVgSh8G9BgNUPaMllx5f8iEM45a52eCooJAQH1Xq+MfnvVXcmpOVmMRLxwY2dRU77ZoiGRCyeAKwqFcnEYQ==" } }, "UAP,Version=v10.0.17763/win10-x64": { @@ -315,7 +315,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -332,7 +332,7 @@ "runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "snth4i/ok+LqSSqK5tLVFSbe8RDzIvfJabMXMPoYI+NQCi91mR+7tsTHk3gNEojuZT0i4g1EaFrIwqaW9bmEYA==" + "contentHash": "SPmQotZQ5ty+UkHMm76k/0DJpZ663qwXvLjVw/LrNmaIQHa+g+6TjKNAyR0ondKnwqu5oT79RJ2Tk8A0JQqBPQ==" } }, "UAP,Version=v10.0.17763/win10-x64-aot": { @@ -340,7 +340,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -357,7 +357,7 @@ "runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "/aFe5hqDpWSiGwM71GI9z6PLa+bxddXmuMWLZ3yVSv2nAJi50WtStB/RnLdXasTNH4JtYpWjQ1tT/fpwRNvFTQ==" + "contentHash": "2SPw1ay04TYxrnMs2hxP86j3daB59cnQ8aNPXUcKyon+RA1MN99mWg8V93WDxD82ZDR+citKcM3dxS4oEtDI4g==" } }, "UAP,Version=v10.0.17763/win10-x86": { @@ -365,7 +365,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -382,7 +382,7 @@ "runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "GaJmbZkhVAMCNvDSshqXzpTxWPKhENV+Q6A/Z7/lYeywczdCSlExJo+1aJ8/eh9bwKhxRvIj3OZH4JsQsYpRaA==" + "contentHash": "twbdvWFcy0wRd/jiZWeiS6Edui76XwmRLHXLJ3uFpBsimu7XOTLJBMycG11MxdcAjFMa3LnPUkTgiI63wM1b+w==" } }, "UAP,Version=v10.0.17763/win10-x86-aot": { @@ -390,7 +390,7 @@ "type": "Direct", "requested": "[6.2.14, )", "resolved": "6.2.14", - "contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==", + "contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==", "dependencies": { "Microsoft.NETCore.Platforms": "2.1.0", "Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00", @@ -407,7 +407,7 @@ "runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": { "type": "Transitive", "resolved": "6.2.14", - "contentHash": "Z8Y39jw4fACg2/spREHZp2Edeay/nv2ZCXpk9IE1C7QwLSe7lQ6B05Lpq84fFCwwV+z6NiAPIdivj03LLEGv7A==" + "contentHash": "3nklK7zt8pQ4/okXv4jA/HlUx/xmnyS/YRKJh19BzXKKhYk/EnRT1zoNcvQDJjhyUZXquffbcxHyBbjd2V2GNQ==" } } } diff --git a/vnext/Desktop.IntegrationTests/HttpOriginPolicyIntegrationTest.cpp b/vnext/Desktop.IntegrationTests/HttpOriginPolicyIntegrationTest.cpp index b6855e6e51a..c6c16b2644b 100644 --- a/vnext/Desktop.IntegrationTests/HttpOriginPolicyIntegrationTest.cpp +++ b/vnext/Desktop.IntegrationTests/HttpOriginPolicyIntegrationTest.cpp @@ -6,11 +6,12 @@ #include #include #include -#include // Standard Library #include +#include "HttpServer.h" + using namespace Microsoft::VisualStudio::CppUnitTestFramework; namespace http = boost::beast::http; @@ -110,7 +111,7 @@ TEST_CLASS(HttpOriginPolicyIntegrationTest) case http::verb::options: default: - Assert::Fail(L"Unsupported request method"); + Assert::Fail(L"Unsupported request method"); } return server; diff --git a/vnext/Desktop.IntegrationTests/HttpResourceIntegrationTests.cpp b/vnext/Desktop.IntegrationTests/HttpResourceIntegrationTests.cpp index 1037575f885..c20c173e86e 100644 --- a/vnext/Desktop.IntegrationTests/HttpResourceIntegrationTests.cpp +++ b/vnext/Desktop.IntegrationTests/HttpResourceIntegrationTests.cpp @@ -9,7 +9,6 @@ #include #include #include -#include #include // Boost Library @@ -18,6 +17,8 @@ // Standard Library #include +#include "HttpServer.h" + using namespace Microsoft::React; using namespace Microsoft::VisualStudio::CppUnitTestFramework; diff --git a/vnext/Test/HttpServer.cpp b/vnext/Desktop.IntegrationTests/HttpServer.cpp similarity index 98% rename from vnext/Test/HttpServer.cpp rename to vnext/Desktop.IntegrationTests/HttpServer.cpp index b08ccacf14b..32457be591a 100644 --- a/vnext/Test/HttpServer.cpp +++ b/vnext/Desktop.IntegrationTests/HttpServer.cpp @@ -1,4 +1,8 @@ // clang-format off + +// C4996: 'gethostbyaddr': Use getnameinfo() or GetNameInfoW() instead +#define _WINSOCK_DEPRECATED_NO_WARNINGS + #include "HttpServer.h" #include @@ -360,7 +364,7 @@ void HttpServer::Start() Accept(); m_ioThreads.reserve(m_ioThreadCount); - for (int i = 0; i < m_ioThreadCount; i++) + for (size_t i = 0; i < m_ioThreadCount; i++) { m_ioThreads.emplace_back([self = shared_from_this()]() { diff --git a/vnext/Test/HttpServer.h b/vnext/Desktop.IntegrationTests/HttpServer.h similarity index 100% rename from vnext/Test/HttpServer.h rename to vnext/Desktop.IntegrationTests/HttpServer.h diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 440b42dbd62..791e16c8519 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -115,13 +115,14 @@ + - + @@ -130,9 +131,6 @@ {700A84FD-F92A-43F1-8D06-B0E0745DF9B5} - - {cd0415c6-d908-4212-9481-49be41f58d27} - - - - - - - - - - - - false - - - - %(PreprocessorDefinitions) - %(AdditionalOptions) - - - Windows - %(AdditionalOptions) - %(AdditionalDependencies) - Use - pch.h - React.Windows.Desktop.Test.x86.def - React.Windows.Desktop.Test.$(Platform).def - - - - - - - - - {cd0415c6-d908-4212-9481-49be41f58d27} - - - - - - - - - - - - \ No newline at end of file diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj.filters b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj.filters deleted file mode 100644 index bac21ab293f..00000000000 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.DLL.vcxproj.filters +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - {de7ebe96-8afc-4363-a8ad-2b9ab24b8ed5} - - - {586b6325-c060-4f6a-ab1a-6223dacbb3e7} - - - - - Source Files - - - \ No newline at end of file diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x64.def b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x64.def deleted file mode 100644 index c6a00b7ff67..00000000000 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x64.def +++ /dev/null @@ -1,20 +0,0 @@ -EXPORTS - -; Microsoft::React::Test::WebSocketServer -??0WebSocketServer@Test@React@Microsoft@@QEAA@G_N@Z -??0WebSocketServer@Test@React@Microsoft@@QEAA@H_N@Z -?Accept@WebSocketServer@Test@React@Microsoft@@AEAAXXZ -?OnAccept@WebSocketServer@Test@React@Microsoft@@AEAAXVerror_code@system@boost@@V?$basic_stream_socket@Vtcp@ip@asio@boost@@Vany_io_executor@34@@asio@7@@Z -?SetMessageFactory@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6A?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@$$QEAV12@@Z@std@@@Z -?SetOnConnection@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXXZ@std@@@Z -?SetOnError@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AX$$QEAUError@IWebSocketResource@Networking@React@Microsoft@@@Z@std@@@Z -?SetOnHandshake@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXAEAV?$message@$0A@U?$basic_string_body@DU?$char_traits@D@std@@V?$allocator@D@2@@http@beast@boost@@V?$basic_fields@V?$allocator@D@std@@@234@@http@beast@boost@@@Z@std@@@Z -?SetOnMessage@WebSocketServer@Test@React@Microsoft@@QEAAX$$QEAV?$function@$$A6AXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z@std@@@Z -?Start@WebSocketServer@Test@React@Microsoft@@QEAAXXZ -?Stop@WebSocketServer@Test@React@Microsoft@@QEAAXXZ - -; Microsoft::React::Test::HttpServer -;TODO Update symbols - -; Free functions -?CreateStringResponseBody@Test@React@Microsoft@@YA?AV?$basic_multi_buffer@V?$allocator@D@std@@@beast@boost@@$$QEAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z diff --git a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x86.def b/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x86.def deleted file mode 100644 index f4d92183bb8..00000000000 --- a/vnext/Desktop.Test.DLL/React.Windows.Desktop.Test.x86.def +++ /dev/null @@ -1,19 +0,0 @@ -EXPORTS - -; Microsoft::React::Test::WebSocketServer -??0WebSocketServer@Test@React@Microsoft@@QAE@G_N@Z -??0WebSocketServer@Test@React@Microsoft@@QAE@H_N@Z -?Accept@WebSocketServer@Test@React@Microsoft@@AAEXXZ -?OnAccept@WebSocketServer@Test@React@Microsoft@@AAEXVerror_code@system@boost@@V?$basic_stream_socket@Vtcp@ip@asio@boost@@Vany_io_executor@34@@asio@7@@Z -?SetMessageFactory@WebSocketServer@Test@React@Microsoft@@QAEX$$QAV?$function@$$A6G?AV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@$$QAV12@@Z@std@@@Z -?SetOnConnection@WebSocketServer@Test@React@Microsoft@@QAEX$$QAV?$function@$$A6GXXZ@std@@@Z -?SetOnError@WebSocketServer@Test@React@Microsoft@@QAEX$$QAV?$function@$$A6GX$$QAUError@IWebSocketResource@Networking@React@Microsoft@@@Z@std@@@Z -?SetOnHandshake@WebSocketServer@Test@React@Microsoft@@QAEX$$QAV?$function@$$A6GXAAV?$message@$0A@U?$basic_string_body@DU?$char_traits@D@std@@V?$allocator@D@2@@http@beast@boost@@V?$basic_fields@V?$allocator@D@std@@@234@@http@beast@boost@@@Z@std@@@Z -?SetOnMessage@WebSocketServer@Test@React@Microsoft@@QAEX$$QAV?$function@$$A6GXV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z@std@@@Z -?Start@WebSocketServer@Test@React@Microsoft@@QAEXXZ -?Stop@WebSocketServer@Test@React@Microsoft@@QAEXXZ - -; Microsoft::React::Test::HttpServer - -; Free functions -?CreateStringResponseBody@Test@React@Microsoft@@YG?AV?$basic_multi_buffer@V?$allocator@D@std@@@beast@boost@@$$QAV?$basic_string@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@@Z diff --git a/vnext/Desktop.Test.DLL/packages.lock.json b/vnext/Desktop.Test.DLL/packages.lock.json deleted file mode 100644 index 35737179a96..00000000000 --- a/vnext/Desktop.Test.DLL/packages.lock.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "version": 1, - "dependencies": { - "native,Version=v0.0": { - "boost": { - "type": "Direct", - "requested": "[1.84.0, )", - "resolved": "1.84.0", - "contentHash": "4el2YP3cNJDVFPdzOso+LxGvdWP2rHxML4siq8VdonNypW2m4q503tHfCj6vK0L1UfxioE2hpFGb4ITEua73tg==" - }, - "ReactWindows.OpenSSL.StdCall.Static": { - "type": "Direct", - "requested": "[1.0.2-p.5, )", - "resolved": "1.0.2-p.5", - "contentHash": "1tAtFgtbVpI/JgRIxy9j30R/W6B1zi9dYt0o5QwAk5V3X2mo9xrrHcbXlbczKQIftYoNHe0Mfq9ExIu9A1Cs0g==" - }, - "react.windows.test": { - "type": "Project", - "dependencies": { - "ReactWindows.OpenSSL.StdCall.Static": "[1.0.2-p.5, )", - "boost": "[1.84.0, )" - } - } - } - } -} \ No newline at end of file diff --git a/vnext/Desktop.Test.DLL/pch.cpp b/vnext/Desktop.Test.DLL/pch.cpp deleted file mode 100644 index e69de29bb2d..00000000000 diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index f26b4e85808..5ed66e0608a 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -132,7 +132,6 @@ - diff --git a/vnext/Desktop.UnitTests/packages.experimentalwinui3.lock.json b/vnext/Desktop.UnitTests/packages.experimentalwinui3.lock.json index 245c8403ad5..3a07043129d 100644 --- a/vnext/Desktop.UnitTests/packages.experimentalwinui3.lock.json +++ b/vnext/Desktop.UnitTests/packages.experimentalwinui3.lock.json @@ -14,12 +14,6 @@ "resolved": "2.0.230706.1", "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ==" }, - "ReactWindows.OpenSSL.StdCall.Static": { - "type": "Direct", - "requested": "[1.0.2-p.5, )", - "resolved": "1.0.2-p.5", - "contentHash": "1tAtFgtbVpI/JgRIxy9j30R/W6B1zi9dYt0o5QwAk5V3X2mo9xrrHcbXlbczKQIftYoNHe0Mfq9ExIu9A1Cs0g==" - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", diff --git a/vnext/Desktop.UnitTests/packages.lock.json b/vnext/Desktop.UnitTests/packages.lock.json index c576ade58fd..27d963ee61c 100644 --- a/vnext/Desktop.UnitTests/packages.lock.json +++ b/vnext/Desktop.UnitTests/packages.lock.json @@ -14,12 +14,6 @@ "resolved": "2.0.230706.1", "contentHash": "l0D7oCw/5X+xIKHqZTi62TtV+1qeSz7KVluNFdrJ9hXsst4ghvqQ/Yhura7JqRdZWBXAuDS0G0KwALptdoxweQ==" }, - "ReactWindows.OpenSSL.StdCall.Static": { - "type": "Direct", - "requested": "[1.0.2-p.5, )", - "resolved": "1.0.2-p.5", - "contentHash": "1tAtFgtbVpI/JgRIxy9j30R/W6B1zi9dYt0o5QwAk5V3X2mo9xrrHcbXlbczKQIftYoNHe0Mfq9ExIu9A1Cs0g==" - }, "Microsoft.Build.Tasks.Git": { "type": "Transitive", "resolved": "1.1.1", diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 87c3b33978b..b849747507d 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.3.32929.385 +# Visual Studio Version 18 +VisualStudioVersion = 18.2.11415.280 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Folly", "Folly\Folly.vcxproj", "{A990658C-CE31-4BCC-976F-0FC6B1AF693D}" EndProject @@ -91,16 +91,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Folly", "Folly", "{41F31595 EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.ABITests", "Desktop.ABITests\React.Windows.Desktop.ABITests.vcxproj", "{44DCED9B-9C4C-48FE-8545-0930192BBC16}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Test", "Test\React.Windows.Test.vcxproj", "{CD0415C6-D908-4212-9481-49BE41F58D27}" - ProjectSection(ProjectDependencies) = postProject - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} = {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} - EndProjectSection -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "React.Windows.Desktop.Test.DLL", "Desktop.Test.DLL\React.Windows.Desktop.Test.DLL.vcxproj", "{473FE8E8-26DA-4B46-A7B3-7B4A758075D0}" - ProjectSection(ProjectDependencies) = postProject - {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} = {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} - EndProjectSection -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcxproj", "{FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}" @@ -277,34 +267,6 @@ Global {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x64.Build.0 = Release|x64 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.ActiveCfg = Release|Win32 {44DCED9B-9C4C-48FE-8545-0930192BBC16}.Release|x86.Build.0 = Release|Win32 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64.Build.0 = Debug|ARM64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.ActiveCfg = Debug|x64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x64.Build.0 = Debug|x64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.ActiveCfg = Debug|Win32 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Debug|x86.Build.0 = Debug|Win32 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64.ActiveCfg = Release|ARM64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64.Build.0 = Release|ARM64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.ActiveCfg = Release|x64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x64.Build.0 = Release|x64 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.ActiveCfg = Release|Win32 - {CD0415C6-D908-4212-9481-49BE41F58D27}.Release|x86.Build.0 = Release|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64.Build.0 = Debug|ARM64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.ActiveCfg = Debug|x64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x64.Build.0 = Debug|x64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.ActiveCfg = Debug|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Debug|x86.Build.0 = Debug|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.ActiveCfg = Release|ARM64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64.Build.0 = Release|ARM64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|ARM64EC.ActiveCfg = Release|ARM64EC - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.ActiveCfg = Release|x64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x64.Build.0 = Release|x64 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.ActiveCfg = Release|Win32 - {473FE8E8-26DA-4B46-A7B3-7B4A758075D0}.Release|x86.Build.0 = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.ActiveCfg = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64.Build.0 = Debug|ARM64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Debug|ARM64EC.ActiveCfg = Debug|ARM64EC diff --git a/vnext/Scripts/OfficeReact.Win32.nuspec b/vnext/Scripts/OfficeReact.Win32.nuspec index 9ea60a4f687..58f3847b682 100644 --- a/vnext/Scripts/OfficeReact.Win32.nuspec +++ b/vnext/Scripts/OfficeReact.Win32.nuspec @@ -15,60 +15,60 @@ - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - - - - + + + + - + - + - + - + \ No newline at end of file diff --git a/vnext/Scripts/OpenSSL.nuspec b/vnext/Scripts/OpenSSL.nuspec deleted file mode 100644 index 6076c4173b2..00000000000 --- a/vnext/Scripts/OpenSSL.nuspec +++ /dev/null @@ -1,39 +0,0 @@ - - - - $id$ - $version$ - OpenSSL for Windows Desktop - Static Library. - Microsoft - https://www.openssl.org - false - - - - - - - OpenSSL - - - - - - - - - - - - - - - - - - - - - - - diff --git a/vnext/Scripts/OpenSSL.targets b/vnext/Scripts/OpenSSL.targets deleted file mode 100644 index 444fe3b9bf6..00000000000 --- a/vnext/Scripts/OpenSSL.targets +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - $(MSBuildThisFileDirectory)..\..\include\$(Platform); - %(AdditionalIncludeDirectories) - - - $(MSBuildThisFileDirectory)..\..\include\x86; - %(AdditionalIncludeDirectories) - - - - - $(MSBuildThisFileDirectory)..\..\lib\win8-$(Platform)\$(Configuration); - %(AdditionalLibraryDirectories) - - - $(MSBuildThisFileDirectory)..\..\lib\win8-x86\$(Configuration); - %(AdditionalLibraryDirectories) - - - - libeay32.lib; - ssleay32.lib; - Crypt32.lib; - %(AdditionalDependencies) - - - - \ No newline at end of file diff --git a/vnext/Scripts/Tfs/Layout-Desktop-Headers.ps1 b/vnext/Scripts/Tfs/Layout-Desktop-Headers.ps1 index 7616b687d49..66b474ab21d 100644 --- a/vnext/Scripts/Tfs/Layout-Desktop-Headers.ps1 +++ b/vnext/Scripts/Tfs/Layout-Desktop-Headers.ps1 @@ -5,7 +5,7 @@ param( [string] $SourceRoot = ($PSScriptRoot | Split-Path | Split-Path | Split-Path), [string] $TargetRoot = "$SourceRoot\vnext\target", [System.IO.DirectoryInfo] $ReactWindowsRoot = "$SourceRoot\vnext", - [System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native", + [System.IO.DirectoryInfo] $ReactNativeRoot = "$SourceRoot\node_modules\react-native", [string[]] $Extensions = ('h', 'hpp', 'def') ) @@ -111,20 +111,6 @@ Get-ChildItem -Path $ReactWindowsRoot\Desktop.DLL -Recurse -Include '*.def' | Fo -Force } -# React.Windows.Test headers -Get-ChildItem -Path $ReactWindowsRoot\Test -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` - -Path $ReactWindowsRoot\Test\$_ ` - -Destination (New-Item -ItemType Directory $TargetRoot\inc\Test\$(Split-Path $_) -Force) ` - -Force -} - -# React.Windows.Test DLL DEF files -Get-ChildItem -Path $ReactWindowsRoot\Desktop.Test.DLL -Name -Recurse -Include $patterns | ForEach-Object { Copy-Item ` - -Path $ReactWindowsRoot\Desktop.Test.DLL\$_ ` - -Destination (New-Item -ItemType Directory $TargetRoot\inc\$(Split-Path $_) -Force) ` - -Force -} - # include headers Copy-Item -Force -Recurse -Path $ReactWindowsRoot\include -Destination $TargetRoot\inc diff --git a/vnext/Shared/Shared.vcxitems.filters b/vnext/Shared/Shared.vcxitems.filters index 9c87986d60d..e034cfd9bc0 100644 --- a/vnext/Shared/Shared.vcxitems.filters +++ b/vnext/Shared/Shared.vcxitems.filters @@ -292,7 +292,6 @@ - @@ -305,7 +304,6 @@ - diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj deleted file mode 100644 index 7381ec7a987..00000000000 --- a/vnext/Test/React.Windows.Test.vcxproj +++ /dev/null @@ -1,93 +0,0 @@ - - - - {CD0415C6-D908-4212-9481-49BE41F58D27} - StaticLibrary - - - - - - Debug - ARM64 - - - Debug - ARM64EC - - - Debug - x64 - - - Release - ARM64 - - - Release - ARM64EC - - - Release - x64 - - - Debug - Win32 - - - Release - Win32 - - - - StaticLibrary - - - - - - - - - - - - - $(ReactNativeWindowsDir)Shared;$(IncludePath) - - - - - %(AdditionalOptions) - /bigobj - - NotUsing - - - BOOST_ASIO_HAS_IOCP; - _WIN32_WINNT=$(WinVer); - %(PreprocessorDefinitions) - - - - false - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/vnext/Test/React.Windows.Test.vcxproj.filters b/vnext/Test/React.Windows.Test.vcxproj.filters deleted file mode 100644 index 8b6094b9506..00000000000 --- a/vnext/Test/React.Windows.Test.vcxproj.filters +++ /dev/null @@ -1,30 +0,0 @@ - - - - - {bdc1e148-e9fb-46a5-83c5-8d7436c3ad0c} - - - {1c69d5ed-7fe5-444e-8452-7e9ed50ab9e9} - - - {dac5bb6d-4c23-4b2c-af6c-4713f88980c0} - - - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - \ No newline at end of file diff --git a/vnext/Test/packages.lock.json b/vnext/Test/packages.lock.json deleted file mode 100644 index a4d65c1e2ae..00000000000 --- a/vnext/Test/packages.lock.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "version": 1, - "dependencies": { - "native,Version=v0.0": { - "boost": { - "type": "Direct", - "requested": "[1.84.0, )", - "resolved": "1.84.0", - "contentHash": "4el2YP3cNJDVFPdzOso+LxGvdWP2rHxML4siq8VdonNypW2m4q503tHfCj6vK0L1UfxioE2hpFGb4ITEua73tg==" - }, - "ReactWindows.OpenSSL.StdCall.Static": { - "type": "Direct", - "requested": "[1.0.2-p.5, )", - "resolved": "1.0.2-p.5", - "contentHash": "1tAtFgtbVpI/JgRIxy9j30R/W6B1zi9dYt0o5QwAk5V3X2mo9xrrHcbXlbczKQIftYoNHe0Mfq9ExIu9A1Cs0g==" - } - }, - "native,Version=v0.0/win": {}, - "native,Version=v0.0/win-arm64": {}, - "native,Version=v0.0/win-x64": {}, - "native,Version=v0.0/win-x86": {} - } -} \ No newline at end of file diff --git a/vnext/TestWebSite/Microsoft/React/WebSocketTests.cs b/vnext/TestWebSite/Microsoft/React/WebSocketTests.cs index 4061a476f92..724af9bc75b 100644 --- a/vnext/TestWebSite/Microsoft/React/WebSocketTests.cs +++ b/vnext/TestWebSite/Microsoft/React/WebSocketTests.cs @@ -33,6 +33,31 @@ public static async Task Echo(HttpContext context) } } + public static async Task EchoBinary(HttpContext context) + { + var ws = await context.WebSockets.AcceptWebSocketAsync(); + wsConnections.Add(ws); + + while (true) + { + if (ws.State == WebSocketState.Closed || + ws.State == WebSocketState.CloseSent || + ws.State == WebSocketState.CloseReceived || + ws.State == WebSocketState.Aborted) + break; + + if (ws.State != WebSocketState.Open) + continue; + + var incomingMessage = await WebSocketUtils.ReceiveStringAsync(ws); + await Console.Out.WriteLineAsync($"Message received: [{incomingMessage}]"); + + var outgoingBytes = Encoding.UTF8.GetBytes(incomingMessage); + + await ws.SendAsync(outgoingBytes, WebSocketMessageType.Binary, true, CancellationToken.None); + } + } + public static async Task EchoSuffix(HttpContext context) { var announcement = @"This will send each incoming message back, with the string '_response' appended."; diff --git a/vnext/TestWebSite/Program.cs b/vnext/TestWebSite/Program.cs index ef80f6b735f..f0267f57a08 100644 --- a/vnext/TestWebSite/Program.cs +++ b/vnext/TestWebSite/Program.cs @@ -70,6 +70,11 @@ async Task DefaultRequestDelegate(HttpContext context) Microsoft.React.Test.WebSocketTests.Echo ); +app.Map( + "/rnw/websockets/echobinary", + Microsoft.React.Test.WebSocketTests.EchoBinary + ); + app.Map( "/rnw/websockets/echosuffix", Microsoft.React.Test.WebSocketTests.EchoSuffix