diff --git a/.ado/publish.yml b/.ado/publish.yml index 772bb76280e..6f8d8540b90 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 @@ -149,7 +149,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 cbeafed902e..a222ac53ee0 100644 --- a/.ado/templates/e2e-test-job.yml +++ b/.ado/templates/e2e-test-job.yml @@ -9,16 +9,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.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) 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 38d7cfae5a8..adcb90c6eb1 100644 --- a/.ado/templates/react-native-init.yml +++ b/.ado/templates/react-native-init.yml @@ -84,7 +84,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: VSBuild@1 displayName: VSBuild - testcli diff --git a/.ado/variables/msbuild.yml b/.ado/variables/msbuild.yml index bd2a5b1eda1..e3294856312 100644 --- a/.ado/variables/msbuild.yml +++ b/.ado/variables/msbuild.yml @@ -1,7 +1,7 @@ variables: MSBuildArchitecture: x64 MSBuildPreferredToolArchitecture: x64 - MSBuildPlatformToolset: v141 + 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/vs2017.yml b/.ado/variables/vs2017.yml deleted file mode 100644 index f455916e7fe..00000000000 --- a/.ado/variables/vs2017.yml +++ /dev/null @@ -1,6 +0,0 @@ -variables: - VmImage: vs2017-win2016 - MSBuildVersion: 15.0 - GoogleTestAdapterPath: 'C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\Common7\IDE\Extensions\drknwe51.xnq' - BaseIntDir: $(Agent.HomeDirectory)\BaseIntDir # redirect to C: - runCodesignValidationInjection: false \ No newline at end of file diff --git a/.ado/variables/vs2019.yml b/.ado/variables/vs2019.yml index d6de0123dc0..3911a83214c 100644 --- a/.ado/variables/vs2019.yml +++ b/.ado/variables/vs2019.yml @@ -1,7 +1,7 @@ variables: VmImage: windows-2019 - 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 + 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: - runCodesignValidationInjection: false \ No newline at end of file + runCodesignValidationInjection: false diff --git a/.ado/windows-vs-pr.yml b/.ado/windows-vs-pr.yml index 56a40e33e2d..63e85980a9e 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 @@ -63,14 +63,14 @@ jobs: - task: VisualStudioTestPlatformInstaller@1 inputs: - testPlatformVersion: 15.9.2 - condition: and(ne(variables.BuildPlatform, 'ARM'), ne(variables.BuildPlatform, 'ARM64')) + testPlatformVersion: latestStable + condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64')) - template: templates/build-rnw.yml parameters: 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 @@ -89,8 +89,8 @@ jobs: configuration: $(BuildConfiguration) publishRunAttachments: true collectDumpOn: onAbortOnly - vsTestVersion: 15.0 - condition: and(ne(variables.BuildPlatform, 'ARM'), ne(variables.BuildPlatform, 'ARM64')) + vsTestVersion: latest + condition: and(ne(variables.BuildPlatform, 'arm'), ne(variables.BuildPlatform, 'arm64')) - template: templates/publish-build-artifacts-for-nuget.yml parameters: @@ -123,7 +123,7 @@ jobs: - template: templates/prepare-env.yml parameters: - vsComponents: $(VsComponents),Microsoft.VisualStudio.Component.VC.v141.ARM,Microsoft.VisualStudio.Component.VC.v141.ARM64 + vsComponents: $(VsComponents) yarnBuildCmd: build - task: NuGetCommand@2 @@ -210,16 +210,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 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 diff --git a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj index 954d78e4f10..567757103e8 100644 --- a/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.csproj +++ b/packages/E2ETest/windows/ReactUWPTestApp/ReactUWPTestApp.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 @@ -148,8 +148,8 @@ - - 14.0 + + 16.0 diff --git a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj index d3ab465c22b..9019932c1e1 100644 --- a/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.csproj +++ b/packages/E2ETest/windows/TreeDumpLibrary/TreeDumpLibrary.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 @@ -106,8 +106,8 @@ - - 14.0 + + 16.0 - + true @@ -9,7 +9,7 @@ SampleAppCpp SampleAppCpp en-US - 15.0 + 16.0 true Windows Store 10.0 @@ -70,7 +70,6 @@ Application - $(DefaultPlatformToolset) Unicode 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 100cf7f4b90..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 @@ -45,9 +45,6 @@ DynamicLibrary - v140 - v141 - v142 Unicode false 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 - \ No newline at end of file + diff --git a/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.shproj b/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.shproj index bd88fcd3dd6..4c511a40948 100644 --- a/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.shproj +++ b/vnext/Microsoft.ReactNative.SharedManaged/Microsoft.ReactNative.SharedManaged.shproj @@ -1,8 +1,8 @@ - + 67a1076f-7790-4203-86ea-4402ccb5e782 - 14.0 + 16.0 diff --git a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj index e7e59193adf..0d1aaf1de6c 100644 --- a/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj +++ b/vnext/Microsoft.ReactNative/Microsoft.ReactNative.vcxproj @@ -1,6 +1,6 @@ - + true @@ -10,7 +10,7 @@ Microsoft.ReactNative Microsoft.ReactNative en-US - 14.0 + 16.0 true Windows Store 10.0 @@ -58,7 +58,6 @@ DynamicLibrary - v141 Unicode false diff --git a/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj b/vnext/Mso.UnitTests/Mso.UnitTests.vcxproj index 42df06e57cc..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 @@ -35,9 +35,6 @@ Application - v140 - v141 - v141 Unicode @@ -72,7 +69,6 @@ Level4 /await %(AdditionalOptions) /bigobj true - stdcpp17 Cdecl @@ -165,4 +161,4 @@ - \ No newline at end of file + diff --git a/vnext/PropertySheets/React.Cpp.props b/vnext/PropertySheets/React.Cpp.props index efde07e6711..b7642dad308 100644 --- a/vnext/PropertySheets/React.Cpp.props +++ b/vnext/PropertySheets/React.Cpp.props @@ -3,14 +3,14 @@ en-US - 15.0 + 16.0 10.0.18362.0 10.0.16299.0 - v141 + $(DefaultPlatformToolset) false Unicode diff --git a/vnext/ReactCommon/ReactCommon.vcxproj b/vnext/ReactCommon/ReactCommon.vcxproj index 5fcc3ad16f0..e3012ece14d 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj +++ b/vnext/ReactCommon/ReactCommon.vcxproj @@ -1,5 +1,5 @@ - + Debug @@ -160,7 +160,8 @@ - + + diff --git a/vnext/ReactCommon/ReactCommon.vcxproj.filters b/vnext/ReactCommon/ReactCommon.vcxproj.filters index 05701b1620a..c8283bfc971 100644 --- a/vnext/ReactCommon/ReactCommon.vcxproj.filters +++ b/vnext/ReactCommon/ReactCommon.vcxproj.filters @@ -1,5 +1,5 @@ - + {7f5b0b9a-6a9b-4927-b92e-b796d8722357} @@ -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 @@ -135,8 +135,11 @@ turbomodule\core - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon + + + yoga\event @@ -260,11 +263,11 @@ turbomodule\core - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon - - jscallinvoker\jsireact + + jscallinvoker\ReactCommon 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/ReactWindows-Universal.sln b/vnext/ReactWindows-Universal.sln index ff1c14352af..26ab3043ab3 100644 --- a/vnext/ReactWindows-Universal.sln +++ b/vnext/ReactWindows-Universal.sln @@ -302,7 +302,6 @@ Global {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 - {6C60E295-C8CA-4DC5-B8BE-09888F58B249}.Release|x86.Build.0 = 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 @@ -316,6 +315,8 @@ Global {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|x64.ActiveCfg = Debug|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Debug|x64.Build.0 = Debug|x64 @@ -324,6 +325,8 @@ Global {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|x64.ActiveCfg = Release|x64 {46D76F7A-8FD9-4A7D-8102-2857E5DA6B84}.Release|x64.Build.0 = Release|x64 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/Scripts/Tfs/Install-VSFeatures.ps1 b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 index 7538d882036..790d32c7838 100644 --- a/vnext/Scripts/Tfs/Install-VSFeatures.ps1 +++ b/vnext/Scripts/Tfs/Install-VSFeatures.ps1 @@ -20,10 +20,14 @@ $Components | ForEach-Object { $componentList += '--add', $_ } +$VsInstallOutputDir = "${env:System_DefaultWorkingDirectory}\vs" + +New-Item -ItemType directory -Path $VsInstallOutputDir + Start-Process ` -FilePath "$VsInstaller" ` -ArgumentList ( ` - '--layout', "${env:System_DefaultWorkingDirectory}\vs", + '--layout', "$VsInstallOutputDir", '--wait', '--norestart', '--quiet' + ` @@ -33,7 +37,7 @@ Start-Process ` -PassThru Start-Process ` - -FilePath "${env:System_DefaultWorkingDirectory}\vs\vs_Enterprise.exe" ` + -FilePath "$VsInstallOutputDir\vs_Enterprise.exe" ` -ArgumentList ( 'modify', '--installPath', "`"$VsInstallPath`"" , 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 6159889fdbb..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 @@ -29,26 +29,22 @@ StaticLibrary true - v141 Unicode StaticLibrary false - v141 true Unicode StaticLibrary true - v141 Unicode StaticLibrary false - v141 true Unicode diff --git a/vnext/include/ReactUWP/Utils/PropertyUtils.h b/vnext/include/ReactUWP/Utils/PropertyUtils.h index b7c7961928c..b97fe199dd3 100644 --- a/vnext/include/ReactUWP/Utils/PropertyUtils.h +++ b/vnext/include/ReactUWP/Utils/PropertyUtils.h @@ -477,9 +477,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/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj b/vnext/local-cli/generator-windows/templates/cpp/proj/MyApp.vcxproj index a433540e4eb..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 @@ -56,7 +56,6 @@ Application - $(DefaultPlatformToolset) Unicode 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 diff --git a/vnext/local-cli/runWindows/utils/msbuildtools.js b/vnext/local-cli/runWindows/utils/msbuildtools.js index b529e508bd8..b4db1c6f1ef 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 (msBuildProps) { @@ -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', ); } }