Browse Source

Updated NativeHost.PlatformToolset version (#5797)

pull/5839/head
Sergey Smirnov 4 years ago
committed by GitHub
parent
commit
314350bc98
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      WinForms.vsconfig
  2. 9
      docs/developer-guide.md
  3. 8
      src/System.Windows.Forms/tests/IntegrationTests/NativeHost/NativeHost.vcxproj

2
WinForms.vsconfig

@ -4,7 +4,7 @@
"Microsoft.Component.CodeAnalysis.SDK",
"Microsoft.Component.MSBuild",
"Microsoft.NetCore.Component.DevelopmentTools",
"Microsoft.NetCore.Component.Runtime.5.0",
"Microsoft.NetCore.Component.Runtime.6.0",
"Microsoft.NetCore.Component.SDK",
"Microsoft.VisualStudio.Component.CoreEditor",
"Microsoft.VisualStudio.Component.Debugger.JustInTime",

9
docs/developer-guide.md

@ -6,22 +6,20 @@ The [Issue Guide](issue-guide.md) describes our approach to using GitHub issues.
## Machine Setup
Windows Forms requires the following workloads and components be selected when installing Visual Studio 2019 (16.11):
Windows Forms requires the following workloads and components be selected when installing Visual Studio 2022 (17.0.0):
* Required Workloads:
* .NET Desktop Development
* Desktop development with C++
* Required Individual Components:
* [Required Individual Components][required-individual-components]:
* Windows 10 SDK
* C++/CLI support
:warning: CMake 3.15.5 or later is required. CMake shipped with VS 2019 (3.17.20032601-MSVC_2) does not meet requirements. Install CMake from the [official website][cmake-download] or via [Chocolatey][chocolatey]:
:warning: CMake 3.21.0 or later is required. Install CMake from the [official website][cmake-download] or via [Chocolatey][chocolatey]:
```
choco install cmake --installargs 'ADD_CMAKE_TO_PATH=System'
```
:warning: If you have VS 2022 installed CMake 3.21.0 or later is required.
## Workflow
@ -47,3 +45,4 @@ You first need to [fork][fork] then [clone][clone] this Windows Forms repository
[up-for-grabs]: https://github.com/dotnet/winforms/issues?q=is%3Aopen+is%3Aissue+label%3Aup-for-grabs
[chocolatey]: https://chocolatey.org/
[cmake-download]: https://cmake.org/download/
[required-individual-components]: ../WinForms.vsconfig

8
src/System.Windows.Forms/tests/IntegrationTests/NativeHost/NativeHost.vcxproj

@ -28,14 +28,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
@ -43,14 +43,14 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>true</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
<ConfigurationType>Application</ConfigurationType>
<UseDebugLibraries>false</UseDebugLibraries>
<PlatformToolset>v142</PlatformToolset>
<PlatformToolset>v143</PlatformToolset>
<WholeProgramOptimization>true</WholeProgramOptimization>
<CharacterSet>Unicode</CharacterSet>
<UseOfMfc>Dynamic</UseOfMfc>

Loading…
Cancel
Save