Skip to content

Commit bd21ddd

Browse files
authored
Merge pull request #5749 from MicrosoftDocs/FromPublicMasterBranch
Confirm merge from FromPublicMasterBranch to main to sync with https://github.com/MicrosoftDocs/cpp-docs (branch main)
2 parents 40acf5f + 313d302 commit bd21ddd

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

docs/build/walkthrough-using-msbuild-to-create-a-visual-cpp-project.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,12 +113,12 @@ An MSBuild project file is an XML file that contains a project root element (`<P
113113
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.default.props" />
114114
```
115115

116-
1. Add a property group element (`<PropertyGroup>`) that specifies two project properties, `<ConfigurationType>` and `<PlatformToolset>`. (Use `v140` as the `<PlatformToolset>` value if you're using Visual Studio 2015, `v141` if you're using Visual Studio 2017, or `v142` if you're using Visual Studio 2019.)
116+
1. Add a property group element (`<PropertyGroup>`) that specifies two project properties, `<ConfigurationType>` and `<PlatformToolset>`. (Use `v140` as the `<PlatformToolset>` value if you're using Visual Studio 2015, `v141` if you're using Visual Studio 2017, `v142` if you're using Visual Studio 2019 or `v143` if you're using Visual Studio 2022.)
117117

118118
```xml
119119
<PropertyGroup>
120120
<ConfigurationType>Application</ConfigurationType>
121-
<PlatformToolset>v142</PlatformToolset>
121+
<PlatformToolset>v143</PlatformToolset>
122122
</PropertyGroup>
123123
```
124124

docs/cpp/program-and-linkage-cpp.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ In a C++ program, a *symbol*, for example a variable or function name, can be de
1111
The following example shows some declarations:
1212

1313
```cpp
14-
int i;
14+
extern int i;
1515
int f(int x);
1616
class C;
1717
```

0 commit comments

Comments
 (0)