diff --git a/.ado/publish.yml b/.ado/publish.yml index 772bb76280e..1204369393b 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -94,6 +94,7 @@ jobs: msbuildArguments: /p:RNW_PKG_VERSION_STR="$(RNW_PKG_VERSION_STR)" /p:RNW_PKG_VERSION="$(RNW_PKG_VERSION)" + /p:USE_V8=true - template: templates/publish-build-artifacts-for-nuget.yml parameters: @@ -105,6 +106,7 @@ jobs: - job: RnwNativeBuildUniversal displayName: Build Universal dependsOn: RnwNpmPublish + timeoutInMinutes: 90 strategy: matrix: X64Debug: diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 2a0260822fd..d79f64c0e6f 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -51,6 +51,8 @@ steps: /p:PreferredToolArchitecture=${{parameters.preferredToolArchitecture}} /p:PlatformToolset=${{parameters.platformToolset}} /p:BaseIntDir=$(BaseIntDir) + /maxCpuCount:1 + /p:CL_MPCount=1 ${{parameters.msbuildArguments}} - task: PublishBuildArtifacts@1 diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 56a40e33e2d..d3ec014e095 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -53,7 +53,7 @@ jobs: # BuildPlatform: ARM64 pool: vmImage: $(VmImage) - timeoutInMinutes: 60 + timeoutInMinutes: 90 cancelTimeoutInMinutes: 5 steps: @@ -113,7 +113,7 @@ jobs: BuildPlatform: x64 pool: vmImage: $(VmImage) - timeoutInMinutes: 60 + timeoutInMinutes: 90 cancelTimeoutInMinutes: 5 steps: @@ -208,7 +208,7 @@ jobs: ArmRelease: BuildConfiguration: Release BuildPlatform: ARM - timeoutInMinutes: 60 + timeoutInMinutes: 90 cancelTimeoutInMinutes: 5 #pool: # vmImage: $(VmImage) @@ -303,6 +303,7 @@ jobs: msbuildArguments: /p:RNW_PKG_VERSION_STR="Private Build" /p:RNW_PKG_VERSION="1000,0,0,0" + /p:USE_V8=true - task: CmdLine@2 displayName: Build react-native-win32 RNTester bundle diff --git a/change/react-native-windows-2020-06-16-16-10-02-0.61-stable.json b/change/react-native-windows-2020-06-16-16-10-02-0.61-stable.json new file mode 100644 index 00000000000..f6133cdb4b8 --- /dev/null +++ b/change/react-native-windows-2020-06-16-16-10-02-0.61-stable.json @@ -0,0 +1,8 @@ +{ + "type": "patch", + "comment": "Disable V8 by default", + "packageName": "react-native-windows", + "email": "tudorm@microsoft.com", + "dependentChangeType": "patch", + "date": "2020-06-16T23:10:02.316Z" +} diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 9f66b005235..91126c092fa 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) - true + false 0.2.7 $(SolutionDir)packages\ReactNative.V8Jsi.Windows.$(V8_Version)