From 8ce5ad3b1fbd7cdaa56e46aac675a5c08b3c5910 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 11:14:08 -0800 Subject: [PATCH 01/33] Update ADO builds to use VS 2019 and v142 toolset --- .ado/publish.yml | 4 ++-- .ado/templates/e2e-test-job.yml | 10 +--------- .ado/templates/prepare-env.yml | 2 +- .ado/templates/react-native-init.yml | 2 +- .ado/variables/msbuild.yml | 6 +++--- .ado/variables/vs2019.yml | 2 +- .ado/windows-vs-pr.yml | 12 ++++++------ 7 files changed, 15 insertions(+), 23 deletions(-) diff --git a/.ado/publish.yml b/.ado/publish.yml index 9035f86e6e5..5484d552084 100644 --- a/.ado/publish.yml +++ b/.ado/publish.yml @@ -2,7 +2,7 @@ name: 0.0.$(Date:yyMM.d)$(Rev:rrr) variables: - template: variables/msbuild.yml - - template: variables/vs2017.yml + - template: variables/vs2019.yml trigger: batch: true @@ -157,7 +157,7 @@ jobs: - template: templates/build-rnw.yml parameters: project: vnext/ReactWindows-Universal.sln - vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64 + vsComponents: $(VsComponents) - template: templates/publish-build-artifacts-for-nuget.yml parameters: diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index 016894fb785..b4e36d8861d 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -10,16 +10,8 @@ jobs: dependsOn: Setup condition: ne( dependencies.Setup.outputs['checkPayload.shouldSkipPRBuild'], 'True' ) - # E2ETest is in the pipeline of windows-vs-pr, but windows-vs-pr is still using vs2017.yml - # E2ETest can only be executed on windows-2019 or above, so force to use windows-2019 image and override vs2017.yml variables - # so pool and variables are hard coded here. pool: - vmImage: windows-2019 - variables: - VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 - BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir - runCodesignValidationInjection: false - VmImage: windows-2019 + vmImage: $(VmImage) timeoutInMinutes: 60 # how long to run the job before automatically cancelling cancelTimeoutInMinutes: 5 # how much time to give 'run always even if cancelled tasks' before killing them diff --git a/.ado/templates/prepare-env.yml b/.ado/templates/prepare-env.yml index 0deaedace9b..baeb1eff5bd 100644 --- a/.ado/templates/prepare-env.yml +++ b/.ado/templates/prepare-env.yml @@ -54,7 +54,7 @@ steps: -InstallerUri ${{ parameters.vsInstallerUri }} -Components ${{ parameters.vsComponents }} -Collect:$${{ parameters.debug }} - condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + condition: and(ne('${{ parameters.vsComponents }}', ''), eq(variables['VmImage'], 'windows-2019')) # Note that this is evaluated at parsing, so parameters.vsComponents is never empty - task: PowerShell@2 displayName: List disksize after prepare-env diff --git a/.ado/templates/react-native-init.yml b/.ado/templates/react-native-init.yml index aef764a3fe8..8a69648209a 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -90,7 +90,7 @@ steps: arguments: -InstallerUri ${{ parameters.vsInstallerUri }} -Components ${{ parameters.vsComponents }} - condition: and(ne('${{parameters.vsComponents}}', ''), eq(variables['VmImage'], 'windows-2019')) + condition: and(ne('${{ parameters.vsComponents }}', ''), eq(variables['VmImage'], 'windows-2019')) # Note that this is evaluated at parsing, so parameters.vsComponents is never empty - task: MSBuild@1 displayName: MSBuild - testcli diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index bd2a5b1eda1..83a01b1c948 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -1,7 +1,7 @@ variables: - MSBuildArchitecture: x64 - MSBuildPreferredToolArchitecture: x64 - MSBuildPlatformToolset: v141 + MSBuildArchitecture: x86 + MSBuildPreferredToolArchitecture: x86 + MSBuildPlatformToolset: v142 TargetPlatformVersion: 10.0.18362.0 Win10Version: 18362 VsInstallerUri: 'https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe' \ No newline at end of file diff --git a/.ado/variables/vs2019.yml b/.ado/variables/vs2019.yml index d8aea8bc331..8cee6b3215e 100644 --- a/.ado/variables/vs2019.yml +++ b/.ado/variables/vs2019.yml @@ -1,6 +1,6 @@ variables: VmImage: windows-2019 - VsComponents: Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141 + VsComponents: 'Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64' MSBuildVersion: 16.0 GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\Common7\IDE\Extensions\pemwd5jw.szc' BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir # redirect to C: diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 8c28de897df..d2236af7b57 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -9,7 +9,7 @@ pr: variables: - template: variables/msbuild.yml - - template: variables/vs2017.yml # when using vs2019.yml, please remove workaround in e2e-test-job which is forced to use windows-2019 image. + - template: variables/vs2019.yml jobs: - job: Setup @@ -73,7 +73,7 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: - testPlatformVersion: 15.9.2 + testPlatformVersion: latestStable condition: and(eq(variables.BuildPlatform, 'x64'), eq(variables.BuildConfiguration, 'Debug')) - template: templates/build-rnw.yml @@ -81,7 +81,7 @@ jobs: applyRnPatches: $(applyRnPatches) yarnBuildCmd: build project: vnext/ReactWindows-Universal.sln - vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64 + vsComponents: $(VsComponents) - task: VSTest@2 displayName: Run Universal Unit Tests @@ -97,7 +97,7 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: 15.0 + vsTestVersion: latest condition: and(eq(variables.BuildPlatform, 'x64'), eq(variables.BuildConfiguration, 'Debug')) - template: templates/publish-build-artifacts-for-nuget.yml @@ -134,7 +134,7 @@ jobs: - template: templates/prepare-env.yml parameters: applyRnPatches: $(applyRnPatches) - vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64 + vsComponents: $(VsComponents) yarnBuildCmd: build - task: NuGetCommand@2 @@ -547,7 +547,7 @@ jobs: filePath: $(Build.SourcesDirectory)/vnext/Scripts/Tfs/Install-VsFeatures.ps1 arguments: -InstallerUri https://download.visualstudio.microsoft.com/download/pr/c4fef23e-cc45-4836-9544-70e213134bc8/1ee5717e9a1e05015756dff77eb27d554a79a6db91f2716d836df368381af9a1/vs_Enterprise.exe - -Components $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.AR + -Components $(VsComponents) condition: and(ne(variables['VsComponents'], ''), eq(variables['VmImage'], 'windows-2019')) - task: MSBuild@1 From ec8b9a5b722fd613572f6ffe1b6a16a3231b2efb Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 12:14:00 -0800 Subject: [PATCH 02/33] Update projects for VS 2019 and v142 --- .../windows/SampleApps.sln | 57 ------------ .../SampleLibraryCPP/SampleLibraryCPP.vcxproj | 4 +- .../windows/playground/Playground.vcxproj | 2 +- .../react-native-windows-extended.vcxproj | 2 +- .../turbomodule/core/TurboModuleBinding.cpp | 87 +++++++++++++++++++ ...icrosoft.ReactNative.Cxx.UnitTests.vcxproj | 5 +- .../Microsoft.ReactNative.vcxproj | 2 +- vnext/Mso.UnitTests/Mso.UnitTests.vcxproj | 5 +- vnext/PropertySheets/React.Cpp.props | 2 +- vnext/ReactUWP/Utils/PropertyUtils.h | 4 +- vnext/Scripts/Tfs/Install-VSFeatures.ps1 | 8 +- vnext/V8Inspector/V8Inspector.vcxproj | 8 +- .../runWindows/utils/msbuildtools.js | 60 ++++--------- 13 files changed, 123 insertions(+), 123 deletions(-) create mode 100644 vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln index ef77c18378b..2ebfd4b4138 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleApps.sln @@ -41,14 +41,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "..\..\..\vnext\Co EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ReactNative", "ReactNative", "{5EA20F54-880A-49F3-99FA-4B3FE54E8AB1}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Microsoft.ReactNative.Cxx.UnitTests", "..\..\..\vnext\Microsoft.ReactNative.Cxx.UnitTests\Microsoft.ReactNative.Cxx.UnitTests.vcxproj", "{6C60E295-C8CA-4DC5-B8BE-09888F58B249}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.UnitTests", "..\..\..\vnext\Microsoft.ReactNative.Managed.UnitTests\Microsoft.ReactNative.Managed.UnitTests.csproj", "{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "..\..\..\vnext\Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "..\..\..\vnext\Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "..\..\..\vnext\Mso\Mso.vcxitems", "{84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Include", "..\..\..\vnext\include\Include.vcxitems", "{EF074BA1-2D54-4D49-A28E-5E040B47CD2E}" @@ -57,13 +51,9 @@ Global GlobalSection(SharedMSBuildProjectFiles) = preSolution ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{09f4e6c1-2d12-4059-aa96-0b190861fd6a}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 - ..\..\..\vnext\Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 ..\..\..\vnext\Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 - ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{46d76f7a-8fd9-4a7d-8102-2857e5da6b84}*SharedItemsImports = 4 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{47eec7f3-40d3-49ba-82c1-eaf103b54215}*SharedItemsImports = 4 ..\..\..\vnext\Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 - ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 - ..\..\..\vnext\Mso\Mso.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 ..\..\..\vnext\Mso\Mso.vcxitems*{84e05bfa-cbaf-4f0d-bfb6-4ce85742a57e}*SharedItemsImports = 9 ..\..\..\vnext\Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{93f7572c-64b9-4096-9ef9-6ba0ede2b50d}*SharedItemsImports = 4 ..\..\..\vnext\JSI\Shared\JSI.Shared.vcxitems*{a62d504a-16b8-41d2-9f19-e2e86019e5e4}*SharedItemsImports = 4 @@ -243,50 +233,6 @@ Global {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x64.Build.0 = Release|x64 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.ActiveCfg = Release|Win32 {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D}.Release|x86.Build.0 = Release|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM.ActiveCfg = Debug|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|ARM64.ActiveCfg = Debug|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.ActiveCfg = Debug|x64 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.Build.0 = Debug|x64 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.ActiveCfg = Debug|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM.ActiveCfg = Release|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM64.ActiveCfg = Release|Win32 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.ActiveCfg = Release|x64 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.Build.0 = Release|x64 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.ActiveCfg = Release|Win32 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.ActiveCfg = Debug|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Build.0 = Debug|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Deploy.0 = Debug|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Build.0 = Debug|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.ActiveCfg = Debug|x86 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Build.0 = Debug|x86 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Deploy.0 = Debug|x86 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.ActiveCfg = Release|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Build.0 = Release|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Deploy.0 = Release|ARM - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Build.0 = Release|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Deploy.0 = Release|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.ActiveCfg = Release|x86 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Build.0 = Release|x86 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Deploy.0 = Release|x86 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM.ActiveCfg = Debug|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM.ActiveCfg = Release|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64.ActiveCfg = Release|Win32 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -302,10 +248,7 @@ Global {DA8B35B3-DA00-4B02-BDE6-6A397B3FD46B} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {67A1076F-7790-4203-86EA-4402CCB5E782} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {FCA38F3C-7C73-4C47-BE4E-32F77FA8538D} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {6C60E295-C8CA-4DC5-B8BE-09888F58B249} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {2049DBE9-8D13-42C9-AE4B-413AE38FFFD0} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} - {1958CEAA-FBE0-44E3-8A99-90AD85531FFE} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {84E05BFA-CBAF-4F0D-BFB6-4CE85742A57E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} {EF074BA1-2D54-4D49-A28E-5E040B47CD2E} = {5EA20F54-880A-49F3-99FA-4B3FE54E8AB1} EndGlobalSection diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj index 774a285e6c4..1664b09a337 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj @@ -45,9 +45,7 @@ DynamicLibrary - v140 - v141 - v142 + $(DefaultPlatformToolset) Unicode false diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj index 39d0396d1b4..c779fa5aef1 100644 --- a/packages/playground/windows/playground/Playground.vcxproj +++ b/packages/playground/windows/playground/Playground.vcxproj @@ -38,7 +38,7 @@ Application - v141 + $(DefaultPlatformToolset) true diff --git a/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj b/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj index f41d9029e71..196754acf12 100644 --- a/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj +++ b/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj @@ -41,7 +41,7 @@ StaticLibrary true - v141 + $(DefaultPlatformToolset) diff --git a/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp new file mode 100644 index 00000000000..74615369119 --- /dev/null +++ b/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp @@ -0,0 +1,87 @@ +/** + * Copyright (c) Facebook, Inc. and its affiliates. + * + * This source code is licensed under the MIT license found in the + * LICENSE file in the root directory of this source tree. + */ + +#include "TurboModuleBinding.h" + +#include +#include + +#include +#include + +using namespace facebook; + +namespace facebook { +namespace react { + +/** + * Public API to install the TurboModule system. + */ +TurboModuleBinding::TurboModuleBinding( + const TurboModuleProviderFunctionType &moduleProvider) + : moduleProvider_(moduleProvider) {} + +void TurboModuleBinding::install( + jsi::Runtime &runtime, + std::shared_ptr binding) { + runtime.global().setProperty( + runtime, + "__turboModuleProxy", + jsi::Function::createFromHostFunction( + runtime, + jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"), + 1, + [binding]( + jsi::Runtime &rt, + const jsi::Value &thisVal, + const jsi::Value *args, + size_t count) { + return binding->jsProxy(rt, thisVal, args, count); + })); +} + +void TurboModuleBinding::invalidate() const { + // TODO (T45804587): Revisit this invalidation logic. + // The issue was that Promise resolve/reject functions that are invoked in + // some distance future might end up accessing PromiseWrapper that was already + // destroyed, if the binding invalidation removed it from the + // LongLivedObjectCollection. + + // LongLivedObjectCollection::get().clear(); +} + +std::shared_ptr TurboModuleBinding::getModule( + const std::string &name) { + std::shared_ptr module = nullptr; + { + SystraceSection s("TurboModuleBinding::getModule", "module", name); + module = moduleProvider_(name); + } + return module; +} + +jsi::Value TurboModuleBinding::jsProxy( + jsi::Runtime &runtime, + const jsi::Value &thisVal, + const jsi::Value *args, + size_t count) { + if (count != 1) { + throw std::invalid_argument( + "TurboModuleBinding::jsProxy arg count must be 1"); + } + std::string moduleName = args[0].getString(runtime).utf8(runtime); + std::shared_ptr module = getModule(moduleName); + + if (module == nullptr) { + return jsi::Value::null(); + } + + return jsi::Object::createFromHostObject(runtime, std::move(module)); +} + +} // namespace react +} // namespace facebook \ No newline at end of file diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj index e9506c5edaa..bb75d190470 100644 --- a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj +++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj @@ -35,9 +35,7 @@ Application - v140 - v141 - v141 + $(DefaultPlatformToolset) Unicode @@ -75,6 +73,7 @@ /await %(AdditionalOptions) /bigobj true stdcpp17 + Cdecl Console diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 2d533783a4e..571c68f1bac 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -58,7 +58,7 @@ DynamicLibrary - v141 + $(DefaultPlatformToolset) Unicode false diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index b705d6d799e..58eaf5738df 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -35,9 +35,7 @@ Application - v140 - v141 - v141 + $(DefaultPlatformToolset) Unicode @@ -73,6 +71,7 @@ /await %(AdditionalOptions) /bigobj true stdcpp17 + Cdecl Console diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 832f8231060..29bfd81a194 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -11,7 +11,7 @@ $(ReactNativeWindows_PlatformToolset) - v141 + v142 false Unicode diff --git a/vnext/ReactUWP/Utils/PropertyUtils.h b/vnext/ReactUWP/Utils/PropertyUtils.h index 4fb2eccbf5c..7380f8c4680 100644 --- a/vnext/ReactUWP/Utils/PropertyUtils.h +++ b/vnext/ReactUWP/Utils/PropertyUtils.h @@ -479,9 +479,9 @@ bool TryUpdateOrientation(const T &element, const std::string &propertyName, con } else if (propertyValue.isString()) { const std::string &valueString = propertyValue.getString(); if (valueString == "horizontal") - element.Orientation(Orientation::Horizontal); + element.Orientation(winrt::Orientation::Horizontal); else if (valueString == "vertical") - element.Orientation(Orientation::Vertical); + element.Orientation(winrt::Orientation::Vertical); } return true; diff --git a/vnext/Scripts/Tfs/Install-VSFeatures.ps1 b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 index 7538d882036..785d137665d 100644 --- a/vnext/Scripts/Tfs/Install-VSFeatures.ps1 +++ b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 @@ -20,10 +20,14 @@ $Components | ForEach-Object { $componentList += '--add', $_ } +$LayoutDir = "${env:System_DefaultWorkingDirectory}\vs" + +New-Item -ItemType directory -Path $LayoutDir + Start-Process ` -FilePath "$VsInstaller" ` -ArgumentList ( ` - '--layout', "${env:System_DefaultWorkingDirectory}\vs", + '--layout', "$LayoutDir", '--wait', '--norestart', '--quiet' + ` @@ -33,7 +37,7 @@ Start-Process ` -PassThru Start-Process ` - -FilePath "${env:System_DefaultWorkingDirectory}\vs\vs_Enterprise.exe" ` + -FilePath "$LayoutDir\vs_Enterprise.exe" ` -ArgumentList ( 'modify', '--installPath', "`"$VsInstallPath`"" , diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj index 1cf4c1df9e3..b57b0cdbb3d 100644 --- a/vnext/V8Inspector/V8Inspector.vcxproj +++ b/vnext/V8Inspector/V8Inspector.vcxproj @@ -29,26 +29,26 @@ StaticLibrary true - v141 + $(DefaultPlatformToolset) Unicode StaticLibrary false - v141 + $(DefaultPlatformToolset) true Unicode StaticLibrary true - v141 + $(DefaultPlatformToolset) Unicode StaticLibrary false - v141 + $(DefaultPlatformToolset) true Unicode diff --git a/vnext/local-cli/runWindows/utils/msbuildtools.js b/vnext/local-cli/runWindows/utils/msbuildtools.js index 802f7f9a87a..c86b38f5a98 100644 --- a/vnext/local-cli/runWindows/utils/msbuildtools.js +++ b/vnext/local-cli/runWindows/utils/msbuildtools.js @@ -22,7 +22,7 @@ const { } = require('./commandWithProgress'); const execSync = require('child_process').execSync; -const MSBUILD_VERSIONS = ['16.0', '15.0', '14.0', '12.0', '4.0']; +const MSBUILD_VERSIONS = ['16.0']; class MSBuildTools { // version is something like 16.0 for 2019 @@ -61,14 +61,6 @@ class MSBuildTools { '/p:AppxBundle=Never', ]; - args.push('/p:PlatformToolset=v141'); - - // Set platform toolset for VS 2017 (this way we can keep the base sln file working for VS 2015) - if (this.version === '15.0') { - args.push('/p:VisualStudioVersion=15.0'); - } else if (this.version === '16.0') { - args.push('/p:VisualStudioVersion=16.0'); - } args.push('/bl'); if (config) { @@ -125,10 +117,7 @@ function VSWhere(requires, version, property) { if (toolsPathOutput) { let toolsPathOutputStr = toolsPathOutput[1]; // Win10 on .NET Native uses x86 arch compiler, if using x64 Node, use x86 tools - if ( - version === '15.0' || - (version === '14.0' && toolsPathOutputStr.indexOf('amd64') > -1) - ) { + if (version === '16.0') { toolsPathOutputStr = path.resolve(toolsPathOutputStr, '..'); } toolsPath = toolsPathOutputStr; @@ -140,27 +129,15 @@ function VSWhere(requires, version, property) { } } -function getVC141Component(version, buildArch) { - if (version === '16.0') { - switch (buildArch.toLowerCase()) { - case 'x86': - case 'x64': - return 'Microsoft.VisualStudio.Component.VC.v141.x86.x64'; - case 'arm': - return 'Microsoft.VisualStudio.Component.VC.v141.ARM'; - case 'arm64': - return 'Microsoft.VisualStudio.Component.VC.v141.ARM64'; - } - } else { - switch (buildArch.toLowerCase()) { - case 'x86': - case 'x64': - return 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'; - case 'arm': - return 'Microsoft.VisualStudio.Component.VC.Tools.ARM'; - case 'arm64': - return 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'; - } +function getVCToolsByArch(buildArch) { + switch (buildArch.toLowerCase()) { + case 'x86': + case 'x64': + return 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64'; + case 'arm': + return 'Microsoft.VisualStudio.Component.VC.Tools.ARM'; + case 'arm64': + return 'Microsoft.VisualStudio.Component.VC.Tools.ARM64'; } } @@ -171,19 +148,12 @@ function checkMSBuildVersion(version, buildArch, verbose) { } // https://aka.ms/vs/workloads - const requires16 = [ - 'Microsoft.Component.MSBuild', - getVC141Component(version, buildArch), - 'Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141', - ]; - const requires15 = [ + const requires = [ 'Microsoft.Component.MSBuild', - getVC141Component(version, buildArch), + getVCToolsByArch(buildArch), 'Microsoft.VisualStudio.ComponentGroup.UWP.VC', ]; - const requires = version === '16.0' ? requires16 : requires15; - const vsPath = VSWhere(requires.join(' '), version, 'installationPath'); const installationVersion = VSWhere( requires.join(' '), @@ -234,11 +204,11 @@ module.exports.findAvailableVersion = function(buildArch, verbose) { throw new Error( `MSBuild tools not found for version ${ process.env.VisualStudioVersion - } (from environment). Make sure all required components have been installed (e.g. v141 support)`, + } (from environment). Make sure all required components have been installed`, ); } else { throw new Error( - 'MSBuild tools not found. Make sure all required components have been installed (e.g. v141 support)', + 'MSBuild tools not found. Make sure all required components have been installed', ); } } From f3cd01957a8ff2d4539b41624d172522c62c9aad Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 13:07:43 -0800 Subject: [PATCH 03/33] Update solutuions for VS 2019 and v142, move unit tests out of sample app solution --- vnext/Microsoft.ReactNative.Cxx/JSValue.h | 4 ++-- vnext/ReactWindows-Universal.sln | 16 ++++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValue.h b/vnext/Microsoft.ReactNative.Cxx/JSValue.h index 6440c61ba06..25ee498c6b6 100644 --- a/vnext/Microsoft.ReactNative.Cxx/JSValue.h +++ b/vnext/Microsoft.ReactNative.Cxx/JSValue.h @@ -233,8 +233,8 @@ inline winrt::Windows::UI::Xaml::Media::Brush JSValue::To() const noexcept { template static JSValue From(const T &value) noexcept { - auto writer = MakeJSValueTreeWriter(); - WriteValue(*writer, value); + auto const& writer = MakeJSValueTreeWriter(); + WriteValue(writer, value); return TakeJSValue(writer); } diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index e458d229384..0941355becf 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -101,9 +101,12 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso", "Mso\Mso.vcxitems", " EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcxitems", "{2049DBE9-8D13-42C9-AE4B-413AE38FFFD0}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 + Mso\Mso.vcxitems*{1958ceaa-fbe0-44e3-8a99-90ad85531ffe}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 @@ -300,11 +303,24 @@ Global {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.ActiveCfg = Debug|x64 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x64.Build.0 = Debug|x64 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.ActiveCfg = Debug|Win32 + {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Debug|x86.Build.0 = Debug|Win32 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM.ActiveCfg = Release|Win32 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|ARM64.ActiveCfg = Release|Win32 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.ActiveCfg = Release|x64 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x64.Build.0 = Release|x64 {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|ARM64.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.ActiveCfg = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x64.Build.0 = Debug|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.ActiveCfg = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Debug|x86.Build.0 = Debug|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|ARM64.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.ActiveCfg = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 + {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 3a17a78fa615a63905eed8bc2bb444c42a5494c6 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 14:05:45 -0800 Subject: [PATCH 04/33] Add comment to deforked file with upstream PR link --- .../ReactCommon/turbomodule/core/TurboModuleBinding.cpp | 4 ++++ vnext/Microsoft.ReactNative.Cxx/JSValue.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp index 74615369119..11064cf9720 100644 --- a/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp +++ b/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp @@ -7,7 +7,11 @@ #include "TurboModuleBinding.h" +//[Windows +// Upstream PR: https://github.com/facebook/react-native/pull/28023 #include +//Windows] + #include #include diff --git a/vnext/Microsoft.ReactNative.Cxx/JSValue.h b/vnext/Microsoft.ReactNative.Cxx/JSValue.h index 25ee498c6b6..41a7276fccb 100644 --- a/vnext/Microsoft.ReactNative.Cxx/JSValue.h +++ b/vnext/Microsoft.ReactNative.Cxx/JSValue.h @@ -233,7 +233,7 @@ inline winrt::Windows::UI::Xaml::Media::Brush JSValue::To() const noexcept { template static JSValue From(const T &value) noexcept { - auto const& writer = MakeJSValueTreeWriter(); + auto const &writer = MakeJSValueTreeWriter(); WriteValue(writer, value); return TakeJSValue(writer); } From 48a6c268b66140a908ef37e66f586a527e93aac0 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 14:36:07 -0800 Subject: [PATCH 05/33] Replace forked file with project change --- .../turbomodule/core/TurboModuleBinding.cpp | 91 ------------------- vnext/ReactCommon/ReactCommon.vcxproj | 2 + vnext/ReactCommon/ReactCommon.vcxproj.filters | 27 +++--- 3 files changed, 17 insertions(+), 103 deletions(-) delete mode 100644 vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp diff --git a/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp b/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp deleted file mode 100644 index 11064cf9720..00000000000 --- a/vnext/DeforkingPatches/ReactCommon/turbomodule/core/TurboModuleBinding.cpp +++ /dev/null @@ -1,91 +0,0 @@ -/** - * Copyright (c) Facebook, Inc. and its affiliates. - * - * This source code is licensed under the MIT license found in the - * LICENSE file in the root directory of this source tree. - */ - -#include "TurboModuleBinding.h" - -//[Windows -// Upstream PR: https://github.com/facebook/react-native/pull/28023 -#include -//Windows] - -#include - -#include -#include - -using namespace facebook; - -namespace facebook { -namespace react { - -/** - * Public API to install the TurboModule system. - */ -TurboModuleBinding::TurboModuleBinding( - const TurboModuleProviderFunctionType &moduleProvider) - : moduleProvider_(moduleProvider) {} - -void TurboModuleBinding::install( - jsi::Runtime &runtime, - std::shared_ptr binding) { - runtime.global().setProperty( - runtime, - "__turboModuleProxy", - jsi::Function::createFromHostFunction( - runtime, - jsi::PropNameID::forAscii(runtime, "__turboModuleProxy"), - 1, - [binding]( - jsi::Runtime &rt, - const jsi::Value &thisVal, - const jsi::Value *args, - size_t count) { - return binding->jsProxy(rt, thisVal, args, count); - })); -} - -void TurboModuleBinding::invalidate() const { - // TODO (T45804587): Revisit this invalidation logic. - // The issue was that Promise resolve/reject functions that are invoked in - // some distance future might end up accessing PromiseWrapper that was already - // destroyed, if the binding invalidation removed it from the - // LongLivedObjectCollection. - - // LongLivedObjectCollection::get().clear(); -} - -std::shared_ptr TurboModuleBinding::getModule( - const std::string &name) { - std::shared_ptr module = nullptr; - { - SystraceSection s("TurboModuleBinding::getModule", "module", name); - module = moduleProvider_(name); - } - return module; -} - -jsi::Value TurboModuleBinding::jsProxy( - jsi::Runtime &runtime, - const jsi::Value &thisVal, - const jsi::Value *args, - size_t count) { - if (count != 1) { - throw std::invalid_argument( - "TurboModuleBinding::jsProxy arg count must be 1"); - } - std::string moduleName = args[0].getString(runtime).utf8(runtime); - std::shared_ptr module = getModule(moduleName); - - if (module == nullptr) { - return jsi::Value::null(); - } - - return jsi::Object::createFromHostObject(runtime, std::move(module)); -} - -} // namespace react -} // namespace facebook \ No newline at end of file diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 9c6b2482253..801c3b49d0a 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -73,6 +73,8 @@ 4715;4146;4251;4800;4804;4305;4722;%(DisableSpecificWarnings) false + + stdexcept false diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters index 6538d2ea366..588176ff3f8 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj.filters +++ b/vnext/ReactCommon/ReactCommon.vcxproj.filters @@ -35,10 +35,13 @@ {c4d010df-7391-4171-8658-9048078a5523} - {d52a2ed0-f060-446c-a049-1dae4aca1194} + {d2eae11a-b021-4d0f-bf0f-cc5a164f2579} - - {5bf47134-bd38-4ada-a2bb-9438240d70cf} + + {103aab63-7882-4777-85a5-8fdbbc8e54f9} + + + {b81cc660-374c-4232-823b-6c76b48564b4} @@ -66,9 +69,6 @@ cxxreact - - cxxreact - cxxreact @@ -138,8 +138,11 @@ turbomodule\core - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon + + + yoga\event @@ -275,11 +278,11 @@ turbomodule\core - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon From 4112efc66ef437105e09276d8731a2b242286a5c Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 14:37:33 -0800 Subject: [PATCH 06/33] Change files --- .../react-native-windows-2020-02-13-14-37-32-vs2019.json | 9 +++++++++ ...tive-windows-extended-2020-02-13-14-37-32-vs2019.json | 9 +++++++++ 2 files changed, 18 insertions(+) create mode 100644 change/react-native-windows-2020-02-13-14-37-32-vs2019.json create mode 100644 change/react-native-windows-extended-2020-02-13-14-37-32-vs2019.json diff --git a/change/react-native-windows-2020-02-13-14-37-32-vs2019.json b/change/react-native-windows-2020-02-13-14-37-32-vs2019.json new file mode 100644 index 00000000000..a8ffabb29dd --- /dev/null +++ b/change/react-native-windows-2020-02-13-14-37-32-vs2019.json @@ -0,0 +1,9 @@ +{ + "type": "prerelease", + "comment": "Switching to VS 2019 and v142 tools", + "packageName": "react-native-windows", + "email": "jthysell@microsoft.com", + "commit": "48a6c268b66140a908ef37e66f586a527e93aac0", + "dependentChangeType": "patch", + "date": "2020-02-13T22:37:32.478Z" +} \ No newline at end of file diff --git a/change/react-native-windows-extended-2020-02-13-14-37-32-vs2019.json b/change/react-native-windows-extended-2020-02-13-14-37-32-vs2019.json new file mode 100644 index 00000000000..cb119586dde --- /dev/null +++ b/change/react-native-windows-extended-2020-02-13-14-37-32-vs2019.json @@ -0,0 +1,9 @@ +{ + "type": "prerelease", + "comment": "Switching to VS 2019 and v142 tools", + "packageName": "react-native-windows-extended", + "email": "jthysell@microsoft.com", + "commit": "48a6c268b66140a908ef37e66f586a527e93aac0", + "dependentChangeType": "patch", + "date": "2020-02-13T22:37:26.611Z" +} \ No newline at end of file From f7a7d354b18b6e001d62bd6ee49a5db7f251b5a1 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 15:06:23 -0800 Subject: [PATCH 07/33] Fixed failing E2Etests --- .../TreeDump/ControlStyleRegularBorder.txt | 10 +++++----- .../Assets/TreeDump/ControlStyleRoundBorder.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt index 0a979e07969..451ad2a2da3 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt @@ -22,7 +22,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51,50 + RenderSize=51.33333,50 VerticalAlignment=Center Visibility=Visible Width=51 @@ -35,7 +35,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51,50 + RenderSize=51.33333,50 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Grid] @@ -656,7 +656,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=12,0,0,2 - RenderSize=90,21 + RenderSize=90,20.66667 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.FontIcon] @@ -762,7 +762,7 @@ HorizontalAlignment=Stretch Margin=12,5,0,7 Padding=0,0,0,0 - RenderSize=756,19 + RenderSize=756,18.66667 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.TextBlock] @@ -771,7 +771,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=756,19 + RenderSize=756,18.66667 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.TextBox] diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt index d498431e020..7f1baa429e0 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt @@ -22,7 +22,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51,50 + RenderSize=51.33333,50 VerticalAlignment=Center Visibility=Visible Width=51 @@ -35,7 +35,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51,50 + RenderSize=51.33333,50 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Grid] @@ -172,7 +172,7 @@ RenderSize=120,50 VerticalAlignment=Center Visibility=Visible - Width=40 + Width=32 [Windows.UI.Xaml.Controls.Grid] Background=#33000000 BorderBrush=#5500FF00 @@ -401,7 +401,7 @@ HorizontalAlignment=Stretch Margin=10,10,10,10 Padding=10,10,10,10 - RenderSize=780,39 + RenderSize=780,38.66667 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Button] @@ -582,7 +582,7 @@ HorizontalAlignment=Stretch Margin=10,10,10,10 Padding=10,10,10,10 - RenderSize=780,39 + RenderSize=780,38.66667 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Primitives.ToggleButton] @@ -656,7 +656,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=12,0,0,2 - RenderSize=90,21 + RenderSize=90,20.66667 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.FontIcon] @@ -762,7 +762,7 @@ HorizontalAlignment=Stretch Margin=12,5,0,7 Padding=0,0,0,0 - RenderSize=756,19 + RenderSize=756,18.66667 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.TextBlock] @@ -771,7 +771,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=756,19 + RenderSize=756,18.66667 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.TextBox] From e9b5ab116f6da26d419feca639540c783aa8d7c4 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 15:07:32 -0800 Subject: [PATCH 08/33] Re-added Microsoft.ReactNative mangaed unit tests --- vnext/ReactWindows-Universal.sln | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 0941355becf..3d96b913fe2 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -103,6 +103,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Shared", "Shared\Shared.vcx EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Mso.UnitTests", "Mso.UnitTests\Mso.UnitTests.vcxproj", "{1958CEAA-FBE0-44E3-8A99-90AD85531FFE}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.ReactNative.Managed.UnitTests", "Microsoft.ReactNative.Managed.UnitTests\Microsoft.ReactNative.Managed.UnitTests.csproj", "{46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution JSI\Shared\JSI.Shared.vcxitems*{0cc28589-39e4-4288-b162-97b959f8b843}*SharedItemsImports = 9 @@ -110,6 +112,7 @@ Global Shared\Shared.vcxitems*{2049dbe9-8d13-42c9-ae4b-413ae38fffd0}*SharedItemsImports = 9 Chakra\Chakra.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 Shared\Shared.vcxitems*{2d5d43d9-cffc-4c40-b4cd-02efb4e2742b}*SharedItemsImports = 4 + Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{46d76f7a-8fd9-4a7d-8102-2857e5da6b84}*SharedItemsImports = 4 Microsoft.ReactNative.SharedManaged\Microsoft.ReactNative.SharedManaged.projitems*{67a1076f-7790-4203-86ea-4402ccb5e782}*SharedItemsImports = 13 Microsoft.ReactNative.Cxx\Microsoft.ReactNative.Cxx.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 Mso\Mso.vcxitems*{6c60e295-c8ca-4dc5-b8be-09888f58b249}*SharedItemsImports = 4 @@ -321,6 +324,30 @@ Global {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x64.Build.0 = Release|x64 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.ActiveCfg = Release|Win32 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE}.Release|x86.Build.0 = Release|Win32 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.ActiveCfg = Debug|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Build.0 = Debug|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Deploy.0 = Debug|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Build.0 = Debug|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.ActiveCfg = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Build.0 = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x86.Deploy.0 = Debug|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.ActiveCfg = Release|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Build.0 = Release|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Deploy.0 = Release|ARM + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Build.0 = Release|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Deploy.0 = Release|ARM64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.ActiveCfg = Release|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Build.0 = Release|x86 + {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x86.Deploy.0 = Release|x86 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE From 42368d1a981c56ee60f8926e3cc5ea11fb7be605 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 15:46:11 -0800 Subject: [PATCH 09/33] Disable broken arm64 managed unit tests --- vnext/ReactWindows-Universal.sln | 4 ---- 1 file changed, 4 deletions(-) diff --git a/vnext/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index 3d96b913fe2..9816598b002 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -328,8 +328,6 @@ Global {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Build.0 = Debug|ARM {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM.Deploy.0 = Debug|ARM {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Build.0 = Debug|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|ARM64.Deploy.0 = Debug|ARM64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.ActiveCfg = Debug|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Deploy.0 = Debug|x64 @@ -340,8 +338,6 @@ Global {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Build.0 = Release|ARM {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM.Deploy.0 = Release|ARM {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.ActiveCfg = Release|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Build.0 = Release|ARM64 - {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|ARM64.Deploy.0 = Release|ARM64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.ActiveCfg = Release|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Deploy.0 = Release|x64 From c0d94c8609365ae9868558d2b6a4cdce7ecd71ef Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 13 Feb 2020 16:04:18 -0800 Subject: [PATCH 10/33] Enable universal unit tests on x86 --- .ado/windows-vs-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index d2236af7b57..f134b60db19 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -74,7 +74,7 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: testPlatformVersion: latestStable - condition: and(eq(variables.BuildPlatform, 'x64'), eq(variables.BuildConfiguration, 'Debug')) + condition: and(ne(variables['BuildPlatform'], 'arm'), ne(variables['BuildPlatform'], 'arm64')) - template: templates/build-rnw.yml parameters: @@ -98,7 +98,7 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: latest - condition: and(eq(variables.BuildPlatform, 'x64'), eq(variables.BuildConfiguration, 'Debug')) + condition: and(ne(variables['BuildPlatform'], 'arm'), ne(variables['BuildPlatform'], 'arm64')) - template: templates/publish-build-artifacts-for-nuget.yml parameters: From 22ff29ff57effcfeba4177250bea3d48e7455e79 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:03:28 -0800 Subject: [PATCH 11/33] Addressing feedback: changing variable name --- vnext/Scripts/Tfs/Install-VSFeatures.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/vnext/Scripts/Tfs/Install-VSFeatures.ps1 b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 index 785d137665d..790d32c7838 100644 --- a/vnext/Scripts/Tfs/Install-VSFeatures.ps1 +++ b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 @@ -20,14 +20,14 @@ $Components | ForEach-Object { $componentList += '--add', $_ } -$LayoutDir = "${env:System_DefaultWorkingDirectory}\vs" +$VsInstallOutputDir = "${env:System_DefaultWorkingDirectory}\vs" -New-Item -ItemType directory -Path $LayoutDir +New-Item -ItemType directory -Path $VsInstallOutputDir Start-Process ` -FilePath "$VsInstaller" ` -ArgumentList ( ` - '--layout', "$LayoutDir", + '--layout', "$VsInstallOutputDir", '--wait', '--norestart', '--quiet' + ` @@ -37,7 +37,7 @@ Start-Process ` -PassThru Start-Process ` - -FilePath "$LayoutDir\vs_Enterprise.exe" ` + -FilePath "$VsInstallOutputDir\vs_Enterprise.exe" ` -ArgumentList ( 'modify', '--installPath', "`"$VsInstallPath`"" , From 8f28776396bd1a03083255ba004394663bf939cd Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:34:20 -0800 Subject: [PATCH 12/33] Addressing feedback: removing langauge standard in proj files --- .../Microsoft.ReactNative.Cxx.UnitTests.vcxproj | 3 +-- vnext/Mso.UnitTests/Mso.UnitTests.vcxproj | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj index bb75d190470..c8e30db4504 100644 --- a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj +++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj @@ -72,7 +72,6 @@ $(MSBuildThisFileDirectory);%(AdditionalIncludeDirectories) /await %(AdditionalOptions) /bigobj true - stdcpp17 Cdecl @@ -158,4 +157,4 @@ - \ No newline at end of file + diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index 58eaf5738df..1a0a5e067c6 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -70,7 +70,6 @@ Level4 /await %(AdditionalOptions) /bigobj true - stdcpp17 Cdecl @@ -162,4 +161,4 @@ - \ No newline at end of file + From 037a5d6bf0d8b4babfdaffa2360a523073436d8a Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:36:56 -0800 Subject: [PATCH 13/33] Addressing feedback: removing ReactNativeWindows_PlatformToolset --- vnext/PropertySheets/React.Cpp.props | 2 -- 1 file changed, 2 deletions(-) diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 29bfd81a194..a98829b68cb 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -10,8 +10,6 @@ - $(ReactNativeWindows_PlatformToolset) - v142 false Unicode From 653da3a670f362d6dfd97dbcb25cbe071d75c73a Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:44:06 -0800 Subject: [PATCH 14/33] Addressing feedback: Moving PlatformToolset to React.Cpp.props --- .../windows/SampleAppCPP/SampleAppCpp.vcxproj | 1 - .../windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj | 1 - packages/playground/windows/playground/Playground.vcxproj | 1 - .../windows/react-native-windows-extended.vcxproj | 1 - .../Microsoft.ReactNative.Cxx.UnitTests.vcxproj | 1 - vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj | 1 - vnext/Mso.UnitTests/Mso.UnitTests.vcxproj | 1 - vnext/PropertySheets/React.Cpp.props | 1 + vnext/V8Inspector/V8Inspector.vcxproj | 4 ---- .../generator-windows/templates/cpp/proj/MyApp.vcxproj | 1 - 10 files changed, 1 insertion(+), 12 deletions(-) diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj index 1f8417e6b31..37a3679da85 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCPP/SampleAppCpp.vcxproj @@ -51,7 +51,6 @@ Application - $(DefaultPlatformToolset) Unicode diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj index 1664b09a337..4a8ab8eb238 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj @@ -45,7 +45,6 @@ DynamicLibrary - $(DefaultPlatformToolset) Unicode false diff --git a/packages/playground/windows/playground/Playground.vcxproj b/packages/playground/windows/playground/Playground.vcxproj index c779fa5aef1..45990e82c6b 100644 --- a/packages/playground/windows/playground/Playground.vcxproj +++ b/packages/playground/windows/playground/Playground.vcxproj @@ -38,7 +38,6 @@ Application - $(DefaultPlatformToolset) true diff --git a/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj b/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj index 196754acf12..bea99ac0401 100644 --- a/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj +++ b/packages/react-native-windows-extended/windows/react-native-windows-extended.vcxproj @@ -41,7 +41,6 @@ StaticLibrary true - $(DefaultPlatformToolset) diff --git a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj index c8e30db4504..e8fd126066d 100644 --- a/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj +++ b/vnext/Microsoft.ReactNative.Cxx.UnitTests/Microsoft.ReactNative.Cxx.UnitTests.vcxproj @@ -35,7 +35,6 @@ Application - $(DefaultPlatformToolset) Unicode diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index 571c68f1bac..b4814dcbbbd 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -58,7 +58,6 @@ DynamicLibrary - $(DefaultPlatformToolset) Unicode false diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index 1a0a5e067c6..97162397718 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -35,7 +35,6 @@ Application - $(DefaultPlatformToolset) Unicode diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index a98829b68cb..049d9685330 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -10,6 +10,7 @@ + $(DefaultPlatformToolset) false Unicode diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj index b57b0cdbb3d..a1a77a27e68 100644 --- a/vnext/V8Inspector/V8Inspector.vcxproj +++ b/vnext/V8Inspector/V8Inspector.vcxproj @@ -29,26 +29,22 @@ StaticLibrary true - $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset) true Unicode StaticLibrary true - $(DefaultPlatformToolset) Unicode StaticLibrary false - $(DefaultPlatformToolset) true Unicode diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index 6890311db54..97371016300 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -56,7 +56,6 @@ Application - $(DefaultPlatformToolset) Unicode From ca20d2f1142805e313efb0898bea71aeccf4f949 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:55:23 -0800 Subject: [PATCH 15/33] Addressing feedback: variables syntax in task condition --- .ado/windows-vs-pr.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index f134b60db19..45ee463c360 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -74,7 +74,7 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: testPlatformVersion: latestStable - condition: and(ne(variables['BuildPlatform'], 'arm'), ne(variables['BuildPlatform'], 'arm64')) + condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64')) - template: templates/build-rnw.yml parameters: @@ -98,7 +98,7 @@ jobs: publishRunAttachments: true collectDumpOn: onAbortOnly vsTestVersion: latest - condition: and(ne(variables['BuildPlatform'], 'arm'), ne(variables['BuildPlatform'], 'arm64')) + condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64')) - template: templates/publish-build-artifacts-for-nuget.yml parameters: From e33c65f60078369f9e192ae1fe5ce5bc351956a4 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 12:58:15 -0800 Subject: [PATCH 16/33] Addressing feedback: reverting e2etest masters --- .../TreeDump/ControlStyleRegularBorder.txt | 10 +++++----- .../Assets/TreeDump/ControlStyleRoundBorder.txt | 16 ++++++++-------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt index 451ad2a2da3..0a979e07969 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRegularBorder.txt @@ -22,7 +22,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51.33333,50 + RenderSize=51,50 VerticalAlignment=Center Visibility=Visible Width=51 @@ -35,7 +35,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51.33333,50 + RenderSize=51,50 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Grid] @@ -656,7 +656,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=12,0,0,2 - RenderSize=90,20.66667 + RenderSize=90,21 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.FontIcon] @@ -762,7 +762,7 @@ HorizontalAlignment=Stretch Margin=12,5,0,7 Padding=0,0,0,0 - RenderSize=756,18.66667 + RenderSize=756,19 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.TextBlock] @@ -771,7 +771,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=756,18.66667 + RenderSize=756,19 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.TextBox] diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt index 7f1baa429e0..d498431e020 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt @@ -22,7 +22,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51.33333,50 + RenderSize=51,50 VerticalAlignment=Center Visibility=Visible Width=51 @@ -35,7 +35,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=51.33333,50 + RenderSize=51,50 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Grid] @@ -172,7 +172,7 @@ RenderSize=120,50 VerticalAlignment=Center Visibility=Visible - Width=32 + Width=40 [Windows.UI.Xaml.Controls.Grid] Background=#33000000 BorderBrush=#5500FF00 @@ -401,7 +401,7 @@ HorizontalAlignment=Stretch Margin=10,10,10,10 Padding=10,10,10,10 - RenderSize=780,38.66667 + RenderSize=780,39 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Button] @@ -582,7 +582,7 @@ HorizontalAlignment=Stretch Margin=10,10,10,10 Padding=10,10,10,10 - RenderSize=780,38.66667 + RenderSize=780,39 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.Primitives.ToggleButton] @@ -656,7 +656,7 @@ HorizontalAlignment=Left Margin=0,0,0,0 Padding=12,0,0,2 - RenderSize=90,20.66667 + RenderSize=90,21 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.FontIcon] @@ -762,7 +762,7 @@ HorizontalAlignment=Stretch Margin=12,5,0,7 Padding=0,0,0,0 - RenderSize=756,18.66667 + RenderSize=756,19 VerticalAlignment=Center Visibility=Visible [Windows.UI.Xaml.Controls.TextBlock] @@ -771,7 +771,7 @@ HorizontalAlignment=Stretch Margin=0,0,0,0 Padding=0,0,0,0 - RenderSize=756,18.66667 + RenderSize=756,19 VerticalAlignment=Stretch Visibility=Visible [Windows.UI.Xaml.Controls.TextBox] From 318378c3b5421c0ecada9c801a9384749ddd9b83 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 14:54:29 -0800 Subject: [PATCH 17/33] Fix ControlStyleRoundBorder E2ETest --- .../ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt index d498431e020..d61ac98872f 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt @@ -172,7 +172,7 @@ RenderSize=120,50 VerticalAlignment=Center Visibility=Visible - Width=40 + Width=32 [Windows.UI.Xaml.Controls.Grid] Background=#33000000 BorderBrush=#5500FF00 From dbe708a7501b465441e95616769eafef35967efc Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 14 Feb 2020 15:17:51 -0800 Subject: [PATCH 18/33] Added better logging to DirectMAnipulation e2e tests --- packages/E2ETest/wdio/test/DirectManipulation.spec.ts | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts index bc609af6a41..7ca9c77b0dd 100644 --- a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts +++ b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts @@ -19,7 +19,10 @@ describe('DirectManipulationTest', () => { result.includes('width='), 'measureInWindow response include width' ); - assert.ok(result.includes('x=0;'), 'measureInWindow response x=0'); + assert.ok( + result.includes('x=0;'), + 'measureInWindow response x!=0, result: ' + result + ); }); it('measureLayout Test', () => { @@ -28,6 +31,9 @@ describe('DirectManipulationTest', () => { result.includes('width=50'), 'measureLayout response has correct width' ); - assert.ok(result.includes('x=20;'), 'measureLayout response x=20'); + assert.ok( + result.includes('x=20;'), + 'measureLayout response x!=20, result: ' + result + ); }); }); From 4d85d55dcd02d7c544b31ae345e2522647353890 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Fri, 27 Mar 2020 11:24:26 -0700 Subject: [PATCH 19/33] Switch back to x64 msbuild --- .ado/variables/msbuild.yml | 4 ++-- .ado/windows-vs-pr.yml | 10 +--------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index 83a01b1c948..e3294856312 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -1,6 +1,6 @@ variables: - MSBuildArchitecture: x86 - MSBuildPreferredToolArchitecture: x86 + MSBuildArchitecture: x64 + MSBuildPreferredToolArchitecture: x64 MSBuildPlatformToolset: v142 TargetPlatformVersion: 10.0.18362.0 Win10Version: 18362 diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 3b504a59c0c..6419f908ba8 100644 --- a/.ado/windows-vs-pr.yml +++ b/.ado/windows-vs-pr.yml @@ -206,16 +206,8 @@ jobs: BuildPlatform: ARM timeoutInMinutes: 60 cancelTimeoutInMinutes: 5 - #pool: - # vmImage: $(VmImage) - # Temporary override until we move to VS 2019 v142 pool: - vmImage: windows-2019 - variables: - VsComponents: Microsoft.Component.MSBuild,Microsoft.VisualStudio.ComponentGroup.UWP.VC,Microsoft.VisualStudio.Component.VC.Tools.x86.x64,Microsoft.VisualStudio.Component.VC.Tools.ARM,Microsoft.VisualStudio.Component.VC.Tools.ARM64,Microsoft.VisualStudio.Component.VC.v141.x86.x64,Microsoft.VisualStudio.ComponentGroup.UWP.VC.v141,Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64 - BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir - runCodesignValidationInjection: false - VmImage: windows-2019 + vmImage: $(VmImage) steps: - checkout: self From e50f95c9c7231914017a06d972e0883e6e4ddec9 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 09:44:08 -0700 Subject: [PATCH 20/33] Try switch to vsbuild --- .ado/templates/build-rnw.yml | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index bc2b612d10a..ac41ffd7511 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -34,17 +34,21 @@ steps: restoreDirectory: packages/ verbosityRestore: Detailed # Options: quiet, normal, detailed - - task: MSBuild@1 - displayName: MSBuild ${{parameters.project}} + - task: VSBuild@1 + displayName: VSBuild ${{parameters.project}} inputs: solution: ${{parameters.project }} - msbuildVersion: ${{parameters.msbuildVersion}} + vsVersion: 16.0 + vsVersion: ${{parameters.msbuildVersion}} msbuildArchitecture: ${{parameters.msBuildArchitecture}} platform: $(BuildPlatform) configuration: $(BuildConfiguration) + clean: false # Optional + maximumCpuCount: false # Optional + restoreNugetPackages: false # Optional createLogFile: true logFileVerbosity: detailed - msbuildArguments: + msbuildArgs: /p:PreferredToolArchitecture=${{parameters.preferredToolArchitecture}} /p:PlatformToolset=${{parameters.platformToolset}} /p:BaseIntDir=$(BaseIntDir) From 32a65334fa8d67cf2b505ced953b918936df8b8d Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 10:00:09 -0700 Subject: [PATCH 21/33] vsbuild update --- .ado/templates/build-rnw.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index ac41ffd7511..2a0260822fd 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -38,7 +38,6 @@ steps: displayName: VSBuild ${{parameters.project}} inputs: solution: ${{parameters.project }} - vsVersion: 16.0 vsVersion: ${{parameters.msbuildVersion}} msbuildArchitecture: ${{parameters.msBuildArchitecture}} platform: $(BuildPlatform) From 88b903d361ef0de7cfd51c9cfeda43388b42c407 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 10:46:21 -0700 Subject: [PATCH 22/33] Added vcvarsamd64_x86.bat --- .ado/templates/build-rnw.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 2a0260822fd..59c1c0efaeb 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -24,6 +24,11 @@ steps: yarnBuildCmd: ${{ parameters.yarnBuildCmd }} debug: ${{ parameters.debug }} + - task: CmdLine@2 + displayName: run vcvarsamd64_x86 + inputs: + script: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat" + - task: NuGetCommand@2 displayName: NuGet restore inputs: From bc2fa3b92c1b671b042e8585b44482565ce2358e Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 10:55:03 -0700 Subject: [PATCH 23/33] Added vcvarsamd64_x86.bat fix --- .ado/templates/build-rnw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 59c1c0efaeb..89af066af6d 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -27,7 +27,7 @@ steps: - task: CmdLine@2 displayName: run vcvarsamd64_x86 inputs: - script: "C:\Program Files (x86)\Microsoft Visual Studio\2019\Enterprise\VC\Auxiliary\Build\vcvarsamd64_x86.bat" + script: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat" - task: NuGetCommand@2 displayName: NuGet restore From f148bd17cff020a9ad2a65300bc6d26f69fc7f4a Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 11:16:04 -0700 Subject: [PATCH 24/33] Call vcvarsamd64_x86.bat with call --- .ado/templates/build-rnw.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index 89af066af6d..a2e66bdd667 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -27,7 +27,7 @@ steps: - task: CmdLine@2 displayName: run vcvarsamd64_x86 inputs: - script: "C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat" + script: "call \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat\"" - task: NuGetCommand@2 displayName: NuGet restore From 09462c1f9df9a254e987449065eaedcc18b98f8f Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 13:59:18 -0700 Subject: [PATCH 25/33] Remove vcvars --- .ado/templates/build-rnw.yml | 5 ----- 1 file changed, 5 deletions(-) diff --git a/.ado/templates/build-rnw.yml b/.ado/templates/build-rnw.yml index a2e66bdd667..2a0260822fd 100644 --- a/.ado/templates/build-rnw.yml +++ b/.ado/templates/build-rnw.yml @@ -24,11 +24,6 @@ steps: yarnBuildCmd: ${{ parameters.yarnBuildCmd }} debug: ${{ parameters.debug }} - - task: CmdLine@2 - displayName: run vcvarsamd64_x86 - inputs: - script: "call \"C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\Enterprise\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat\"" - - task: NuGetCommand@2 displayName: NuGet restore inputs: From b53e6270ae0276d6b7c618a0da7414df59def5ab Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Mon, 30 Mar 2020 15:58:57 -0700 Subject: [PATCH 26/33] Added false to csprojects --- .../windows/ReactUWPTestApp/ReactUWPTestApp.csproj | 1 + .../windows/SampleAppCS/SampleAppCS.csproj | 1 + .../Microsoft.ReactNative.Managed.UnitTests.csproj | 8 +++----- .../generator-windows/templates/cs/proj/MyApp.csproj | 1 + 4 files changed, 6 insertions(+), 5 deletions(-) diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj index a9716bdfeca..d044ace3330 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj +++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj @@ -20,6 +20,7 @@ FCDD40CD2A4E90DD1F10E5C04D5A958E6B5311CA ReactUWPTestApp_TemporaryKey.pfx True + false true diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index a5c6cb7818d..ee5da7af485 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -18,6 +18,7 @@ {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true false + false 7.0 diff --git a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj index 82db9f4026c..20a27c2785d 100644 --- a/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj +++ b/vnext/Microsoft.ReactNative.Managed.UnitTests/Microsoft.ReactNative.Managed.UnitTests.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,11 +13,12 @@ UAP 10.0.18362.0 10.0.15063.0 - 14 + 16 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} $(VisualStudioVersion) false + false true @@ -170,9 +171,6 @@ - - 14.0 - - + true @@ -9,7 +9,7 @@ SampleAppCpp SampleAppCpp en-US - 15.0 + 16.0 true Windows Store 10.0 diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj index 538ad70e4ad..8541bea2cb8 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleAppCS/SampleAppCS.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ UAP 10.0.18362.0 10.0.16299.0 - 14 + 16.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -171,8 +171,8 @@ - - 15.0 + + 16.0 diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj index 2b13c239889..769d961cf6e 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj @@ -1,5 +1,5 @@ - + true @@ -9,7 +9,7 @@ SampleLibraryCpp SampleLibraryCpp en-US - 14.0 + 16.0 true Windows Store 10.0 diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters index 8dacdd35eac..a3d6dd54524 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCPP/SampleLibraryCPP.vcxproj.filters @@ -1,5 +1,5 @@  - + {926ab91d-31b4-48c3-b9a4-e681349f27f0} diff --git a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj index e66fc1490a7..421561f5363 100644 --- a/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj +++ b/packages/microsoft-reactnative-sampleapps/windows/SampleLibraryCS/SampleLibraryCS.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ UAP 10.0.18362.0 10.0.16299.0 - 14 + 16.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} false @@ -110,8 +110,8 @@ - - 14.0 + + 16.0 - + true @@ -10,7 +10,7 @@ Microsoft.ReactNative Microsoft.ReactNative en-US - 14.0 + 16.0 true Windows Store 10.0 diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index c8c294753d0..77e86efcd76 100644 --- a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj +++ b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj @@ -1,11 +1,11 @@ - + true true true - 15.0 + 16.0 {1958CEAA-FBE0-44E3-8A99-90AD85531FFE} Win32Proj MsoUnitTests diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index 01c90f141a5..b7642dad308 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -3,7 +3,7 @@ en-US - 15.0 + 16.0 10.0.18362.0 10.0.16299.0 diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index cf5432f25e0..7df559b510b 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -1,5 +1,5 @@ - + Debug diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters index 49976a45838..c8283bfc971 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj.filters +++ b/vnext/ReactCommon/ReactCommon.vcxproj.filters @@ -1,5 +1,5 @@ - + {7f5b0b9a-6a9b-4927-b92e-b796d8722357} diff --git a/vnext/ReactUWP/ReactUWP.vcxproj b/vnext/ReactUWP/ReactUWP.vcxproj index 7a1b03784c8..0881c95ceab 100644 --- a/vnext/ReactUWP/ReactUWP.vcxproj +++ b/vnext/ReactUWP/ReactUWP.vcxproj @@ -1,5 +1,5 @@ - + diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj index c25bc8d898e..7595beb9b3c 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj @@ -1,5 +1,5 @@ - + Debug diff --git a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters index 27a22657948..04558c87eb6 100644 --- a/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters +++ b/vnext/ReactWindowsCore/ReactWindowsCore.vcxproj.filters @@ -1,5 +1,5 @@  - + {06a27269-2c1f-418a-9e70-82d17deb7de2} diff --git a/vnext/Scripts/OpenSSL.targets b/vnext/Scripts/OpenSSL.targets index b8d12c058b3..17742af400d 100644 --- a/vnext/Scripts/OpenSSL.targets +++ b/vnext/Scripts/OpenSSL.targets @@ -1,5 +1,5 @@ - + diff --git a/vnext/Test/React.Windows.Test.vcxproj b/vnext/Test/React.Windows.Test.vcxproj index 1bcb021d9ed..7714eef1fa4 100644 --- a/vnext/Test/React.Windows.Test.vcxproj +++ b/vnext/Test/React.Windows.Test.vcxproj @@ -1,5 +1,5 @@  - + Debug diff --git a/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj b/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj index 481a0841d68..47ab85a5f78 100644 --- a/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj +++ b/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj @@ -1,5 +1,5 @@ - + {069986c5-80f3-4a56-af79-f24ebb05941f} facebook diff --git a/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj.filters b/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj.filters index da6ac57cc90..2f21a81e707 100644 --- a/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj.filters +++ b/vnext/Universal.IntegrationTests/React.Windows.Universal.IntegrationTests.vcxproj.filters @@ -1,5 +1,5 @@  - + 1cd9d051-2453-4fdb-bf56-9098d19853ec diff --git a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj index 27dbf311c86..d8ec53c802a 100644 --- a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj +++ b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj @@ -1,5 +1,5 @@ - + {6f713ca6-6bfe-4df8-932d-4e49745c967e} ReactUWPUnitTests diff --git a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj.filters b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj.filters index dceca4d4bac..50c0e523324 100644 --- a/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj.filters +++ b/vnext/Universal.UnitTests/React.Windows.Universal.UnitTests.vcxproj.filters @@ -1,5 +1,5 @@  - + 61ecc3af-d49d-45bf-8fe4-53d18b59bbf6 diff --git a/vnext/V8Inspector/V8Inspector.vcxproj b/vnext/V8Inspector/V8Inspector.vcxproj index 3bbb4cb2dd5..3522fe72dde 100644 --- a/vnext/V8Inspector/V8Inspector.vcxproj +++ b/vnext/V8Inspector/V8Inspector.vcxproj @@ -1,5 +1,5 @@ - + Debug @@ -19,7 +19,7 @@ - 15.0 + 16.0 {F1B91D19-79E4-461B-AC8E-E3E6E747F65F} Win32Proj V8Inspector diff --git a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index de4b404e0ea..da48fb3cb65 100644 --- a/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj +++ b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj @@ -1,5 +1,5 @@  - + true @@ -9,7 +9,7 @@ <%=ns%> <%=ns%> en-US - 15.0 + 16.0 true Windows Store 10.0 diff --git a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj index 4f5bb1ec5f1..2b598cbc339 100644 --- a/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj +++ b/vnext/local-cli/generator-windows/templates/cs/proj/MyApp.csproj @@ -1,5 +1,5 @@  - + Debug @@ -13,7 +13,7 @@ UAP 10.0.18362.0 10.0.16299.0 - 14 + 16.0 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} true @@ -160,7 +160,7 @@ - + 16.0 From c06ccd83a684a8d28cc3f81d05ba00f83cda7946 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Tue, 31 Mar 2020 15:31:46 -0700 Subject: [PATCH 29/33] Remove v141 from playground-win32 --- .../playground/windows/playground-win32/Playground-win32.vcxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 2b3d71ba312..57137f3490c 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -37,7 +37,6 @@ Application - v141 Unicode From 9860fbd4f837a5ef23ac277097529b40d7d7ff5f Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Tue, 31 Mar 2020 15:47:23 -0700 Subject: [PATCH 30/33] Remove langstandard from playground-win32 --- .../playground/windows/playground-win32/Playground-win32.vcxproj | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/playground/windows/playground-win32/Playground-win32.vcxproj b/packages/playground/windows/playground-win32/Playground-win32.vcxproj index 57137f3490c..715a3866639 100644 --- a/packages/playground/windows/playground-win32/Playground-win32.vcxproj +++ b/packages/playground/windows/playground-win32/Playground-win32.vcxproj @@ -69,7 +69,6 @@ StdCall true - stdcpp17 Use pch.h true From b4c5f0af098324f557b378cf6c3f8b92db69000c Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Tue, 31 Mar 2020 16:03:04 -0700 Subject: [PATCH 31/33] Fix E2ETEsts --- .ado/templates/e2e-test-job.yml | 2 +- .../ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index a222ac53ee0..2b7aa6da864 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -58,7 +58,7 @@ jobs: - task: CmdLine@2 displayName: run-windows inputs: - script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --logging --msbuildprops BaseIntDir=$(BaseIntDir) + script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --logging --msbuildprops BaseIntDir=$(BaseIntDir),UseDotNetNativeToolchain=false workingDirectory: packages/E2ETest - task: PublishBuildArtifacts@1 diff --git a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt index d61ac98872f..d498431e020 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt +++ b/packages/E2ETest/windows/ReactUWPTestApp/Assets/TreeDump/ControlStyleRoundBorder.txt @@ -172,7 +172,7 @@ RenderSize=120,50 VerticalAlignment=Center Visibility=Visible - Width=32 + Width=40 [Windows.UI.Xaml.Controls.Grid] Background=#33000000 BorderBrush=#5500FF00 From 95c5e0e6731c36d856220d64addd7289d2498937 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Wed, 1 Apr 2020 09:55:36 -0700 Subject: [PATCH 32/33] Moved forced stdexcept include --- vnext/ReactCommon/ReactCommon.vcxproj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 7df559b510b..e3012ece14d 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -73,8 +73,6 @@ 4715;4146;4251;4800;4804;4305;4722;%(DisableSpecificWarnings) false - - stdexcept false @@ -162,7 +160,8 @@ - + + From 31e0f90d417c022460bac06555b4d65f43eb6680 Mon Sep 17 00:00:00 2001 From: "Jon Thysell (JAUNTY)" Date: Thu, 2 Apr 2020 09:54:33 -0700 Subject: [PATCH 33/33] Revert unnecessary E2ETest changes --- .ado/templates/e2e-test-job.yml | 2 +- packages/E2ETest/wdio/test/DirectManipulation.spec.ts | 10 ++-------- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/.ado/templates/e2e-test-job.yml b/.ado/templates/e2e-test-job.yml index 2b7aa6da864..a222ac53ee0 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -58,7 +58,7 @@ jobs: - task: CmdLine@2 displayName: run-windows inputs: - script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --logging --msbuildprops BaseIntDir=$(BaseIntDir),UseDotNetNativeToolchain=false + script: react-native run-windows --no-packager --arch ${{ parameters.BuildPlatform }} --release --logging --msbuildprops BaseIntDir=$(BaseIntDir) workingDirectory: packages/E2ETest - task: PublishBuildArtifacts@1 diff --git a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts index 7ca9c77b0dd..bc609af6a41 100644 --- a/packages/E2ETest/wdio/test/DirectManipulation.spec.ts +++ b/packages/E2ETest/wdio/test/DirectManipulation.spec.ts @@ -19,10 +19,7 @@ describe('DirectManipulationTest', () => { result.includes('width='), 'measureInWindow response include width' ); - assert.ok( - result.includes('x=0;'), - 'measureInWindow response x!=0, result: ' + result - ); + assert.ok(result.includes('x=0;'), 'measureInWindow response x=0'); }); it('measureLayout Test', () => { @@ -31,9 +28,6 @@ describe('DirectManipulationTest', () => { result.includes('width=50'), 'measureLayout response has correct width' ); - assert.ok( - result.includes('x=20;'), - 'measureLayout response x!=20, result: ' + result - ); + assert.ok(result.includes('x=20;'), 'measureLayout response x=20'); }); });