From e740b5142a329f75eb5b25d208a00868885d3191 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 1 May 2020 15:34:34 -0700 Subject: [PATCH 1/9] Delay load ChakraCore.dll --- vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index f92c4c0636f..09ecc50f835 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -94,7 +94,7 @@ we have a better solution for handling the absence of WinRT string and error DLLs on Win7. --> WindowsApp_downlevel.lib;%(AdditionalDependencies) - api-ms-win-core-winrt-error-l1-1-0.dll;api-ms-win-core-winrt-error-l1-1-1.dll;api-ms-win-core-winrt-string-l1-1-0.dll;ChakraCore.Debugger.DLL;%(DelayLoadDLLs) + api-ms-win-core-winrt-error-l1-1-0.dll;api-ms-win-core-winrt-error-l1-1-1.dll;api-ms-win-core-winrt-string-l1-1-0.dll;ChakraCore.Debugger.DLL;ChakraCore.dll;%(DelayLoadDLLs) From 607c23ce00906da86ee03f24a6392e47d08b3545 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 1 May 2020 15:34:56 -0700 Subject: [PATCH 2/9] Change files --- .../react-native-windows-2020-05-01-15-34-56-master.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-05-01-15-34-56-master.json diff --git a/change/react-native-windows-2020-05-01-15-34-56-master.json b/change/react-native-windows-2020-05-01-15-34-56-master.json new file mode 100644 index 00000000000..8ce2b59e221 --- /dev/null +++ b/change/react-native-windows-2020-05-01-15-34-56-master.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Delay load ChakraCore.dll", + "packageName": "react-native-windows", + "email": "tudorm@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-01T22:34:56.237Z" +} From f0c29177bacf011a82d8cbee9e52d82ab4d58341 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 10:50:48 -0700 Subject: [PATCH 3/9] clean up unneeded project references --- .../React.Windows.Desktop.DLL.vcxproj | 17 --- ...t.Windows.Desktop.IntegrationTests.vcxproj | 14 -- .../React.Windows.Desktop.UnitTests.vcxproj | 2 - vnext/Desktop/React.Windows.Desktop.vcxproj | 2 - .../React.Windows.IntegrationTests.vcxproj | 3 - .../JSI.Desktop.UnitTests.vcxproj | 31 +---- vnext/JSI/Desktop/JSI.Desktop.vcxproj | 5 - vnext/JSI/Universal/JSI.Universal.vcxproj | 5 - vnext/ReactWindows-Desktop.sln | 1 - .../ReactWindowsCore/ReactWindowsCore.vcxproj | 7 - .../React.Windows.Universal.UnitTests.vcxproj | 3 - vnext/V8Inspector/V8Inspector.vcxproj | 122 ------------------ vnext/V8Inspector/V8Inspector.vcxproj.filters | 63 --------- 13 files changed, 2 insertions(+), 273 deletions(-) delete mode 100644 vnext/V8Inspector/V8Inspector.vcxproj delete mode 100644 vnext/V8Inspector/V8Inspector.vcxproj.filters diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 09ecc50f835..d22a4372507 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -62,10 +62,8 @@ WIN32; _WINDOWS; _USRDLL; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_EXPORT=; @@ -123,21 +121,6 @@ - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - - - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - - {11C084A3-A57C-4296-A679-CAC17B603144} - {95048601-C3DC-475F-ADF8-7C0C764C10D5} diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 8276fcba366..79633d982cc 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -54,10 +54,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_PLATFORM=windesktop; @@ -103,21 +101,9 @@ - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - - - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - - {11C084A3-A57C-4296-A679-CAC17B603144} - {700A84FD-F92A-43F1-8D06-B0E0745DF9B5} diff --git a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj index 548a182d84d..b16e373d0ee 100644 --- a/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj +++ b/vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj @@ -53,10 +53,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_EXPORT=; diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index a95ef3c358f..727e26c6d1a 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -71,10 +71,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_PLATFORM=win32; diff --git a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj index 470ab3aadbd..1023d7466b2 100644 --- a/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj +++ b/vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj @@ -64,9 +64,6 @@ {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - {11C084A3-A57C-4296-A679-CAC17B603144} - diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 690ef7b7fa4..76216a1a5e2 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -25,16 +25,9 @@ - - - - - - - $(ReactNativeWindowsDir);$(ReactNativeWindowsDir)Common;$(ReactNativeWindowsDir)stubs;$(FollyDir);$(ReactNativeDir)\ReactCommon;$(JSI_Source);$(ReactNativeWindowsDir)ReactWindowsCore;$(ReactNativeWindowsDir)\ReactWindowsCore\tracing;$(ReactNativeWindowsDir)include\ReactWindowsCore;$(ReactNativeWindowsDir)Desktop;$(ReactNativeWindowsDir)IntegrationTests;$(ReactNativeWindowsDir)JSI\Shared;$(MSBuildProjectDirectory);$(ReactNativeDir)\ReactCommon\callinvoker;$(IncludePath) true @@ -52,16 +45,16 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_EXPORT=; GTEST_LANG_CXX11; %(PreprocessorDefinitions) + USE_HERMES;%(PreprocessorDefinitions) + USE_V8;%(PreprocessorDefinitions) - comsuppw.lib; delayimp.lib; - Shlwapi.lib; - Winhttp.lib; %(AdditionalDependencies) DebugFull @@ -118,21 +103,9 @@ - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - - {A990658C-CE31-4BCC-976F-0FC6B1AF693D} - - - {74085F13-2DDE-45E5-A0CA-927AC9D0B953} - {A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD} - - {11C084A3-A57C-4296-A679-CAC17B603144} - {95048601-C3DC-475F-ADF8-7C0C764C10D5} diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj index 361386ab7ab..f95da2ecad5 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -73,11 +73,6 @@ - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - diff --git a/vnext/JSI/Universal/JSI.Universal.vcxproj b/vnext/JSI/Universal/JSI.Universal.vcxproj index 703641c26dd..4f994f6133b 100644 --- a/vnext/JSI/Universal/JSI.Universal.vcxproj +++ b/vnext/JSI/Universal/JSI.Universal.vcxproj @@ -94,11 +94,6 @@ - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 0fdbd8d9cb5..d1aabdcabba 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -124,7 +124,6 @@ Global Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{6f354505-fe3a-4bd2-a9a6-d12bbf37a85c}*SharedItemsImports = 4 - Shared\Shared.vcxitems*{6f354505-fe3a-4bd2-a9a6-d12bbf37a85c}*SharedItemsImports = 4 Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{95048601-c3dc-475f-adf8-7c0c764c10d5}*SharedItemsImports = 4 Mso\Mso.vcxitems*{95048601-c3dc-475f-adf8-7c0c764c10d5}*SharedItemsImports = 4 diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index 5ff0d84dbb7..be2ab74f97a 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj @@ -90,7 +90,6 @@ $(ReactNativeWindowsDir); $(ReactNativeWindowsDir)Common; $(ReactNativeWindowsDir)Shared; - $(ReactNativeWindowsDir)include; $(ReactNativeWindowsDir)include\ReactWindowsCore; $(ReactNativeDir)\ReactCommon; $(ReactNativeDir)\ReactCommon\callinvoker; @@ -216,12 +215,6 @@ {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - {a990658c-ce31-4bcc-976f-0fc6b1af693d} - - - {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - diff --git a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj index d8ec53c802a..36f451747e5 100644 --- a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj +++ b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj @@ -117,9 +117,6 @@ {a990658c-ce31-4bcc-976f-0fc6b1af693d} - - {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - {2d5d43d9-cffc-4c40-b4cd-02efb4e2742b} diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj deleted file mode 100644 index 3522fe72dde..00000000000 --- a/vnext/V8Inspector/V8Inspector.vcxproj +++ /dev/null @@ -1,122 +0,0 @@ - - - - - Debug - Win32 - - - Release - Win32 - - - Debug - x64 - - - Release - x64 - - - - 16.0 - {F1B91D19-79E4-461B-AC8E-E3E6E747F65F} - Win32Proj - V8Inspector - 10.0.18362.0 - - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - StaticLibrary - true - Unicode - - - StaticLibrary - false - true - Unicode - - - - - - - - - - - - - - - - - - - - - - NotUsing - false - true - $(ReactNativeDir)\ReactCommon;$(JSI_Source);%(AdditionalIncludeDirectories) - - BOOST_ASIO_DISABLE_BOOST_REGEX; - BOOST_ERROR_CODE_HEADER_ONLY; - BOOST_ASIO_HAS_IOCP; - _WIN32_WINNT=$(WinVer); - WIN32; - _WINDOWS; - _WIN32; - JSI_EXPORT=; - %(PreprocessorDefinitions) - - - false - - - false - false - - - - - - - - - - - - - - - - - - - - - - - - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/vnext/V8Inspector/V8Inspector.vcxproj.filters b/vnext/V8Inspector/V8Inspector.vcxproj.filters deleted file mode 100644 index 1097daff606..00000000000 --- a/vnext/V8Inspector/V8Inspector.vcxproj.filters +++ /dev/null @@ -1,63 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hh;hpp;hxx;hm;inl;inc;ipp;xsd - - - {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} - rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - \ No newline at end of file From 0384d497e3b33a7a3856a1c4b16e1e2cdf62afe9 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 14:08:12 -0700 Subject: [PATCH 4/9] Overwrite property after React.Cpp.props gets included --- packages/E2ETest/windows/ReactUWPTestApp.sln | 1 + packages/playground/windows/playground.sln | 1 + .../React.Windows.Desktop.DLL.vcxproj | 4 +++- vnext/Desktop.DLL/packages.config | 1 + ...t.Windows.Desktop.IntegrationTests.vcxproj | 3 ++- vnext/Desktop/React.Windows.Desktop.vcxproj | 4 +++- .../JSI.Desktop.UnitTests.vcxproj | 4 +++- vnext/JSI.Desktop.UnitTests/packages.config | 1 + vnext/JSI/Desktop/JSI.Desktop.vcxproj | 4 +++- vnext/Microsoft.ReactNative.sln | 4 +++- vnext/ReactWindows-Desktop.sln | 3 ++- .../ReactWindowsCore-Desktop.vcxproj | 13 ++++++++++ .../ReactWindowsCore.vcxitems | 24 ------------------- .../ReactWindowsCore/ReactWindowsCore.vcxproj | 13 ++++++++++ 14 files changed, 49 insertions(+), 31 deletions(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp.sln b/packages/E2ETest/windows/ReactUWPTestApp.sln index fd7c8a089aa..d632b950855 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp.sln +++ b/packages/E2ETest/windows/ReactUWPTestApp.sln @@ -43,6 +43,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Manag EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 ..\..\..\vnext\Chakra\Chakra.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{f7d32bd0-2749-483e-9a0d-1635ef7e3136}*SharedItemsImports = 4 diff --git a/packages/playground/windows/playground.sln b/packages/playground/windows/playground.sln index 6c610df8452..62a9c082eae 100644 --- a/packages/playground/windows/playground.sln +++ b/packages/playground/windows/playground.sln @@ -43,6 +43,7 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + ..\..\..\vnext\ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6b6aa847-b32f-41ac-9d3b-48a8cdfa8ade}*SharedItemsImports = 4 diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index eafde13e99c..98645994705 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -23,12 +23,13 @@ {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} React.Windows.Desktop.DLL react-native-win32 - true DynamicLibrary + + true @@ -152,6 +153,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + diff --git a/vnext/Desktop.DLL/packages.config b/vnext/Desktop.DLL/packages.config index 50494a3bc9d..aa1174628fc 100644 --- a/vnext/Desktop.DLL/packages.config +++ b/vnext/Desktop.DLL/packages.config @@ -4,4 +4,5 @@ + \ No newline at end of file diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index a44671c4fd1..228c97e7468 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -23,13 +23,14 @@ {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB} React.Windows.Desktop.IntegrationTests true - true DynamicLibrary false + + true diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index ba2a02923e9..fbe5d691421 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -33,7 +33,6 @@ C++/WinRT 2 true - true true @@ -42,6 +41,8 @@ StaticLibrary + + true @@ -194,6 +195,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 421b7738b79..c6bd29ce6ee 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -16,13 +16,14 @@ {6f354505-fe3a-4bd2-a9a6-d12bbf37a85c} JSI.Desktop.UnitTests - true Application + + true @@ -131,6 +132,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + diff --git a/vnext/JSI.Desktop.UnitTests/packages.config b/vnext/JSI.Desktop.UnitTests/packages.config index d9a6b100a5f..87f1304896e 100644 --- a/vnext/JSI.Desktop.UnitTests/packages.config +++ b/vnext/JSI.Desktop.UnitTests/packages.config @@ -6,4 +6,5 @@ + \ No newline at end of file diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj index 7b2e3af6cb1..b8c3dfdd97b 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -21,12 +21,13 @@ {17DD1B17-3094-40DD-9373-AC2497932ECA} JSI.Desktop - true StaticLibrary + + true @@ -84,6 +85,7 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + diff --git a/vnext/Microsoft.ReactNative.sln b/vnext/Microsoft.ReactNative.sln index e800a3153c5..06dfd25b48b 100644 --- a/vnext/Microsoft.ReactNative.sln +++ b/vnext/Microsoft.ReactNative.sln @@ -31,7 +31,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11c084a3-a57c-4296-a679-cac17b603145}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" EndProject @@ -122,6 +122,8 @@ EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 + ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{14fa0516-e6d7-4e4d-b097-1470198c5072}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 diff --git a/vnext/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 4c4f60f46fd..6e3ddae5d0a 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -9,7 +9,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactCommon", "ReactCommon\ {A990658C-CE31-4BCC-976F-0FC6B1AF693D} = {A990658C-CE31-4BCC-976F-0FC6B1AF693D} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11c084a3-a57c-4296-a679-cac17b603145}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore", "ReactWindowsCore\ReactWindowsCore.vcxitems", "{11C084A3-A57C-4296-A679-CAC17B603145}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ReactWindowsCore-Desktop", "ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj", "{11C084A3-A57C-4296-A679-CAC17B603144}" ProjectSection(ProjectDependencies) = postProject @@ -123,6 +123,7 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603144}*SharedItemsImports = 4 + ReactWindowsCore\ReactWindowsCore.vcxitems*{11c084a3-a57c-4296-a679-cac17b603145}*SharedItemsImports = 9 JSI\Shared\JSI.Shared.vcxitems*{17dd1b17-3094-40dd-9373-ac2497932eca}*SharedItemsImports = 4 Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 diff --git a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj index 5ff28843410..07fc55b1cb3 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj @@ -2,7 +2,20 @@ {11C084A3-A57C-4296-A679-CAC17B603144} + StaticLibrary + ReactWindowsCore + true + Windows Store + 10.0 + + StaticLibrary + + + + + + true false diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems index 13e56fc783b..b8a0caa053b 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems @@ -2,11 +2,6 @@ {11c084a3-a57c-4296-a679-cac17b603145} - StaticLibrary - ReactWindowsCore - true - Windows Store - 10.0 @@ -58,18 +53,6 @@ x64 - - - - StaticLibrary - - - - - - - - @@ -107,7 +90,6 @@ $(ReactNativeWindowsDir); $(ReactNativeWindowsDir)Common; $(ReactNativeWindowsDir)Shared; - $(ReactNativeWindowsDir)include; $(ReactNativeWindowsDir)include\ReactWindowsCore; $(ReactNativeDir)\ReactCommon; $(ReactNativeDir)\ReactCommon\callinvoker; @@ -232,12 +214,6 @@ {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - {a990658c-ce31-4bcc-976f-0fc6b1af693d} - - - {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index ded2311ae69..2c7fe14897b 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj @@ -2,6 +2,19 @@ {11C084A3-A57C-4296-A679-CAC17B603144} + StaticLibrary + ReactWindowsCore + true + Windows Store + 10.0 + + StaticLibrary + + + + + + \ No newline at end of file From a4f156272e55b35f0154bbb609182b37e0abc5a8 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 14:17:36 -0700 Subject: [PATCH 5/9] Change files --- .../react-native-windows-2020-05-08-14-17-35-master.json | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 change/react-native-windows-2020-05-08-14-17-35-master.json diff --git a/change/react-native-windows-2020-05-08-14-17-35-master.json b/change/react-native-windows-2020-05-08-14-17-35-master.json new file mode 100644 index 00000000000..c55a7882828 --- /dev/null +++ b/change/react-native-windows-2020-05-08-14-17-35-master.json @@ -0,0 +1,8 @@ +{ + "type": "prerelease", + "comment": "Reenable V8 for desktop projects", + "packageName": "react-native-windows", + "email": "tudorm@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-05-08T21:17:35.875Z" +} From 48ed87c9dcb7696e747d96c075c611452a40a2a2 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 14:17:52 -0700 Subject: [PATCH 6/9] change file --- .../react-native-windows-2020-05-01-15-34-56-master.json | 8 -------- 1 file changed, 8 deletions(-) delete mode 100644 change/react-native-windows-2020-05-01-15-34-56-master.json diff --git a/change/react-native-windows-2020-05-01-15-34-56-master.json b/change/react-native-windows-2020-05-01-15-34-56-master.json deleted file mode 100644 index 8ce2b59e221..00000000000 --- a/change/react-native-windows-2020-05-01-15-34-56-master.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "type": "prerelease", - "comment": "Delay load ChakraCore.dll", - "packageName": "react-native-windows", - "email": "tudorm@microsoft.com", - "dependentChangeType": "patch", - "date": "2020-05-01T22:34:56.237Z" -} From 462da8023a726f23fdbb4451df4147db89489011 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 14:50:50 -0700 Subject: [PATCH 7/9] Fix WinUI3 --- vnext/PropertySheets/StaticLibrary/WinUI3.props | 15 +++++++++++++++ 1 file changed, 15 insertions(+) create mode 100644 vnext/PropertySheets/StaticLibrary/WinUI3.props diff --git a/vnext/PropertySheets/StaticLibrary/WinUI3.props b/vnext/PropertySheets/StaticLibrary/WinUI3.props new file mode 100644 index 00000000000..a8816cd6b89 --- /dev/null +++ b/vnext/PropertySheets/StaticLibrary/WinUI3.props @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + From af6c26680fceaa112eba3d2b8646da868b506168 Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 15:42:47 -0700 Subject: [PATCH 8/9] Reverse the conditional logic --- vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj | 3 +-- .../React.Windows.Desktop.IntegrationTests.vcxproj | 3 +-- vnext/Desktop/React.Windows.Desktop.vcxproj | 3 +-- vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj | 3 +-- vnext/JSI/Desktop/JSI.Desktop.vcxproj | 3 +-- vnext/PropertySheets/React.Cpp.props | 2 +- 6 files changed, 6 insertions(+), 11 deletions(-) diff --git a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj index 98645994705..5376bcd160f 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -23,13 +23,12 @@ {88BAB0FA-E1AC-4DA7-A30C-F91702A8EADB} React.Windows.Desktop.DLL react-native-win32 + true DynamicLibrary - - true diff --git a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj index 228c97e7468..a44671c4fd1 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -23,14 +23,13 @@ {E0D269B4-D7F0-4C4E-92CD-B2C06109A2BB} React.Windows.Desktop.IntegrationTests true + true DynamicLibrary false - - true diff --git a/vnext/Desktop/React.Windows.Desktop.vcxproj b/vnext/Desktop/React.Windows.Desktop.vcxproj index fbe5d691421..556cb33f4db 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -33,6 +33,7 @@ C++/WinRT 2 true + true true @@ -41,8 +42,6 @@ StaticLibrary - - true diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index c6bd29ce6ee..0650e75fb2c 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -16,14 +16,13 @@ {6f354505-fe3a-4bd2-a9a6-d12bbf37a85c} JSI.Desktop.UnitTests + true Application - - true diff --git a/vnext/JSI/Desktop/JSI.Desktop.vcxproj b/vnext/JSI/Desktop/JSI.Desktop.vcxproj index b8c3dfdd97b..58788a35444 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -21,13 +21,12 @@ {17DD1B17-3094-40DD-9373-AC2497932ECA} JSI.Desktop + true StaticLibrary - - true diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 2bb87442726..026c91a7eb8 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -27,7 +27,7 @@ 0.1.6 $(SolutionDir)packages\ReactNative.Hermes.Windows.$(HERMES_Version) - false + false 0.2.7 $(SolutionDir)packages\ReactNative.V8Jsi.Windows.$(V8_Version) From bd81e5d13eff498014c13c3740a012c9d842309e Mon Sep 17 00:00:00 2001 From: tudorm Date: Fri, 8 May 2020 16:04:07 -0700 Subject: [PATCH 9/9] Revert some unnecessary changes. Consolidate the preprocessor defines in the props --- .../playground-win32/Playground-win32.vcxproj | 2 -- .../JSI.Desktop.UnitTests.vcxproj | 2 -- .../Microsoft.ReactNative.vcxproj | 2 -- vnext/PropertySheets/React.Cpp.props | 2 ++ vnext/PropertySheets/StaticLibrary/WinUI3.props | 15 --------------- vnext/ReactUWP/ReactUWP.vcxproj | 2 -- .../ReactWindowsCore-Desktop.vcxproj | 13 ------------- vnext/ReactWindowsCore/ReactWindowsCore.vcxitems | 14 +++++++++++++- vnext/ReactWindowsCore/ReactWindowsCore.vcxproj | 13 ------------- vnext/Shared/Shared.vcxitems | 2 -- 10 files changed, 15 insertions(+), 52 deletions(-) delete mode 100644 vnext/PropertySheets/StaticLibrary/WinUI3.props diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 9e4ec292c29..19af51184fe 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -74,8 +74,6 @@ pch.h true Level3 - USE_V8;%(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) shell32.lib;user32.lib;windowsapp.lib;$(ReactNativeWindowsDir)target\$(PlatformTarget)\$(Configuration)\ReactUWP\React.uwp.lib;%(AdditionalDependenices) diff --git a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj index 0650e75fb2c..c51a6f46a48 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -54,8 +54,6 @@ GTEST_LANG_CXX11; %(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) - USE_V8;%(PreprocessorDefinitions) CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions) USE_EDGEMODE_JSRT;%(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) - USE_V8;%(PreprocessorDefinitions) REACTWINDOWS_BUILD; RN_PLATFORM=windows; diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 026c91a7eb8..f191493c0f9 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -46,6 +46,8 @@ ENABLE_ETW_TRACING;%(PreprocessorDefinitions) ENABLE_JS_SYSTRACE_TO_ETW;WITH_FBSYSTRACE;%(PreprocessorDefinitions) + USE_HERMES;%(PreprocessorDefinitions) + USE_V8;%(PreprocessorDefinitions) diff --git a/vnext/PropertySheets/StaticLibrary/WinUI3.props b/vnext/PropertySheets/StaticLibrary/WinUI3.props deleted file mode 100644 index a8816cd6b89..00000000000 --- a/vnext/PropertySheets/StaticLibrary/WinUI3.props +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index ffddc8d89cb..7045c842381 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -90,8 +90,6 @@ --> CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions) USE_EDGEMODE_JSRT;%(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) - USE_V8;%(PreprocessorDefinitions) REACTWINDOWS_BUILD; RN_PLATFORM=windows; diff --git a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj index 07fc55b1cb3..5ff28843410 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore-Desktop.vcxproj @@ -2,20 +2,7 @@ {11C084A3-A57C-4296-A679-CAC17B603144} - StaticLibrary - ReactWindowsCore - true - Windows Store - 10.0 - - StaticLibrary - - - - - - true false diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems index b8a0caa053b..45f57133a2e 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems @@ -2,6 +2,11 @@ {11c084a3-a57c-4296-a679-cac17b603145} + StaticLibrary + ReactWindowsCore + true + Windows Store + 10.0 @@ -53,6 +58,14 @@ x64 + + + + StaticLibrary + + + + @@ -85,7 +98,6 @@ CHAKRACORE; %(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) $(ReactNativeWindowsDir); $(ReactNativeWindowsDir)Common; diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index 2c7fe14897b..ded2311ae69 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj @@ -2,19 +2,6 @@ {11C084A3-A57C-4296-A679-CAC17B603144} - StaticLibrary - ReactWindowsCore - true - Windows Store - 10.0 - - StaticLibrary - - - - - - \ No newline at end of file diff --git a/vnext/Shared/Shared.vcxitems b/vnext/Shared/Shared.vcxitems index c426153725d..4d31e11fc82 100644 --- a/vnext/Shared/Shared.vcxitems +++ b/vnext/Shared/Shared.vcxitems @@ -8,8 +8,6 @@ %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) - USE_HERMES;%(PreprocessorDefinitions) - USE_V8;%(PreprocessorDefinitions)