Skip to content

Reenable V8 for desktop projects #4840

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
11 commits merged into from
May 9, 2020
Merged

Reenable V8 for desktop projects #4840

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
e740b51
Delay load ChakraCore.dll
May 1, 2020
607c23c
Change files
May 1, 2020
f0c2917
clean up unneeded project references
May 8, 2020
6756b78
Merge remote-tracking branch 'upstream/master'
May 8, 2020
0384d49
Overwrite property after React.Cpp.props gets included
May 8, 2020
332eab7
Merge remote-tracking branch 'upstream/master'
May 8, 2020
a4f1562
Change files
May 8, 2020
48ed87c
change file
May 8, 2020
462da80
Fix WinUI3
May 8, 2020
af6c266
Reverse the conditional logic
May 8, 2020
bd81e5d
Revert some unnecessary changes. Consolidate the preprocessor defines…
May 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions change/react-native-windows-2020-05-08-14-17-35-master.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"type": "prerelease",
"comment": "Reenable V8 for desktop projects",
"packageName": "react-native-windows",
"email": "[email protected]",
"dependentChangeType": "patch",
"date": "2020-05-08T21:17:35.875Z"
}
1 change: 1 addition & 0 deletions packages/E2ETest/windows/ReactUWPTestApp.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions packages/playground/windows/playground-win32/Playground-win32.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
<PrecompiledHeaderFile>pch.h</PrecompiledHeaderFile>
<SDLCheck>true</SDLCheck>
<WarningLevel>Level3</WarningLevel>
<PreprocessorDefinitions Condition="'$(USE_V8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_HERMES)'=='true'">USE_HERMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
<Link>
<AdditionalDependencies>shell32.lib;user32.lib;windowsapp.lib;$(ReactNativeWindowsDir)target\$(PlatformTarget)\$(Configuration)\ReactUWP\React.uwp.lib;%(AdditionalDependenices)</AdditionalDependencies>
Expand Down
1 change: 1 addition & 0 deletions packages/playground/windows/playground.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
18 changes: 1 addition & 17 deletions vnext/Desktop.DLL/React.Windows.Desktop.DLL.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,10 +63,8 @@
WIN32;
_WINDOWS;
_USRDLL;
REACTNATIVEWIN32_EXPORTS;
FOLLY_NO_CONFIG;
NOMINMAX;
GLOG_NO_ABBREVIATED_SEVERITIES;
_HAS_AUTO_PTR_ETC;
CHAKRACORE;
RN_EXPORT=;
Expand Down Expand Up @@ -122,21 +120,6 @@
<None Include="react-native-win32.x86.def" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
<ProjectReference Include="..\Folly\Folly.vcxproj">
<Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
</ProjectReference>
<ProjectReference Include="..\FollyWin32\FollyWin32.vcxproj">
<Project>{74085F13-2DDE-45E5-A0CA-927AC9D0B953}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
<Project>{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj">
<Project>{11C084A3-A57C-4296-A679-CAC17B603144}</Project>
</ProjectReference>
<ProjectReference Include="..\Desktop\React.Windows.Desktop.vcxproj">
<Project>{95048601-C3DC-475F-ADF8-7C0C764C10D5}</Project>
</ProjectReference>
Expand Down Expand Up @@ -169,6 +152,7 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Warning Condition="'$(USE_V8)' != 'true'" Text="Building desktop project without USE_V8 (value is '$(USE_V8)')" />
<Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
Expand Down
1 change: 1 addition & 0 deletions vnext/Desktop.DLL/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@
<package id="ChakraCore.Debugger" version="0.0.0.43" targetFramework="native" />
<package id="Microsoft.ChakraCore.vc140" version="1.11.13" targetFramework="native" developmentDependency="true" />
<package id="ReactWindows.OpenSSL.StdCall.Static" version="1.0.2-p.2" targetFramework="native" />
<package id="ReactNative.V8Jsi.Windows" version="0.2.7" targetFramework="native" />
</packages>
14 changes: 0 additions & 14 deletions vnext/Desktop.IntegrationTests/React.Windows.Desktop.IntegrationTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -102,21 +100,9 @@
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
<ProjectReference Include="..\Folly\Folly.vcxproj">
<Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
</ProjectReference>
<ProjectReference Include="..\FollyWin32\FollyWin32.vcxproj">
<Project>{74085F13-2DDE-45E5-A0CA-927AC9D0B953}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
<Project>{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj">
<Project>{11C084A3-A57C-4296-A679-CAC17B603144}</Project>
</ProjectReference>
<ProjectReference Include="..\IntegrationTests\React.Windows.IntegrationTests.vcxproj">
<Project>{700A84FD-F92A-43F1-8D06-B0E0745DF9B5}</Project>
</ProjectReference>
Expand Down
2 changes: 0 additions & 2 deletions vnext/Desktop.UnitTests/React.Windows.Desktop.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=;
Expand Down
3 changes: 1 addition & 2 deletions vnext/Desktop/React.Windows.Desktop.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -196,6 +194,7 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Warning Condition="'$(USE_V8)' != 'true'" Text="Building desktop project without USE_V8 (value is '$(USE_V8)')" />
<Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
Expand Down
3 changes: 0 additions & 3 deletions vnext/IntegrationTests/React.Windows.IntegrationTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,6 @@
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactWindowsCore\ReactWindowsCore.vcxproj">
<Project>{11C084A3-A57C-4296-A679-CAC17B603144}</Project>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<ClCompile Include="ControllableMessageQueueThread.cpp" />
Expand Down
30 changes: 1 addition & 29 deletions vnext/JSI.Desktop.UnitTests/JSI.Desktop.UnitTests.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,16 +26,9 @@
</PropertyGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
<!-- We cannot include Warnings.props here because Google Test only builds at warning level 3. -->
<ImportGroup Label="ExtensionSettings">
</ImportGroup>
<ImportGroup Label="Shared">
<Import Project="..\Chakra\Chakra.vcxitems" Label="Shared" />
<Import Project="..\Shared\Shared.vcxitems" Label="Shared" />
</ImportGroup>
<ImportGroup Label="PropertySheets">
<Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
</ImportGroup>
<PropertyGroup Label="UserMacros" />
<PropertyGroup>
<IncludePath>$(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)</IncludePath>
<LinkIncremental>true</LinkIncremental>
Expand All @@ -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=;
Expand All @@ -73,16 +64,8 @@
</ClCompile>
<Link>
<AdditionalOptions>-minpdbpathlen:256</AdditionalOptions>
<!--
comsuppw.lib - _com_util::ConvertStringToBSTR
delayimp.lib -
Winhttp.lib - WebSocket resource implementation
-->
<AdditionalDependencies>
comsuppw.lib;
delayimp.lib;
Shlwapi.lib;
Winhttp.lib;
%(AdditionalDependencies)
</AdditionalDependencies>
<GenerateDebugInformation>DebugFull</GenerateDebugInformation>
Expand Down Expand Up @@ -119,21 +102,9 @@
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
<ProjectReference Include="..\Folly\Folly.vcxproj">
<Project>{A990658C-CE31-4BCC-976F-0FC6B1AF693D}</Project>
</ProjectReference>
<ProjectReference Include="..\FollyWin32\FollyWin32.vcxproj">
<Project>{74085F13-2DDE-45E5-A0CA-927AC9D0B953}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactCommon\ReactCommon.vcxproj">
<Project>{A9D95A91-4DB7-4F72-BEB6-FE8A5C89BFBD}</Project>
</ProjectReference>
<ProjectReference Include="..\ReactWindowsCore\ReactWindowsCore-Desktop.vcxproj">
<Project>{11C084A3-A57C-4296-A679-CAC17B603144}</Project>
</ProjectReference>
<ProjectReference Include="..\Desktop\React.Windows.Desktop.vcxproj">
<Project>{95048601-C3DC-475F-ADF8-7C0C764C10D5}</Project>
</ProjectReference>
Expand All @@ -158,6 +129,7 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Warning Condition="'$(USE_V8)' != 'true'" Text="Building desktop project without USE_V8 (value is '$(USE_V8)')" />
<Error Condition="!Exists('$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ReactWindows.OpenSSL.StdCall.Static.1.0.2-p.2\build\native\ReactWindows.OpenSSL.StdCall.Static.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\boost.1.68.0.0\build\boost.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.43\build\native\ChakraCore.Debugger.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.43\build\native\ChakraCore.Debugger.targets'))" />
Expand Down
1 change: 1 addition & 0 deletions vnext/JSI.Desktop.UnitTests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@
<package id="Microsoft.googletest.v140.windesktop.msvcstl.static.rt-dyn" version="1.8.1" targetFramework="native" />
<package id="Microsoft.Windows.CppWinRT" version="2.0.190730.2" targetFramework="native" />
<package id="ReactWindows.OpenSSL.StdCall.Static" version="1.0.2-p.2" targetFramework="native" />
<package id="ReactNative.V8Jsi.Windows" version="0.2.7" targetFramework="native" />
</packages>
6 changes: 1 addition & 5 deletions vnext/JSI/Desktop/JSI.Desktop.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,6 @@
<ItemGroup>
<None Include="packages.config" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets" Condition="'$(CHAKRACOREUWP)'!='true'">
<Import Project="$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets" Condition="Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" />
Expand All @@ -89,6 +84,7 @@
<PropertyGroup>
<ErrorText>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}.</ErrorText>
</PropertyGroup>
<Warning Condition="'$(USE_V8)' != 'true'" Text="Building desktop project without USE_V8 (value is '$(USE_V8)')" />
<Error Condition="!Exists('$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\Microsoft.ChakraCore.vc140.1.11.13\build\native\Microsoft.ChakraCore.vc140.targets'))" />
<Error Condition="!Exists('$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.43\build\native\ChakraCore.Debugger.targets')" Text="$([System.String]::Format('$(ErrorText)', '$(SolutionDir)packages\ChakraCore.Debugger.0.0.0.43\build\native\ChakraCore.Debugger.targets'))" />
<Error Condition="!Exists('$(V8_Package)\build\native\ReactNative.V8JSI.Windows.targets') AND '$(USE_V8)' == 'true'" Text="$([System.String]::Format('$(ErrorText)', '$(V8_Package)\build\native\ReactNative.V8JSI.Windows.targets'))" />
Expand Down
5 changes: 0 additions & 5 deletions vnext/JSI/Universal/JSI.Universal.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,11 +115,6 @@
<ItemGroup>
<ClCompile Include="$(MSBuildThisFileDirectory)ChakraJsiRuntime_edgemode.cpp" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Common\Common.vcxproj">
<Project>{fca38f3c-7c73-4c47-be4e-32f77fa8538d}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
</ImportGroup>
Expand Down
2 changes: 0 additions & 2 deletions vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,6 @@
-->
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'=='true'">CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'!='true'">USE_EDGEMODE_JSRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_HERMES)'=='true'">USE_HERMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_V8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>
REACTWINDOWS_BUILD;
RN_PLATFORM=windows;
Expand Down
4 changes: 3 additions & 1 deletion vnext/PropertySheets/React.Cpp.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<HERMES_Version Condition="'$(HERMES_Version)' == ''">0.1.6</HERMES_Version>
<HERMES_Package Condition="'$(HERMES_Package)' == ''">$(SolutionDir)packages\ReactNative.Hermes.Windows.$(HERMES_Version)</HERMES_Package>

<USE_V8 Condition="('$(USE_V8)' == '') Or ('$(Platform)' != 'ARM' AND '$(Platform)' != 'ARM64')">false</USE_V8>
<USE_V8 Condition="('$(USE_V8)' == '') Or ('$(Platform)' == 'ARM' OR '$(Platform)' == 'ARM64')">false</USE_V8>
<V8_Version Condition="'$(V8_Version)' == ''">0.2.7</V8_Version>
<V8_Package Condition="'$(V8_Package)' == ''">$(SolutionDir)packages\ReactNative.V8Jsi.Windows.$(V8_Version)</V8_Package>

Expand All @@ -46,6 +46,8 @@
<ClCompile>
<PreprocessorDefinitions Condition="'$(ENABLE_ETW_TRACING)'=='true'">ENABLE_ETW_TRACING;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(ENABLE_JS_SYSTRACE_TO_ETW)'=='true'">ENABLE_JS_SYSTRACE_TO_ETW;WITH_FBSYSTRACE;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_HERMES)'=='true'">USE_HERMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_V8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
</ClCompile>
</ItemDefinitionGroup>

Expand Down
2 changes: 0 additions & 2 deletions vnext/ReactUWP/ReactUWP.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,8 +90,6 @@
-->
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'=='true'">CHAKRACORE;CHAKRACORE_UWP;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(CHAKRACOREUWP)'!='true'">USE_EDGEMODE_JSRT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_HERMES)'=='true'">USE_HERMES;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions Condition="'$(USE_V8)'=='true'">USE_V8;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<PreprocessorDefinitions>
REACTWINDOWS_BUILD;
RN_PLATFORM=windows;
Expand Down
1 change: 0 additions & 1 deletion vnext/ReactWindows-Desktop.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading