Skip to content

Commit e3bb384

Browse files
committed
fix(Build): Deprecate VS 2017 to support latest .NET Core
Build tools for Microsoft.NETCore.UniversalWindowsPlatform 5.3 and higher are only compatible with VS 2017 and higher.
1 parent 420d0b3 commit e3bb384

File tree

6 files changed

+14
-17
lines changed

6 files changed

+14
-17
lines changed

CONTRIBUTING.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ You can use it to test your changes to React Native Windows by making sure your
3131
#### But How?
3232
Before starting make sure you have run `npm install` in the react-native-windows directory. Additionally, make sure the RNTester submodule is up to date by running `git pull --recursive-submodules` from the react-native-windows directory.
3333

34-
Use Visual Studio 2015 or higher, with the Windows 10 SDK 10.0.14393 or higher.
34+
Use Visual Studio 2017 or higher, with the Windows 10 SDK 10.0.14393 or higher.
3535

3636
1. Open the RNTester solution file (react-native-windows/RNTester/RNTester.sln) in Visual Studio
3737
2. Set RNTesterApp as the StartUp project

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ See the official [React Native website](https://facebook.github.io/react-native/
3030
- You can build and deploy React Native Windows apps on the Pro or Enterprise versions of Windows 7 SP1, Windows 8.1, or Windows 10
3131
- You cannot run the emulators and some other developer tooling on the "Starter" or "Home" versions of these operating systems
3232
- You can run React Native Windows UWP apps only on Windows 10 devices, but React Native Windows WPF apps will run on Windows 7-10 so long as .NET 4.6 is installed on the end user's machine
33-
- Download [Visual Studio 2017 Community or Greater](https://www.visualstudio.com/downloads/). (Visual Studio 2015 support is being deprecated.)
33+
- Download [Visual Studio 2017 Community or Greater](https://www.visualstudio.com/downloads/). (Visual Studio 2015 support has been deprecated.)
3434
- You will need to start Visual Studio after it is installed to do some final setup before it can be used to build or run your React Native Windows application
3535
- [Windows 10 SDK Build 14393](https://developer.microsoft.com/en-us/windows/downloads/sdk-archive)
3636

ReactWindows/ChakraBridge/ChakraBridge.vcxproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -42,35 +42,35 @@
4242
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
4343
<ConfigurationType>DynamicLibrary</ConfigurationType>
4444
<UseDebugLibraries>true</UseDebugLibraries>
45-
<PlatformToolset>v140</PlatformToolset>
45+
<PlatformToolset>v141</PlatformToolset>
4646
</PropertyGroup>
4747
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'" Label="Configuration">
4848
<ConfigurationType>DynamicLibrary</ConfigurationType>
4949
<UseDebugLibraries>true</UseDebugLibraries>
50-
<PlatformToolset>v140</PlatformToolset>
50+
<PlatformToolset>v141</PlatformToolset>
5151
</PropertyGroup>
5252
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
5353
<ConfigurationType>DynamicLibrary</ConfigurationType>
5454
<UseDebugLibraries>true</UseDebugLibraries>
55-
<PlatformToolset>v140</PlatformToolset>
55+
<PlatformToolset>v141</PlatformToolset>
5656
</PropertyGroup>
5757
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
5858
<ConfigurationType>DynamicLibrary</ConfigurationType>
5959
<UseDebugLibraries>false</UseDebugLibraries>
6060
<WholeProgramOptimization>true</WholeProgramOptimization>
61-
<PlatformToolset>v140</PlatformToolset>
61+
<PlatformToolset>v141</PlatformToolset>
6262
</PropertyGroup>
6363
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'" Label="Configuration">
6464
<ConfigurationType>DynamicLibrary</ConfigurationType>
6565
<UseDebugLibraries>false</UseDebugLibraries>
6666
<WholeProgramOptimization>true</WholeProgramOptimization>
67-
<PlatformToolset>v140</PlatformToolset>
67+
<PlatformToolset>v141</PlatformToolset>
6868
</PropertyGroup>
6969
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
7070
<ConfigurationType>DynamicLibrary</ConfigurationType>
7171
<UseDebugLibraries>false</UseDebugLibraries>
7272
<WholeProgramOptimization>true</WholeProgramOptimization>
73-
<PlatformToolset>v140</PlatformToolset>
73+
<PlatformToolset>v141</PlatformToolset>
7474
</PropertyGroup>
7575
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
7676
<ImportGroup Label="ExtensionSettings">

appveyor.yml

+3-6
Original file line numberDiff line numberDiff line change
@@ -5,16 +5,13 @@ max_jobs: 2
55
environment:
66
nodejs_version: "LTS"
77
matrix:
8-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
9-
PLATFORM_TOOLSET: v140
8+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
109
CONFIGURATION: Debug
1110
PLATFORM: x64
12-
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015
13-
PLATFORM_TOOLSET: v140
11+
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
1412
CONFIGURATION: Debug
1513
PLATFORM: ARM
1614
- APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017
17-
PLATFORM_TOOLSET: v141
1815
CONFIGURATION: ReleaseBundle
1916
PLATFORM: x86
2017

@@ -63,7 +60,7 @@ before_build:
6360
build_script:
6461
- ps: mkdir $env:bundle_dir
6562
- ps: react-native bundle --platform windows --entry-file $($env:playgroundNet46_dir + "\index.windows.js") --bundle-output $($env:bundle_dir + "\index.windows.bundle") --assets-dest $env:bundle_dir --dev false; echo "Suppressing error"
66-
- ps: msbuild /p:Configuration=$env:CONFIGURATION /p:Platform=$env:PLATFORM /p:PlatformToolset=$env:PLATFORM_TOOLSET /nologo /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "ReactWindows\ReactNative.sln"
63+
- ps: msbuild /p:Configuration=$env:CONFIGURATION /p:Platform=$env:PLATFORM /nologo /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" "ReactWindows\ReactNative.sln"
6764

6865
# Start Winium in the background, give it a moment to start
6966
before_test:

docs/GettingStarted.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ React Native Windows is not currently supported by Expo. If you have a React Nat
7777
- If there is not a retarget option:
7878
- Select "Reload", and the Visual Studio installer will open.
7979
- Make sure to close Visual Studio before installing
80-
- Make sure the 10.0.10586.0 Windows 10 SDK is selected along with any other preselected components, and click "Modify" in the installer to install the components
80+
- Make sure the 10.0.14393.0 Windows 10 SDK is selected along with any other preselected components, and click "Modify" in the installer to install the components
8181
- Retargeting the ChakraBridge project should be possible, so proceed to the next instructions regarding if there is a retarget option
8282
- If there is a retarget option:
8383
- Retarget by right clicking on the ChakraBridge project in the Solution Explorer and selecting "Retarget Projects" and pressing okay on the popup dialog (Platform Toolset should say "Upgrade to v141" in the dialog).
@@ -105,4 +105,4 @@ A new Command Prompt window will open with the React packager as well as a React
105105

106106
## Setup Troubleshooting
107107

108-
If you happen to run into issues while setting up React Native Windows on your machine, check out the [Setup Troubleshooting](SetupTroubleshooting.md) documentation.
108+
If you happen to run into issues while setting up React Native Windows on your machine, check out the [Setup Troubleshooting](SetupTroubleshooting.md) documentation.

local-cli/generator-windows/templates/src/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"Microsoft.NETCore.UniversalWindowsPlatform": "6.0.1"
44
},
55
"frameworks": {
6-
"uap10.0": {}
6+
"uap10.0.10240": {}
77
},
88
"runtimes": {
99
"win10-arm": {},

0 commit comments

Comments
 (0)