Skip to content

Commit 9d914f4

Browse files
JunielKatarnJunielKatarn
authored
Remove OpenSSL dependency (#15606) (#15976)
* Format filters * Remove dependency ReactWindows.OpenSSL.StdCall.Static * Remove React.Windows.Test from Desktop solution * Add EchoBinary web endpoint * Move web servers to Desktop.IntegrationTests * Remove SecureWebSocketSession * Delete WebSocketResourcePerformanceTests.cpp * Remove React.Windows.Desktop.Test.DLL from solution * Update in-proc server references * Delete vnext/{Desktop.Test.DLL,Test} * Delete OpenSSL NUSPEC * Change files
1 parent 4fe9ff0 commit 9d914f4

35 files changed

Lines changed: 151 additions & 892 deletions

‎change/react-native-windows-9e6d1974-bb89-4edb-8898-662918068e7d.json‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"type": "prerelease",
3+
"comment": "Remove dependency ReactWindows.OpenSSL.StdCall.Static",
4+
"packageName": "react-native-windows",
5+
"email": "julio.rocha@microsoft.com",
6+
"dependentChangeType": "patch"
7+
}

‎packages/e2e-test-app/windows/RNTesterApp/packages.lock.json‎

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"type": "Direct",
1313
"requested": "[6.2.14, )",
1414
"resolved": "6.2.14",
15-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
15+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
1616
"dependencies": {
1717
"Microsoft.NETCore.Platforms": "2.1.0",
1818
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -53,7 +53,7 @@
5353
"Microsoft.Net.Native.Compiler": {
5454
"type": "Transitive",
5555
"resolved": "2.2.12-rel-31116-00",
56-
"contentHash": "91INue1M3Zap/S6yaglXMEq1UvirknZmzwFZiP0fs3Su5MhWUEJoBJK3BsPsiImnII2NGhrYKrJd+QW7zfClyA==",
56+
"contentHash": "DuANSYEBO7qcIeqzI1mShJMweuQVBycbCRUW6mIb1QxorSiWLSWEJZNv/X7TdW3dcjfZdZFVsEWDCnJUolIPrQ==",
5757
"dependencies": {
5858
"runtime.win10-arm.Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
5959
"runtime.win10-arm64.Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -64,7 +64,7 @@
6464
"Microsoft.Net.UWPCoreRuntimeSdk": {
6565
"type": "Transitive",
6666
"resolved": "2.2.14",
67-
"contentHash": "qPR/lie8X3I82ZnZbdqyl27Z/J9mJapSEbnz7CX4kGgc5LNwjoLlUnaQjilDQsTcYfmSg8EcvcLJy9mBSY+GVA==",
67+
"contentHash": "THMsLyB29wqd9ZI9c05hoMb788QQ5ClsXwLjpt7omTk/OvtUERWgwD6q85s5aSMdze50uhPZDRF/+uju8Lqhgw==",
6868
"dependencies": {
6969
"runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk": "2.2.14",
7070
"runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk": "2.2.14",
@@ -74,7 +74,7 @@
7474
"Microsoft.NETCore.Platforms": {
7575
"type": "Transitive",
7676
"resolved": "2.1.0",
77-
"contentHash": "GmkKfoyerqmsHMn7OZj0AKpcBabD+GaafqphvX2Mw406IwiJRy1pKcKqdCfKJfYmkRyJ6+e+RaUylgdJoDa1jQ=="
77+
"contentHash": "ok+RPAtESz/9MUXeIEz6Lv5XAGQsaNmEYXMsgVALj4D7kqC8gveKWXWXbufLySR2fWrwZf8smyN5RmHu0e4BHA=="
7878
},
7979
"Microsoft.SourceLink.Common": {
8080
"type": "Transitive",
@@ -98,77 +98,77 @@
9898
"NETStandard.Library": {
9999
"type": "Transitive",
100100
"resolved": "2.0.3",
101-
"contentHash": "548M6mnBSJWxsIlkQHfbzoYxpiYFXZZSL00p4GHYv8PkiqFBnnT68mW5mGEsA/ch9fDO9GkPgkFQpWiXZN7mAQ==",
101+
"contentHash": "st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==",
102102
"dependencies": {
103103
"Microsoft.NETCore.Platforms": "1.1.0"
104104
}
105105
},
106106
"runtime.win10-arm.Microsoft.Net.Native.Compiler": {
107107
"type": "Transitive",
108108
"resolved": "2.2.12-rel-31116-00",
109-
"contentHash": "s2CrbBYdAZa9aR4dlq2sOfJrRf4uOZHgEYGmWyxW4mz+//0vlGSJxUYAiKUotMwa4+fu+PAh2ANKRdU9o06C3w==",
109+
"contentHash": "JAieAWjpAsAKq2OLgJpKHafrk1gxHTq0nSie1sEKAYjnlBhVIx17ypAX1NLhjMJZ3TkqhktOGm/2r0qTXBAqWg==",
110110
"dependencies": {
111111
"runtime.win10-arm.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00"
112112
}
113113
},
114114
"runtime.win10-arm.Microsoft.Net.Native.SharedLibrary": {
115115
"type": "Transitive",
116116
"resolved": "2.2.8-rel-31116-00",
117-
"contentHash": "3F8B17d60HssS/BBlmRs4X8TuvOVRRQjSP8uOhTweZS1ZsmlreKqV9YPXwyN0kpu32StTdqYIt1i9vV4nZZoOQ=="
117+
"contentHash": "bdNrkqMK7TUyqJjMJj9sXFpTtJg5+cKmGTPERymWldQ7/OxzoA1VGV4nFFRS4ciycxIqoA9amP0sr5SdTaSjDg=="
118118
},
119119
"runtime.win10-arm.Microsoft.Net.UWPCoreRuntimeSdk": {
120120
"type": "Transitive",
121121
"resolved": "2.2.14",
122-
"contentHash": "gr1abg5qNrM14Ng9NTFuzY/A3BLDQFfWrKgjmzr6AlhUsq/QZ7Hny62rLZ3ONVHSN0Bo0QuwKe2KLmBTLTyItg=="
122+
"contentHash": "eEtdvL57LKF3/AKuSqk9bJeUaPm0rPMCs36halkQwyTsaykEwzaV634jxpsg9Oneru4DvFW1vlRISdiW2929jA=="
123123
},
124124
"runtime.win10-arm64.Microsoft.Net.Native.Compiler": {
125125
"type": "Transitive",
126126
"resolved": "2.2.12-rel-31116-00",
127-
"contentHash": "ELSl50UCnJSPeSfwRnXe4S+Ito58dpWhm6pEyxtIMiiuLcJsfr7rTxPR05Pijta5ru4KZu0or5PUePjGgKyC2A==",
127+
"contentHash": "Rs9fywhVdnJTqegZnSXJ2v0w7oX3xyZ5P1+v9wNlm7mkSb+dEcxgXwrkqTJe9shmLUOOFz8Dm37LbtIPHNzR1A==",
128128
"dependencies": {
129129
"runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00"
130130
}
131131
},
132132
"runtime.win10-arm64.Microsoft.Net.Native.SharedLibrary": {
133133
"type": "Transitive",
134134
"resolved": "2.2.8-rel-31116-00",
135-
"contentHash": "mkSKguVkHl8W7/uS8SgXz5t7aI4QvF7BPd+WzcdOdMU5g/gnXmcWZAlSr1RrSTjTS1P3sxOE15XMFJs0nPCI8w=="
135+
"contentHash": "mNZPhhxOKUQSgYuBDezHPYFMwP9LYDmVEEHl7bTVAPbfcnxPHdSv6WwJglYlwQRQh+3NSgYRW4WcTxpETkD0AA=="
136136
},
137137
"runtime.win10-x64.Microsoft.Net.Native.Compiler": {
138138
"type": "Transitive",
139139
"resolved": "2.2.12-rel-31116-00",
140-
"contentHash": "ZRYTWtC+lManfqDHmIpqlv/UG6nQfn4URqMEmoc1k/DI1pMBo4jCov5VoFIGHHd1/AXXsK6Hdd2TDbexH0PozQ==",
140+
"contentHash": "dAJj40m9Tm6AQ/P7iQxuEN8sVvj6v9TDyulcP7ayvp+FkpR8VyGZWJMSxaMEjr1qVeMRuMCv1JV5DLMCWZvisg==",
141141
"dependencies": {
142142
"runtime.win10-x64.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00"
143143
}
144144
},
145145
"runtime.win10-x64.Microsoft.Net.Native.SharedLibrary": {
146146
"type": "Transitive",
147147
"resolved": "2.2.8-rel-31116-00",
148-
"contentHash": "pt7vQLpa95Cpif7oHXkLPsvcJ6tfdc8bvOxiJzjXlTTOjefsX4xmkSU+buuu/KbE8YDs1VEyxu0zcjpIMuVkmQ=="
148+
"contentHash": "kXqhwE+XmgRn9Z1QWkGfIcDKg/pCLJcbRL5w8NWT6jliAx81sjHzquDut3ljPwOC856AUI2WMnBopu0Bf/m4BQ=="
149149
},
150150
"runtime.win10-x64.Microsoft.Net.UWPCoreRuntimeSdk": {
151151
"type": "Transitive",
152152
"resolved": "2.2.14",
153-
"contentHash": "LQ+8pXMZVsd1yEzcYHZvSKTbjjnLZYj5tWCOAOcgzF9ojX8+geT35rAcndhCRJAeAvARgv9/7yapnK86UPzpyQ=="
153+
"contentHash": "a/ONxs2DxZcBnlDo7LDtH4t6imrEuSbf9KxWWBUCP+yCquVFyqtWAt2Z4hiT++yOIz2OMZT9Hmv1VzrgecpQkQ=="
154154
},
155155
"runtime.win10-x86.Microsoft.Net.Native.Compiler": {
156156
"type": "Transitive",
157157
"resolved": "2.2.12-rel-31116-00",
158-
"contentHash": "hVlpnwSdqYizm+nigl3t3/fVd/D0COJ4doLJIa66GkNmPSL5VeHCPAynZi+oO9rqCFKDX+Tmbn+NO9zygWJB/A==",
158+
"contentHash": "9T8n/l5Ny4rOlL4yGs81wy4AzypMhUgrrtPBqlv46QbKWhHf44EpFKfI6JU+MkJbSh7mZYywBEfmivT0v6gnNA==",
159159
"dependencies": {
160160
"runtime.win10-x86.Microsoft.Net.Native.SharedLibrary": "2.2.8-rel-31116-00"
161161
}
162162
},
163163
"runtime.win10-x86.Microsoft.Net.Native.SharedLibrary": {
164164
"type": "Transitive",
165165
"resolved": "2.2.8-rel-31116-00",
166-
"contentHash": "A7J5S5ZZZCXexFp6xXG2CaMwZPSahpPdorzx6VbWJzfHDU0x1VvulYd8hSfi/KtJ/fG0tr8mpdnT7NZsrXP7+g=="
166+
"contentHash": "5RGA27cl3z0lf9zsctLBjW2GQoGYeBrg8pesqWLQnb1Ch8q8IZ6pyOwWFUsnXGuYW59OyCfoQGzHFq5Q/73EiQ=="
167167
},
168168
"runtime.win10-x86.Microsoft.Net.UWPCoreRuntimeSdk": {
169169
"type": "Transitive",
170170
"resolved": "2.2.14",
171-
"contentHash": "3JRNswnc8LnxAofuv5hq9iRAnZ49w2J5DK/JaLL2uSFRRnaCS9atpXBG+EdpbJHyJxRxDPslkRLkH5ZUOIaCwQ=="
171+
"contentHash": "V/hZioMMAwoKZFmfq/SuMA/mfoNFu4+Aedwdld/tpL8ZheehFab0RlAR3pgsPgOWOU+GjyePNIgyUXM5J/Y3Ig=="
172172
},
173173
"automationchannel": {
174174
"type": "Project",
@@ -240,7 +240,7 @@
240240
"type": "Direct",
241241
"requested": "[6.2.14, )",
242242
"resolved": "6.2.14",
243-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
243+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
244244
"dependencies": {
245245
"Microsoft.NETCore.Platforms": "2.1.0",
246246
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -257,15 +257,15 @@
257257
"runtime.win10-arm.Microsoft.NETCore.UniversalWindowsPlatform": {
258258
"type": "Transitive",
259259
"resolved": "6.2.14",
260-
"contentHash": "PXwPeV73TQGLoREzwlZd/FT/xxb3tV6OpjRQdymOPJfMQme/ST9sX3OZAmmIUdio1LaWnNbB600Vtg2XvRItzw=="
260+
"contentHash": "TKCMvB+6izAQSl7kWimKU2W9iN7gXSMc1Lah3dpY+/PuUjAfSNvfv2HW/mK3TdmjW631/4S9wWYmplLh6ao91w=="
261261
}
262262
},
263263
"UAP,Version=v10.0.17763/win10-arm-aot": {
264264
"Microsoft.NETCore.UniversalWindowsPlatform": {
265265
"type": "Direct",
266266
"requested": "[6.2.14, )",
267267
"resolved": "6.2.14",
268-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
268+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
269269
"dependencies": {
270270
"Microsoft.NETCore.Platforms": "2.1.0",
271271
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -282,15 +282,15 @@
282282
"runtime.win10-arm-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
283283
"type": "Transitive",
284284
"resolved": "6.2.14",
285-
"contentHash": "+CthZPP4ssmK5j7NC0S+nqvjJkL0qZ3Z5E272Bhl44GT1qPJzt/jL1rkeA2y2+Qy5YAWe5SRoOhbTzmK1hzxwA=="
285+
"contentHash": "4/GjCV7KtJz7is13eUXxIj4AHn8WTqmQ1u6wx7J4piJYkwViMVz0sGvzwXDt5oSSTvVdsDpa/EQUUBtFyGnmbg=="
286286
}
287287
},
288288
"UAP,Version=v10.0.17763/win10-arm64-aot": {
289289
"Microsoft.NETCore.UniversalWindowsPlatform": {
290290
"type": "Direct",
291291
"requested": "[6.2.14, )",
292292
"resolved": "6.2.14",
293-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
293+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
294294
"dependencies": {
295295
"Microsoft.NETCore.Platforms": "2.1.0",
296296
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -307,15 +307,15 @@
307307
"runtime.win10-arm64-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
308308
"type": "Transitive",
309309
"resolved": "6.2.14",
310-
"contentHash": "evExmzlwZuWfzNvu+HAKQ8sWg5BKqWqvShpFPs6V72s78BzC+8Wl6T+H0rmuF3fZ+W6yhlM8dfusaj+w9D0GhA=="
310+
"contentHash": "8QVHVgSh8G9BgNUPaMllx5f8iEM45a52eCooJAQH1Xq+MfnvVXcmpOVmMRLxwY2dRU77ZoiGRCyeAKwqFcnEYQ=="
311311
}
312312
},
313313
"UAP,Version=v10.0.17763/win10-x64": {
314314
"Microsoft.NETCore.UniversalWindowsPlatform": {
315315
"type": "Direct",
316316
"requested": "[6.2.14, )",
317317
"resolved": "6.2.14",
318-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
318+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
319319
"dependencies": {
320320
"Microsoft.NETCore.Platforms": "2.1.0",
321321
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -332,15 +332,15 @@
332332
"runtime.win10-x64.Microsoft.NETCore.UniversalWindowsPlatform": {
333333
"type": "Transitive",
334334
"resolved": "6.2.14",
335-
"contentHash": "snth4i/ok+LqSSqK5tLVFSbe8RDzIvfJabMXMPoYI+NQCi91mR+7tsTHk3gNEojuZT0i4g1EaFrIwqaW9bmEYA=="
335+
"contentHash": "SPmQotZQ5ty+UkHMm76k/0DJpZ663qwXvLjVw/LrNmaIQHa+g+6TjKNAyR0ondKnwqu5oT79RJ2Tk8A0JQqBPQ=="
336336
}
337337
},
338338
"UAP,Version=v10.0.17763/win10-x64-aot": {
339339
"Microsoft.NETCore.UniversalWindowsPlatform": {
340340
"type": "Direct",
341341
"requested": "[6.2.14, )",
342342
"resolved": "6.2.14",
343-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
343+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
344344
"dependencies": {
345345
"Microsoft.NETCore.Platforms": "2.1.0",
346346
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -357,15 +357,15 @@
357357
"runtime.win10-x64-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
358358
"type": "Transitive",
359359
"resolved": "6.2.14",
360-
"contentHash": "/aFe5hqDpWSiGwM71GI9z6PLa+bxddXmuMWLZ3yVSv2nAJi50WtStB/RnLdXasTNH4JtYpWjQ1tT/fpwRNvFTQ=="
360+
"contentHash": "2SPw1ay04TYxrnMs2hxP86j3daB59cnQ8aNPXUcKyon+RA1MN99mWg8V93WDxD82ZDR+citKcM3dxS4oEtDI4g=="
361361
}
362362
},
363363
"UAP,Version=v10.0.17763/win10-x86": {
364364
"Microsoft.NETCore.UniversalWindowsPlatform": {
365365
"type": "Direct",
366366
"requested": "[6.2.14, )",
367367
"resolved": "6.2.14",
368-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
368+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
369369
"dependencies": {
370370
"Microsoft.NETCore.Platforms": "2.1.0",
371371
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -382,15 +382,15 @@
382382
"runtime.win10-x86.Microsoft.NETCore.UniversalWindowsPlatform": {
383383
"type": "Transitive",
384384
"resolved": "6.2.14",
385-
"contentHash": "GaJmbZkhVAMCNvDSshqXzpTxWPKhENV+Q6A/Z7/lYeywczdCSlExJo+1aJ8/eh9bwKhxRvIj3OZH4JsQsYpRaA=="
385+
"contentHash": "twbdvWFcy0wRd/jiZWeiS6Edui76XwmRLHXLJ3uFpBsimu7XOTLJBMycG11MxdcAjFMa3LnPUkTgiI63wM1b+w=="
386386
}
387387
},
388388
"UAP,Version=v10.0.17763/win10-x86-aot": {
389389
"Microsoft.NETCore.UniversalWindowsPlatform": {
390390
"type": "Direct",
391391
"requested": "[6.2.14, )",
392392
"resolved": "6.2.14",
393-
"contentHash": "20T91+/vQhL8c//GFU9qkNnys2BVdzAr9smULuP4p9csXwYjuoqxwAjNxLH0FvApGdB3s0sGhHkSeLg3IQBdMw==",
393+
"contentHash": "7Mi4cS8JQ7gqm+W+SRCq13c2Rr0yZTuczC9EbV6gRigE2ZhQalnLHyat0ZshT5HDMSkFDxTyjwZymUgFuv3+eg==",
394394
"dependencies": {
395395
"Microsoft.NETCore.Platforms": "2.1.0",
396396
"Microsoft.Net.Native.Compiler": "2.2.12-rel-31116-00",
@@ -407,7 +407,7 @@
407407
"runtime.win10-x86-aot.Microsoft.NETCore.UniversalWindowsPlatform": {
408408
"type": "Transitive",
409409
"resolved": "6.2.14",
410-
"contentHash": "Z8Y39jw4fACg2/spREHZp2Edeay/nv2ZCXpk9IE1C7QwLSe7lQ6B05Lpq84fFCwwV+z6NiAPIdivj03LLEGv7A=="
410+
"contentHash": "3nklK7zt8pQ4/okXv4jA/HlUx/xmnyS/YRKJh19BzXKKhYk/EnRT1zoNcvQDJjhyUZXquffbcxHyBbjd2V2GNQ=="
411411
}
412412
}
413413
}

‎vnext/Desktop.IntegrationTests/HttpOriginPolicyIntegrationTest.cpp‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,11 +6,12 @@
66
#include <CppRuntimeOptions.h>
77
#include <Networking/IHttpResource.h>
88
#include <Networking/OriginPolicy.h>
9-
#include <Test/HttpServer.h>
109

1110
// Standard Library
1211
#include <future>
1312

13+
#include "HttpServer.h"
14+
1415
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
1516

1617
namespace http = boost::beast::http;
@@ -110,7 +111,7 @@ TEST_CLASS(HttpOriginPolicyIntegrationTest)
110111

111112
case http::verb::options:
112113
default:
113-
Assert::Fail(L"Unsupported request method");
114+
Assert::Fail(L"Unsupported request method");
114115
}
115116

116117
return server;

‎vnext/Desktop.IntegrationTests/HttpResourceIntegrationTests.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
#include <Networking/IHttpResource.h>
1010
#include <Networking/OriginPolicy.h>
1111
#include <RuntimeOptions.h>
12-
#include <Test/HttpServer.h>
1312
#include <unicode.h>
1413

1514
// Boost Library
@@ -18,6 +17,8 @@
1817
// Standard Library
1918
#include <future>
2019

20+
#include "HttpServer.h"
21+
2122
using namespace Microsoft::React;
2223
using namespace Microsoft::VisualStudio::CppUnitTestFramework;
2324

vnext/Test/HttpServer.cpp renamed to vnext/Desktop.IntegrationTests/HttpServer.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
11
// clang-format off
2+
3+
// C4996: 'gethostbyaddr': Use getnameinfo() or GetNameInfoW() instead
4+
#define _WINSOCK_DEPRECATED_NO_WARNINGS
5+
26
#include "HttpServer.h"
37

48
#include <boost/beast/core/multi_buffer.hpp>
@@ -360,7 +364,7 @@ void HttpServer::Start()
360364
Accept();
361365

362366
m_ioThreads.reserve(m_ioThreadCount);
363-
for (int i = 0; i < m_ioThreadCount; i++)
367+
for (size_t i = 0; i < m_ioThreadCount; i++)
364368
{
365369
m_ioThreads.emplace_back([self = shared_from_this()]()
366370
{

vnext/Test/HttpServer.h renamed to vnext/Desktop.IntegrationTests/HttpServer.h

File renamed without changes.

‎vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -115,13 +115,14 @@
115115
<ClCompile Include="ChakraRuntimeHolder.cpp" />
116116
<ClCompile Include="HttpOriginPolicyIntegrationTest.cpp" />
117117
<ClCompile Include="HttpResourceIntegrationTests.cpp" />
118+
<ClCompile Include="HttpServer.cpp" />
118119
<ClCompile Include="Modules\TestDevSettingsModule.cpp" />
119120
<ClCompile Include="Modules\TestImageLoaderModule.cpp" />
120121
<ClCompile Include="RNTesterIntegrationTests.cpp" />
121122
<ClCompile Include="DesktopTestInstance.cpp" />
122123
<ClCompile Include="DesktopTestRunner.cpp" />
123124
<ClCompile Include="WebSocketIntegrationTest.cpp" />
124-
<ClCompile Include="WebSocketResourcePerformanceTests.cpp" />
125+
<ClCompile Include="WebSocketServer.cpp" />
125126
</ItemGroup>
126127
<ItemGroup>
127128
<ProjectReference Include="..\Desktop.DLL\React.Windows.Desktop.DLL.vcxproj">
@@ -130,9 +131,6 @@
130131
<ProjectReference Include="..\IntegrationTests\React.Windows.IntegrationTests.vcxproj">
131132
<Project>{700A84FD-F92A-43F1-8D06-B0E0745DF9B5}</Project>
132133
</ProjectReference>
133-
<ProjectReference Include="..\Test\React.Windows.Test.vcxproj">
134-
<Project>{cd0415c6-d908-4212-9481-49be41f58d27}</Project>
135-
</ProjectReference>
136134
</ItemGroup>
137135
<ItemGroup>
138136
<!--
@@ -142,14 +140,15 @@
142140
<ReferenceCopyLocalPaths Include="$(OutDir)\..\React.Windows.Desktop.DLL\react-native-win32.dll" />
143141
</ItemGroup>
144142
<ItemGroup>
143+
<ClInclude Include="HttpServer.h" />
145144
<ClInclude Include="ChakraRuntimeHolder.h" />
146145
<ClInclude Include="DesktopTestInstance.h" />
147146
<ClInclude Include="Modules\TestDevSettingsModule.h" />
148147
<ClInclude Include="Modules\TestImageLoaderModule.h" />
148+
<ClInclude Include="WebSocketServer.h" />
149149
</ItemGroup>
150150
<ItemGroup>
151151
<PackageReference Include="boost" Version="1.84.0.0" />
152-
<PackageReference Include="ReactWindows.OpenSSL.StdCall.Static" Version="1.0.2-p.5" />
153152
<!-- TODO: Remove!!! -->
154153
<PackageReference Include="Microsoft.Windows.CppWinRT" Version="$(CppWinRTVersion)" PrivateAssets="all" />
155154
<!-- We're transitively pulling in Microsoft.WindowsAppSDK, and it depends on Microsoft.Web.WebView2, which

‎vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj.filters‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,12 @@
4848
<ClCompile Include="HttpOriginPolicyIntegrationTest.cpp">
4949
<Filter>Integration Tests</Filter>
5050
</ClCompile>
51+
<ClCompile Include="HttpServer.cpp">
52+
<Filter>Source Files</Filter>
53+
</ClCompile>
54+
<ClCompile Include="WebSocketServer.cpp">
55+
<Filter>Source Files</Filter>
56+
</ClCompile>
5157
</ItemGroup>
5258
<ItemGroup>
5359
<ClInclude Include="DesktopTestInstance.h">
@@ -62,5 +68,11 @@
6268
<ClInclude Include="Modules\TestImageLoaderModule.h">
6369
<Filter>Header Files\Modules</Filter>
6470
</ClInclude>
71+
<ClInclude Include="HttpServer.h">
72+
<Filter>Header Files</Filter>
73+
</ClInclude>
74+
<ClInclude Include="WebSocketServer.h">
75+
<Filter>Header Files</Filter>
76+
</ClInclude>
6577
</ItemGroup>
6678
</Project>

0 commit comments

Comments
 (0)