Skip to content

Commit 0cedab7

Browse files
author
Colin Robertson
authored
Merge pull request MicrosoftDocs#869 from MicrosoftDocs/master636887872721058466
Fix git push error for protected CLA branch
2 parents 7bd48c0 + c1f646c commit 0cedab7

62 files changed

Lines changed: 312 additions & 284 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎docs/_breadcrumb/toc.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,8 +90,8 @@
9090
tocHref: /cpp/data/odbc/
9191
topicHref: /cpp/data/odbc/open-database-connectivity-odbc
9292
- name: Edit, navigate and refactor code
93-
tocHref: /cpp/ide/
94-
topicHref: /cpp/ide/ide-and-tools-for-visual-cpp-development
93+
tocHref: /cpp/ide
94+
topicHref: /cpp/overview-of-cpp-development
9595
items:
9696
- name: IDE
9797
tocHref: /cpp/ide/

‎docs/atl/reference/ccommultithreadmodel-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ See [CComMultiThreadModel::AutoCriticalSection](#autocriticalsection).
141141
142142
## <a name="decrement"></a> CComMultiThreadModel::Decrement
143143
144-
This static function calls the Win32 function [InterlockedDecrement](/windows/desktop/api/winbase/nf-winbase-interlockeddecrement), which decrements the value of the variable pointed to by *p*.
144+
This static function calls the Win32 function [InterlockedDecrement](/windows/desktop/api/winnt/nf-winnt-interlockeddecrement), which decrements the value of the variable pointed to by *p*.
145145
146146
```
147147
static ULONG WINAPI Decrement(LPLONG p) throw ();
@@ -162,7 +162,7 @@ If the result of the decrement is 0, then `Decrement` returns 0. If the result o
162162
163163
## <a name="increment"></a> CComMultiThreadModel::Increment
164164
165-
This static function calls the Win32 function [InterlockedIncrement](/windows/desktop/api/winbase/nf-winbase-interlockedincrement), which increments the value of the variable pointed to by *p*.
165+
This static function calls the Win32 function [InterlockedIncrement](/windows/desktop/api/winnt/nf-winnt-interlockedincrement), which increments the value of the variable pointed to by *p*.
166166
167167
```
168168
static ULONG WINAPI Increment(LPLONG p) throw ();

‎docs/atl/reference/ccommultithreadmodelnocs-class.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ See [CComMultiThreadModel::AutoCriticalSection](../../atl/reference/ccommultithr
101101

102102
## <a name="decrement"></a> CComMultiThreadModelNoCS::Decrement
103103

104-
This static function calls the Win32 function [InterlockedDecrement](/windows/desktop/api/winbase/nf-winbase-interlockeddecrement), which decrements the value of the variable pointed to by *p*.
104+
This static function calls the Win32 function [InterlockedDecrement](/windows/desktop/api/winnt/nf-winnt-interlockeddecrement), which decrements the value of the variable pointed to by *p*.
105105

106106
```
107107
static ULONG WINAPI Decrement(LPLONG p) throw();
@@ -122,7 +122,7 @@ If the result of the decrement is 0, then `Decrement` returns 0. If the result o
122122

123123
## <a name="increment"></a> CComMultiThreadModelNoCS::Increment
124124

125-
This static function calls the Win32 function [InterlockedIncrement](/windows/desktop/api/winbase/nf-winbase-interlockedincrement), which increments the value of the variable pointed to by *p*.
125+
This static function calls the Win32 function [InterlockedIncrement](/windows/desktop/api/winnt/nf-winnt-interlockedincrement), which increments the value of the variable pointed to by *p*.
126126

127127
```
128128
static ULONG WINAPI Increment(LPLONG p) throw();

‎docs/build/customize-cmake-settings.md‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,19 +46,19 @@ You can also directly edit `CMakeSettings.json` to create custom configurations
4646

4747
- **generator**: maps to the CMake **-G** switch and specifies the generator to be used. This property can also be used as a macro, `${generator}`, when composing other property values. Visual Studio currently supports the following CMake generators:
4848

49-
- "Ninja"
50-
- "Visual Studio 14 2015"
51-
- "Visual Studio 14 2015 ARM"
52-
- "Visual Studio 14 2015 Win64"
53-
- "Visual Studio 15 2017"
54-
- "Visual Studio 15 2017 ARM"
55-
- "Visual Studio 15 2017 Win64"
49+
- "Ninja"
50+
- "Visual Studio 14 2015"
51+
- "Visual Studio 14 2015 ARM"
52+
- "Visual Studio 14 2015 Win64"
53+
- "Visual Studio 15 2017"
54+
- "Visual Studio 15 2017 ARM"
55+
- "Visual Studio 15 2017 Win64"
5656

57-
Because Ninja is designed for fast build speeds instead of flexibility and function, it is set as the default. However, some CMake projects may be unable to correctly build using Ninja. If this occurs, you can instruct CMake to generate a Visual Studio project instead.
57+
Because Ninja is designed for fast build speeds instead of flexibility and function, it is set as the default. However, some CMake projects may be unable to correctly build using Ninja. If this occurs, you can instruct CMake to generate a Visual Studio project instead.
5858

59-
To specify a Visual Studio generator, open the `CMakeSettings.json` from the main menu by choosing **CMake | Change CMake Settings**. Delete “Ninja” and type “V”. This activates IntelliSense, which enables you to choose the generator you want.
59+
To specify a Visual Studio generator, open the `CMakeSettings.json` from the main menu by choosing **CMake | Change CMake Settings**. Delete “Ninja” and type “V”. This activates IntelliSense, which enables you to choose the generator you want.
6060

61-
When the active configuration specifies a Visual Studio generator, by default MSBuild.exe is invoked with `-m -v:minimal` arguments. To customize the build, inside the `CMakeSettings.json` file, you can specify additional [MSBuild command line arguments](../build/msbuild-visual-cpp-overview.md) to be passed to the build system via the `buildCommandArgs` property:
61+
When the active configuration specifies a Visual Studio generator, by default MSBuild.exe is invoked with `-m -v:minimal` arguments. To customize the build, inside the `CMakeSettings.json` file, you can specify additional [MSBuild command line arguments](../build/reference/msbuild-visual-cpp-overview.md) to be passed to the build system via the `buildCommandArgs` property:
6262

6363
```json
6464
"buildCommandArgs": "-m:8 -v:minimal -p:PreferredToolArchitecture=x64"
@@ -125,7 +125,7 @@ usage: ninja [options] [targets...]
125125
| -n | dry run (don't run commands but act like they succeeded)|
126126
| -v | show all command lines while building|
127127
| -d MODE | enable debugging (use -d list to list modes)|
128-
| -t TOOL | run a subtool (use -t list to list subtools). terminates toplevel options; further flags are passed to the tool|
128+
| -t TOOL | run a subtool (use -t list to list subtools). terminates top-level options; further flags are passed to the tool|
129129
| -w FLAG | adjust warnings (use -w list to list warnings)|
130130

131131
## Inherited environments

‎docs/build/reference/common-macros-for-build-commands-and-properties.md‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,23 @@
11
---
2-
title: "Common macros for build commands and properties"
3-
ms.date: "05/29/2018"
2+
title: "Common macros for MSBuild commands and properties"
3+
ms.date: "03/20/2019"
44
f1_keywords: ["VC.Project.VCCLCompilerTool.GenerateXMLDocumentationFiles", "VC.Project.VCCLCompilerTool.XMLDocumentationFileName"]
5-
helpviewer_keywords: ["$(FrameworkSDKDir) macro", "ProjectName macro $(ProjectName)", "DevEnvDir macro $(DevEnvDir)", "$(DevEnvDir) macro", "TargetPath macro $(TargetPath)", "VSInstallDir macro $(VSInstallDir)", "$(InputFileName) macro", "$(SolutionFileName) macro", "macros [C++], build macros", "InputFileName macro $(InputFileName)", "$(VCInstallDir) macro", "$(IntDir) macro", "$(ConfigurationName) macro", "SolutionDir macro $(SolutionDir)", "$(TargetPath) macro", "$(Inherit) macro", "$(SolutionPath) macro", "WebDeployRoot macro $(WebDeployRoot)", "WebDeployPath macro $(WebDeployPath)", "StopEvaluating macro $(StopEvaluating)", "$(RootNamespace) macro", "$(WebDeployRoot) macro", "ProjectPath macro $(ProjectPath)", "$(ProjectPath) macro", "$(InputDir) macro", "SolutionName macro $(SolutionName)", "ProjectExt macro $(ProjectExt)", "$(TargetExt) macro", "$(ProjectFileName) macro", "TargetName macro $(TargetName)", "$(References) macro", "References macro $(References)", "TargetExt macro $(TargetExt)", "ProjectDir macro $(ProjectDir)", "$(TargetDir) macro", "SolutionExt macro $(SolutionExt)", "$(SolutionDir) macro", "ProjectFileName macro $(ProjectFileName)", "VCInstallDir macro $(VCInstallDir)", "$(InputExt) macro", "$(TargetFileName) macro", "$(SolutionExt) macro", "PlatformName macro $(PlatformName)", "IntDir macro $(IntDir)", "$(FrameworkVersion) macro", "$(ProjectDir) macro", "build macros [C++]", "InputPath macro $(InputPath)", "$(VSInstallDir) macro", "$(WebDeployPath) macro", "TargetFileName macro $(TargetFileName)", "NoInherit macro $(NoInherit)", "ConfigurationName macro $(ConfigurationName)", "$(ProjectExt) macro", "TargetDir macro $(TargetDir)", "InputName macro $(InputName)", "$(ProjectName) macro", "FrameworkSDKDir macro $(FrameworkSDKDir)", "$(ParentName) macro", "InputExt macro $(InputExt)", "$(SafeRootNamespace) macro", "InputDir macro $(InputDir)", "$(FxCopDir) macro", "$(RemoteMachine) macro", "Inherit macro $(Inherit)", "FrameworkVersion macro $(FrameworkVersion)", "$(StopEvaluating) macro", "$(OutDir) macro", "FrameworkDir macro $(FrameworkDir)", "SolutionFileName macro $(SolutionFileName)", "$(NoInherit) macro", "RemoteMachine macro $(RemoteMachine)", "properties [C++], build property macros", "$(TargetName) macro", "$(SolutionName) macro", "$(InputPath) macro", "ParentName macro $(ParentName)", "OutDir macro $(OutDir)", "SafeRootNamespace macro $(SafeRootNamespace)", "FxCopDir macro $(FxCopDir)", "$(InputName) macro", "RootNamespace macro $(RootNamespace)", "builds [C++], macros", "$(FrameworkDir) macro", "$(PlatformName) macro", "SolutionPath macro $(SolutionPath)"]
5+
helpviewer_keywords: ["$(FrameworkSDKDir) macro", "ProjectName macro $(ProjectName)", "DevEnvDir macro $(DevEnvDir)", "$(DevEnvDir) macro", "TargetPath macro $(TargetPath)", "VSInstallDir macro $(VSInstallDir)", "$(InputFileName) macro", "$(SolutionFileName) macro", "macros [C++], build macros", "InputFileName macro $(InputFileName)", "$(VCInstallDir) macro", "$(IntDir) macro", "$(ConfigurationName) macro", "SolutionDir macro $(SolutionDir)", "$(TargetPath) macro", "$(Inherit) macro", "$(SolutionPath) macro", "WebDeployRoot macro $(WebDeployRoot)", "WebDeployPath macro $(WebDeployPath)", "StopEvaluating macro $(StopEvaluating)", "$(RootNamespace) macro", "$(WebDeployRoot) macro", "ProjectPath macro $(ProjectPath)", "$(ProjectPath) macro", "$(InputDir) macro", "SolutionName macro $(SolutionName)", "ProjectExt macro $(ProjectExt)", "$(TargetExt) macro", "$(ProjectFileName) macro", "TargetName macro $(TargetName)", "$(References) macro", "References macro $(References)", "TargetExt macro $(TargetExt)", "ProjectDir macro $(ProjectDir)", "$(TargetDir) macro", "SolutionExt macro $(SolutionExt)", "$(SolutionDir) macro", "ProjectFileName macro $(ProjectFileName)", "VCInstallDir macro $(VCInstallDir)", "$(InputExt) macro", "$(TargetFileName) macro", "$(SolutionExt) macro", "PlatformName macro $(PlatformName)", "IntDir macro $(IntDir)", "$(FrameworkVersion) macro", "$(ProjectDir) macro", "build macros [C++]", "InputPath macro $(InputPath)", "$(VSInstallDir) macro", "$(WebDeployPath) macro", "TargetFileName macro $(TargetFileName)", "NoInherit macro $(NoInherit)", "ConfigurationName macro $(ConfigurationName)", "$(ProjectExt) macro", "TargetDir macro $(TargetDir)", "InputName macro $(InputName)", "$(ProjectName) macro", "FrameworkSDKDir macro $(FrameworkSDKDir)", "$(ParentName) macro", "InputExt macro $(InputExt)", "$(SafeRootNamespace) macro", "InputDir macro $(InputDir)", "$(FxCopDir) macro", "$(RemoteMachine) macro", "Inherit macro $(Inherit)", "FrameworkVersion macro $(FrameworkVersion)", "$(StopEvaluating) macro", "$(OutDir) macro", "FrameworkDir macro $(FrameworkDir)", "SolutionFileName macro $(SolutionFileName)", "$(NoInherit) macro", "RemoteMachine macro $(RemoteMachine)", "properties [C++], build property macros", "$(TargetName) macro", "$(SolutionName) macro", "$(InputPath) macro", "ParentName macro $(ParentName)", "OutDir macro $(OutDir)", "SafeRootNamespace macro $(SafeRootNamespace)", "FxCopDir macro $(FxCopDir)", "$(InputName) macro", "RootNamespace macro $(RootNamespace)", "builds [C++], macros", "$(FrameworkDir) macro", "$(PlatformName) macro", "$(PlatformShortName) macro","SolutionPath macro $(SolutionPath)"]
66
ms.assetid: 239bd708-2ea9-4687-b264-043f1febf98b
77
---
8-
# Common macros for build commands and properties
8+
# Common macros for MSBuild commands and properties
99

10-
Depending on your installation options, Visual Studio can make hundreds of macros available to you. These correspond to the MSBuild properties that are set by default, or in .props or .targets files, or in your project settings. You can use these macros anywhere in a project's **Property Pages** dialog box where strings are accepted. These macros are not case sensitive.
10+
Depending on your installation options, Visual Studio can make hundreds of macros available to you in a Visual Studio project (based on MSBuild). These correspond to the MSBuild properties that are set by default, or in .props or .targets files, or in your project settings. You can use these macros anywhere in a project's **Property Pages** dialog box where strings are accepted. These macros are not case sensitive.
1111

1212
## View the current properties and macros
1313

14-
To display the currently available macros, on any property page in the **Property Pages** dialog, choose the drop-down arrow at the end of a property row. If **Edit** is available, choose it, and then in the edit dialog box, choose the **Macros** button. The current set of properties and macros visible to Visual Studio is listed along with the current value for each. For more information, see the **Specifying User-Defined Values** section of [C++ project property page reference](property-pages-visual-cpp.md).
14+
To display all of the currently available macros, in the **Property Pages** dialog, under **VC++ Directories**, choose the drop-down arrow at the end of a property row. Click on **Edit** and then in the edit dialog box, choose the **Macros** button. The current set of properties and macros visible to Visual Studio is listed along with the current value for each. For more information, see the **Specifying User-Defined Values** section of [C++ project property page reference](property-pages-visual-cpp.md).
15+
16+
![VC++ macros button](../media/vcppdir_libdir_macros.png "Macros menu")
1517

1618
## List of common macros
1719

18-
This table describes a commonly used subset of the available macros. This list is far from exhaustive. For details on how MSBuild property definitions are created and used as macros in .props, .targets, and .vcxproj files, see [MSBuild Properties](/visualstudio/msbuild/msbuild-properties).
20+
This table describes a commonly used subset of the available macros; there are many more not listed here. Go to the **Macros** dialog to see all of the properties and their current values in your project. For details on how MSBuild property definitions are created and used as macros in .props, .targets, and .vcxproj files, see [MSBuild Properties](/visualstudio/msbuild/msbuild-properties).
1921

2022
|Macro|Description|
2123
|-----------|-----------------|
@@ -28,6 +30,7 @@ This table describes a commonly used subset of the available macros. This list i
2830
|**$(IntDir)**|Path to the directory specified for intermediate files. If this is a relative path, intermediate files go to this path appended to the project directory. This path should have a trailing slash. This resolves to the value for the **Intermediate Directory** property. Do not use **$(OutDir)** to define this property.|
2931
|**$(OutDir)**|Path to the output file directory. If this is a relative path, output files go to this path appended to the project directory. This path should have a trailing slash. This resolves to the value for the **Output Directory** property. Do not use **$(IntDir)** to define this property.|
3032
|**$(Platform)**|The name of current project platform, for example, "Win32".|
33+
|**$(PlatformShortName)**|The short name of current architecture, for example, "x86" or "x64".|
3134
|**$(ProjectDir)**|The directory of the project (defined as drive + path); includes the trailing backslash '\\'.|
3235
|**$(ProjectExt)**|The file extension of the project. It includes the '.' before the file extension.|
3336
|**$(ProjectFileName)**|The file name of the project (defined as base name + file extension).|

‎docs/build/reference/file-types-created-for-visual-cpp-projects.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ ms.assetid: 2b0ee2e0-ae81-4185-9bb9-11da3c99a283
88

99
This topic describes all the types of files that are associated with Visual Studio projects for classic desktop applications. The actual files included in your project depend on the project type and the options you select when using a wizard.
1010

11-
- [Project and Solution Files]()
11+
- [Project and Solution Files](project-and-solution-files.md)
1212

1313
- [CLR Projects](files-created-for-clr-projects.md)
1414

@@ -37,7 +37,7 @@ The following table shows common files in a Visual Studio project, and identifie
3737
|.atp|Project|Application template project file.|
3838
|.bmp, .dib, .gif, .jpg, .jpe, .png|Resource|General image files.|
3939
|.bsc|Compiling|The browser code file.|
40-
|.cpp; .c|Source|Main source code files for your application.|
40+
|.cpp, .c|Source|Main source code files for your application.|
4141
|.cur|Resource|Cursor bitmap graphic file.|
4242
|.dbp|Project|Database project file.|
4343
|.disco|Source|The dynamic discovery document file. Handles XML Web service discovery.|
@@ -61,8 +61,8 @@ The following table shows common files in a Visual Studio project, and identifie
6161
|.vap|Project|A Visual Studio Analyzer project file.|
6262
|.vbg|Solution|A compatible project group file.|
6363
|.vbp, .vip, .vbproj|Project|The Visual Basic project file.|
64-
|.vcxitems|Project|Shared Items project for sharing code files between multiple C++ projects. See [Project Files and Makefiles]() for more information.|
65-
|.vcxproj|Project|The Visual Studio project file. See [Project Files and Makefiles]() for more information.|
64+
|.vcxitems|Project|Shared Items project for sharing code files between multiple C++ projects. See [Project and Solution Files](project-and-solution-files.md) for more information.|
65+
|.vcxproj|Project|The Visual Studio project file. See [Project and Solution Files](project-and-solution-files.md) for more information.|
6666
|.vcxproj.filters|Project|When Solution Explorer is used to add a file to a project, the filters file defines where in the Solution Explorer tree view the file is added, based on its file name extension.|
6767
|.vdproj|Project|The Visual Studio deployment project file.|
6868
|.vmx|Project|The macro project file.|

0 commit comments

Comments
 (0)