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" +} 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-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/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 c598ae4e5e7..5376bcd160f 100644 --- a/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj +++ b/vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj @@ -63,10 +63,8 @@ WIN32; _WINDOWS; _USRDLL; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_EXPORT=; @@ -122,21 +120,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} @@ -169,6 +152,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 44603739225..a44671c4fd1 100644 --- a/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj +++ b/vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj @@ -55,10 +55,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_PLATFORM=windesktop; @@ -102,21 +100,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 1048078ca0f..84f5784e4f1 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 41a7846d4fd..556cb33f4db 100644 --- a/vnext/Desktop/React.Windows.Desktop.vcxproj +++ b/vnext/Desktop/React.Windows.Desktop.vcxproj @@ -72,10 +72,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_PLATFORM=win32; @@ -196,6 +194,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/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 6dbf207ef0d..c51a6f46a48 100644 --- a/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj +++ b/vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj @@ -26,16 +26,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 @@ -53,10 +46,8 @@ _WIN32_WINNT=$(WinVer); WIN32; _WINDOWS; - REACTNATIVEWIN32_EXPORTS; FOLLY_NO_CONFIG; NOMINMAX; - GLOG_NO_ABBREVIATED_SEVERITIES; _HAS_AUTO_PTR_ETC; CHAKRACORE; RN_EXPORT=; @@ -73,16 +64,8 @@ -minpdbpathlen:256 - - comsuppw.lib; delayimp.lib; - Shlwapi.lib; - Winhttp.lib; %(AdditionalDependencies) DebugFull @@ -119,21 +102,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} @@ -158,6 +129,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 0737e735265..58788a35444 100644 --- a/vnext/JSI/Desktop/JSI.Desktop.vcxproj +++ b/vnext/JSI/Desktop/JSI.Desktop.vcxproj @@ -74,11 +74,6 @@ - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - @@ -89,6 +84,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/Universal/JSI.Universal.vcxproj b/vnext/JSI/Universal/JSI.Universal.vcxproj index 2dbbf006cb2..8ed94f58f44 100644 --- a/vnext/JSI/Universal/JSI.Universal.vcxproj +++ b/vnext/JSI/Universal/JSI.Universal.vcxproj @@ -115,11 +115,6 @@ - - - {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 4558c0c563e..06198259254 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -147,8 +147,6 @@ --> 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 2bb87442726..f191493c0f9 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) @@ -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/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/ReactWindows-Desktop.sln b/vnext/ReactWindows-Desktop.sln index 8e60ffd4d45..6e3ddae5d0a 100644 --- a/vnext/ReactWindows-Desktop.sln +++ b/vnext/ReactWindows-Desktop.sln @@ -128,7 +128,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.vcxitems b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems index 13e56fc783b..45f57133a2e 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxitems @@ -66,10 +66,6 @@ - - - - @@ -102,12 +98,10 @@ CHAKRACORE; %(PreprocessorDefinitions) - USE_HERMES;%(PreprocessorDefinitions) $(ReactNativeWindowsDir); $(ReactNativeWindowsDir)Common; $(ReactNativeWindowsDir)Shared; - $(ReactNativeWindowsDir)include; $(ReactNativeWindowsDir)include\ReactWindowsCore; $(ReactNativeDir)\ReactCommon; $(ReactNativeDir)\ReactCommon\callinvoker; @@ -232,12 +226,6 @@ {fca38f3c-7c73-4c47-be4e-32f77fa8538d} - - {a990658c-ce31-4bcc-976f-0fc6b1af693d} - - - {a9d95a91-4db7-4f72-beb6-fe8a5c89bfbd} - 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) diff --git a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj index 51e9f3f11bd..c138c10390e 100644 --- a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj +++ b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj @@ -121,9 +121,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