Merge pull request MicrosoftDocs#4010 from MicrosoftDocs/master637052224301071978

gewarren · web-flow · commit baa131a4e844 · 2019-09-27T16:07:36.000-07:00
For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error
diff --git a/docs/code-quality/ca2225-operator-overloads-have-named-alternates.md b/docs/code-quality/ca2225-operator-overloads-have-named-alternates.md
@@ -12,8 +12,8 @@ ms.assetid: af8f7ab1-63ad-4861-afb9-b7a7a2be15e1
 author: gewarren
 ms.author: gewarren
 manager: jillfra
-ms.workload:
-  - "multiple"
+dev_langs:
+  - CSharp
 ---
 # CA2225: Operator overloads have named alternates
 
@@ -32,12 +32,16 @@ By default, this rule only looks at externally visible types, but this is [confi
 
 ## Rule description
 
-Operator overloading allows the use of symbols to represent computations for a type. For example, a type that overloads the plus symbol (+) for addition would typically have an alternative member named 'Add'. The named alternative member provides access to the same functionality as the operator, and is provided for developers who program in languages that do not support overloaded operators.
+Operator overloading allows the use of symbols to represent computations for a type. For example, a type that overloads the plus symbol `+` for addition would typically have an alternative member named `Add`. The named alternative member provides access to the same functionality as the operator. It's provided for developers who program in languages that do not support overloaded operators.
 
-This rule examines the operators listed in the following table.
+This rule examines:
 
-|C#|Visual Basic|C++|Alternate name|
-|---------|------------------|-----------|--------------------|
+- Implicit and explicit cast operators in a type by checking for methods named `To<typename>` and `From<typename>`.
+
+- The operators listed in the following table:
+
+|C#|Visual Basic|C++|Alternate method name|
+|-|-|-|-|
 |+ (binary)|+|+ (binary)|Add|
 |+=|+=|+=|Add|
 |&|And|&|BitwiseAnd|
@@ -50,14 +54,14 @@ This rule examines the operators listed in the following table.
 |==|=|==|Equals|
 |^|Xor|^|Xor|
 |^=|Xor=|^=|Xor|
-|>|>|>|Compare|
-|>=|>=|>=|Compare|
+|>|>|>|CompareTo or Compare|
+|>=|>=|>=|CompareTo or Compare|
 |++|N/A|++|Increment|
-|<>|!=|Equals|
+|!=|<>|!=|Equals|
 |<<|<<|<<|LeftShift|
 |<<=|<<=|<<=|LeftShift|
-|<|<|<|Compare|
-|<=|<=|\<=|Compare|
+|<|<|<|CompareTo or Compare|
+|<=|<=|\<=|CompareTo or Compare|
 |&&|N/A|&&|LogicalAnd|
 |&#124;&#124;|N/A|&#124;&#124;|LogicalOr|
 |!|N/A|!|LogicalNot|
@@ -75,19 +79,18 @@ This rule examines the operators listed in the following table.
 |+ (unary)|N/A|+|Plus|
 |false|IsFalse|False|IsTrue (Property)|
 
-N/A == Cannot be overloaded in the selected language.
-
-The rule also checks implicit and explicit cast operators in a type (`SomeType`) by checking for methods named `ToSomeType` and `FromSomeType`.
+*N/A means the operator cannot be overloaded in the selected language.
 
-In C#, when a binary operator is overloaded, the corresponding assignment operator, if any, is also implicitly overloaded.
+> [!NOTE]
+> In C#, when a binary operator is overloaded, the corresponding assignment operator, if any, is also implicitly overloaded.
 
 ## How to fix violations
 
-To fix a violation of this rule, implement the alternative method for the operator; name it using the recommended alternative name.
+To fix a violation of this rule, implement the alternative method for the operator. Name it using the recommended alternative name.
 
 ## When to suppress warnings
 
-Do not suppress a warning from this rule if you are implementing a shared library. Applications can ignore a warning from this rule.
+Do not suppress a warning from this rule if you're implementing a shared library. Applications can ignore a warning from this rule.
 
 ## Configurability
 
diff --git a/docs/ide/report-a-problem-perfview.md b/docs/ide/report-a-problem-perfview.md
@@ -1,6 +1,6 @@
 ---
 title: Collect an ETL trace with PerfView
-ms.date: 06/27/2019
+ms.date: 09/27/2019
 ms.topic: conceptual
 helpviewer_keywords:
   - "perfview"
@@ -22,7 +22,7 @@ PerfView is a tool that creates ETL (event trace log) files based on [Event Trac
 
 ## Install PerfView
 
-Download PerfView from the [Microsoft Download Center](http://www.microsoft.com/download/details.aspx?id=28567).
+Download PerfView from [GitHub](https://github.com/Microsoft/perfview/blob/master/documentation/Downloading.md).
 
 ## Run PerfView
 
diff --git a/docs/msbuild/special-characters-to-escape.md b/docs/msbuild/special-characters-to-escape.md
@@ -35,6 +35,9 @@ Special characters must be escaped only if they have special meaning in the cont
 |?|Question mark, a wildcard character when describing a file spec in an item's Include/Exclude section.|
 |*|Asterisk, a wildcard character when describing a file spec in an item's Include/Exclude section.|
 
+> [!NOTE]
+> In some scenarios, you may need to escape double quote (") characters, such as when using within an `Exec` task.
+
 ## See also
 - [How to: Escape special characters in MSBuild](../msbuild/how-to-escape-special-characters-in-msbuild.md)
 - [MSBuild reference](../msbuild/msbuild-reference.md)
diff --git a/docs/msbuild/verifyfilehash-task.md b/docs/msbuild/verifyfilehash-task.md
@@ -28,7 +28,7 @@ This task was added in 15.8, but requires a [workaround](https://github.com/Micr
 
 |Parameter|Description|
 |---------------|-----------------|
-|`File`|Required <xref:Microsoft.Build.Framework.ITaskItem> parameter.<br /><br />The files to be hashed and validated.|
+|`File`|Required `String` parameter.<br /><br />The file to be hashed and validated.|
 |`Hash`|Required `String` parameter.<br /><br />The expected hash of the file.|
 |`Algorithm`|Optional `String` parameter.<br /><br />The algorithm. Allowed values: `SHA256`, `SHA384`, `SHA512`. Default = `SHA256`.|
 |`HashEncoding`|Optional `String` parameter.<br /><br />The encoding to use for generated hashes. Defaults to `hex`. Allowed values = `hex`, `base64`.|
diff --git a/docs/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference.md b/docs/test/microsoft-visualstudio-testtools-cppunittestframework-api-reference.md
@@ -1,6 +1,6 @@
 ---
 title: "Microsoft.VisualStudio.TestTools.CppUnitTestFramework API"
-ms.date: 06/13/2019
+ms.date: 09/27/2019
 ms.topic: reference
 ms.author: mblome
 manager: jillfra
@@ -12,9 +12,7 @@ author: mikeblome
 
 This topic lists the public members of the `Microsoft::VisualStudio::CppUnitTestFramework` namespace. Use these APIs to write C++ unit tests based on the Microsoft Native Unit Test Framework. There is a [Usage Example](#example) at the end of the topic.
 
-The header files are located in the  _VisualStudio2012[x86]InstallFolder_**\VC\UnitTest\include** folder.
-
-The lib files are located in the  _VisualStudio2012[x86]InstallFolder_**\VC\UnitTest\lib** folder.
+The header and lib files are located under *\<Visual Studio installation folder>\VC\Auxiliary\VS\UnitTest*.
 
 Header and lib paths are automatically configured in a Native Test project.
 
diff --git a/docs/test/writing-unit-tests-for-c-cpp.md b/docs/test/writing-unit-tests-for-c-cpp.md
@@ -1,7 +1,7 @@
 ---
 title: "Write unit tests for C/C++"
 description: Write C++ unit tests in Visual Studio using various test frameworks including CTest, Boost.Test and Google Test.
-ms.date: 05/06/2019
+ms.date: 09/27/2019
 ms.topic: conceptual
 ms.author: "mblome"
 manager: markl
@@ -81,6 +81,8 @@ Next, in your unit test *.cpp* file, add an `#include` directive for any header
 
 ![Add include directives](media/cpp-add-includes-test-project.png)
 
+To avoid having to type the full path in each include statement in the source file, you can add the required folders in **Project** > **Properties** > **C/C++** > **General** > **Additional Include Directories**.
+
 ### Write test methods
 
 > [!NOTE]
