Skip to content

Commit af4ab63

Browse files
authored
Merge pull request #2215 from MicrosoftDocs/master
8/5/2019 AM Publish
2 parents 40ffe76 + a325ee5 commit af4ab63

File tree

4 files changed

+21
-20
lines changed

4 files changed

+21
-20
lines changed

docs/_breadcrumb/toc.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
topicHref: /cpp/c-language/c-language-reference
1919
- name: C/C++ Preprocessor
2020
tocHref: /cpp/preprocessor/
21-
topicHref: /cpp/c-cpp-preprocessor-reference
21+
topicHref: /cpp/preprocessor/c-cpp-preprocessor-reference
2222
- name: Compiler Intrinsics and Assembly Language
2323
tocHref: /cpp/intrinsics/
2424
topicHref: /cpp/intrinsics/compiler-intrinsics-and-assembly-language
@@ -28,7 +28,7 @@
2828
topicHref: /cpp/assembler/arm/arm-assembler-reference
2929
- name: Inline assembler
3030
tocHref: /cpp/assembler/inline/
31-
topicHref: /cpp/assembler/inline-assembler
31+
topicHref: /cpp/assembler/inline/inline-assembler
3232
- name: MASM
3333
tocHref: /cpp/assembler/masm/
3434
topicHref: /cpp/assembler/masm/microsoft-macro-assembler-reference
@@ -62,7 +62,7 @@
6262
items:
6363
- name: Reference
6464
tocHref: /cpp/atl-mfc-shared/reference/
65-
topicHref: /cpp/atl-mfc/shared/reference/classes-shared-by-mfc-and-atl
65+
topicHref: /cpp/atl-mfc-shared/reference/classes-shared-by-mfc-and-atl
6666
- name: C++/CX
6767
tocHref: /cpp/cppcx/
6868
topicHref: /cpp/cppcx/visual-c-language-reference-c-cx
@@ -77,7 +77,7 @@
7777
topicHref: /cpp/parallel/parallel-programming-in-visual-cpp
7878
- name: Data Access
7979
tocHref: /cpp/data/
80-
topicHref: /cpp/data/
80+
topicHref: /cpp/data/data-access-in-cpp
8181
items:
8282
- name: OLEDB
8383
tocHref: /cpp/data/oledb/

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

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
title: "Common macros for MSBuild commands and properties"
3-
ms.date: "03/20/2019"
3+
ms.date: "08/02/2019"
44
f1_keywords: ["VC.Project.VCCLCompilerTool.GenerateXMLDocumentationFiles", "VC.Project.VCCLCompilerTool.XMLDocumentationFileName"]
55
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
---
88
# Common macros for MSBuild commands and properties
99

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.
10+
Depending on your installation options, Visual Studio can make hundreds of macros available to you in a Visual Studio project (based on MSBuild). They 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 aren't case-sensitive.
1111

1212
## View the current properties and macros
1313

@@ -27,15 +27,16 @@ This table describes a commonly used subset of the available macros; there are m
2727
|**$(FrameworkSDKDir)**|The directory into which you installed the .NET Framework. The .NET Framework could have been installed as part of Visual Studio or separately.|
2828
|**$(FrameworkVersion)**|The version of the .NET Framework used by Visual Studio. Combined with **$(FrameworkDir)**, the full path to the version of the .NET Framework use by Visual Studio.|
2929
|**$(FxCopDir)**|The path to the fxcop.cmd file. The fxcop.cmd file is not installed with all Visual Studio editions.|
30-
|**$(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.|
31-
|**$(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.|
30+
|**$(IntDir)**|Path to the directory specified for intermediate files. If it's a relative path, intermediate files go to this path appended to the project directory. This path should have a trailing slash. It resolves to the value for the **Intermediate Directory** property. Don't use **$(OutDir)** to define this property.|
31+
|**$(OutDir)**|Path to the output file directory. If it's a relative path, output files go to this path appended to the project directory. This path should have a trailing slash. It resolves to the value for the **Output Directory** property. Don't use **$(IntDir)** to define this property.|
3232
|**$(Platform)**|The name of current project platform, for example, "Win32".|
3333
|**$(PlatformShortName)**|The short name of current architecture, for example, "x86" or "x64".|
3434
|**$(ProjectDir)**|The directory of the project (defined as drive + path); includes the trailing backslash '\\'.|
3535
|**$(ProjectExt)**|The file extension of the project. It includes the '.' before the file extension.|
3636
|**$(ProjectFileName)**|The file name of the project (defined as base name + file extension).|
3737
|**$(ProjectName)**|The base name of the project.|
3838
|**$(ProjectPath)**|The absolute path name of the project (defined as drive + path + base name + file extension).|
39+
|**$(PublishDir)**|The output location for the publish target; includes the trailing backslash '\\'. Defaults to the **$(OutDir)app.publish\\** folder.|
3940
|**$(RemoteMachine)**|Set to the value of the **Remote Machine** property on the Debug property page. See [Changing Project Settings for a C/C++ Debug Configuration](/visualstudio/debugger/project-settings-for-a-cpp-debug-configuration) for more information.|
4041
|**$(RootNameSpace)**|The namespace, if any, containing the application.|
4142
|**$(SolutionDir)**|The directory of the solution (defined as drive + path); includes the trailing backslash '\\'. Defined only when building a solution in the IDE.|
@@ -71,6 +72,6 @@ The build system for C++ was significantly changed between Visual Studio 2008 an
7172

7273
## See also
7374

74-
- [Visual Studio Projects - C++](../creating-and-managing-visual-cpp-projects.md)
75-
- [Visual C++ porting and upgrading guide](../../porting/visual-cpp-porting-and-upgrading-guide.md)
76-
- [Overview of potential upgrade issues](../../porting/overview-of-potential-upgrade-issues-visual-cpp.md)
75+
[Visual Studio Projects - C++](../creating-and-managing-visual-cpp-projects.md)\
76+
[Visual C++ porting and upgrading guide](../../porting/visual-cpp-porting-and-upgrading-guide.md)\
77+
[Overview of potential upgrade issues](../../porting/overview-of-potential-upgrade-issues-visual-cpp.md)

docs/build/reference/midl-property-pages.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -124,15 +124,15 @@ Specifies which environment to target ([/env](/windows/win32/midl/-env) arm32|wi
124124

125125
### Generate Stubless Proxies
126126

127-
Generate fully interpreted stubs with extensions and stubless proxies for object interfaces ([/Oicf](/windows/win32/midl/-Oicf), [/Oif](/windows/win32/midl/-Oif) ).
127+
Generate fully interpreted stubs with extensions and stubless proxies for object interfaces ([/Oicf](/windows/win32/midl/-oi), [/Oif](/windows/win32/midl/-oi) ).
128128

129129
### Suppress Compiler Warnings
130130

131-
Suppress compiler warning messages ([/no_warn](/windows/win32/midl/-no_warn)).
131+
Suppress compiler warning messages ([/no_warn](/windows/win32/midl/-no-warn)).
132132

133133
### Application Configuration Mode
134134

135-
Allow selected ACF attributes in the IDL file ([/app_config](/windows/win32/midl/-app_config)).
135+
Allow selected ACF attributes in the IDL file ([/app_config](/windows/win32/midl/-app-config)).
136136

137137
### Locale ID
138138

@@ -215,7 +215,7 @@ Specifies the type library file format ([/oldtlb|/newtlb]).
215215

216216
### C Preprocess Options
217217

218-
Specifies switches to pass to C compiler preprocessor ([/cpp_opt](/windows/win32/midl/-cpp_opt) switches).
218+
Specifies switches to pass to C compiler preprocessor ([/cpp_opt](/windows/win32/midl/-cpp-opt) switches).
219219

220220
### Undefine Preprocessor Definitions
221221

@@ -253,15 +253,15 @@ Emit additional check for server side stub data validity ([/error](/windows/win3
253253

254254
### Prepend with 'ABI' namespace
255255

256-
Prepend the 'ABI' namespace to all types. ([/ns_prefix](/windows/win32/midl/-ns_prefix)).
256+
Prepend the 'ABI' namespace to all types. ([/ns_prefix](/windows/win32/midl/-ns-prefix)).
257257

258258
### Validate Parameters
259259

260-
Generate additional information to validate parameters ([/robust](/windows/win32/midl/-robust) | [/robust](/windows/win32/midl/-no_robust)).
260+
Generate additional information to validate parameters ([/robust](/windows/win32/midl/-robust) | [/no_robust](/windows/win32/midl/-no-robust)).
261261

262262
### Struct Member Alignment
263263

264-
Specifies the packing level of structures in the target system ([/ZpN](/windows/win32/midl/-zpn)).
264+
Specifies the packing level of structures in the target system (/ZpN).
265265

266266
**Choices**
267267

docs/cpp/how-to-create-and-use-weak-ptr-instances.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ Status of 1 = On
5959
Status of 3 = On
6060
Status of 4 = On
6161
use_count = 1
62-
Status of 0 = O
63-
nStatus of 1 = On
62+
Status of 0 = On
63+
Status of 1 = On
6464
Status of 2 = On
6565
Status of 4 = On
6666
use_count = 1

0 commit comments

Comments
 (0)