Merge pull request #1918 from MicrosoftDocs/master

4/26 AM Publish

Author: Taojunshen

.gitignore

@@ -1,4 +1,5 @@
 /.vs/
+/.vscode/
 log/
 obj/
 _site/

.vscode/settings.json

@@ -4,6 +4,8 @@ author: "ghogen"
 ms.author: "ghogen"
 ms.date: "03/27/2018"
 ms.topic: "conceptual"
+ms.prod: visual-studio-dev15
+ms.technology: vs-azure
 description: "Use a custom NuGet feed to access and use NuGet packages in a connected environment."
 keywords: "Docker, Kubernetes, Azure, AKS, Azure Container Service, containers"
 manager: "douge"

connected-environment/how-to/use-a-custom-nuget-feed.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Build and run code in Kubernetes
 Let's run our code! In the terminal window, run this command from the **root code folder**, webfrontend:
 

connected-environment/includes/build-and-run-in-k8s-cli.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Clean Up
 To completely delete a Connected Environment in Azure, including all the running services within it, use the `vsce env rm` command. Please bear in mind that this action is irreversible.
 

connected-environment/includes/clean-up.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ### This is a common section
 
 Here is some content.

connected-environment/includes/common-test.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Create a Kubernetes development environment in Azure
 With Connected Environment, you can create Kubernetes-based environments that are fully managed by Azure and optimized for development. The command creates an environment named `mydevenvironment` in `eastus`.
 ```cmd

connected-environment/includes/create-env-cli.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 In this section, we'll use VS Code to directly debug our container running in Azure. We'll also learn how to get a faster edit-run-test loop.
 
 ![](../media/edit-refresh-see.png)

connected-environment/includes/debug-intro.md

@@ -1,2 +1,5 @@
+---
+ms.topic: "include"
+---
 ## Ensure the development environment was successfully created
 In the previous section, we kicked off the `vsce env create` command to create a development environment in Azure. It can take about 7 minutes to complete, so check back that it was successfully created. You can always check the environments you have access to, and their status, with this command: `vsce env list`. 

connected-environment/includes/ensure-env-created.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Initialize debug assets with the VS Code extension
 We first need to configure our code project so VS Code will communicate with our development environment in Azure. The VS Code extension for Connected Environment provides a helper command to set up debug configuration. 
 

connected-environment/includes/init-debug-assets-vscode.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Install the Connected Environment CLI
 Connected Environment requires minimal local machine setup. Most of your development environment's configuration gets stored in the cloud, and is shareable with other users.
 

connected-environment/includes/install-cli-and-vscode.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 In this guide, you will learn how to:
 
 1. Create a Kubernetes-based environment in Azure that is optimized for development.

connected-environment/includes/learning-objectives.md

@@ -1,2 +1,5 @@
+---
+ms.topic: "include"
+---
 > [!Note]
 > **If you get stuck** at any time, see the [Troubleshooting](../troubleshooting.md) section, or post a comment on this page.

connected-environment/includes/see-troubleshooting.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Sign in to Azure
 We'll need to sign in to Azure to create our development environment. Type the following command in a terminal window:
 ```cmd

connected-environment/includes/sign-into-azure.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 **Your voice is a critical part of our product development process.** Please give us your [feedback](https://aka.ms/vsce-product-survey).
 
 > [!div class="nextstepaction"]

connected-environment/includes/take-survey.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 So far we've run our application's code as if we were the only developer working on the app. In this section, we'll learn how Connected Environment streamlines team development:
 * Enable a team of developers to work in the same development environment.
 * Supports each developer iterating on their code in isolation and without fear of breaking others.

connected-environment/includes/team-development-1.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 2. Hit F5 (or type `vsce up` in the Terminal Window) to run the service. Doing this will automatically run it in our newly selected space `scott`. 
 1. We can confirm this by running `vsce list` again. First, you'll notice an instance of `mywebapi` is now running in the `scott` space (the version running in the `mainline` is still running but it is not listed). Secondly, the access point URL for `webfrontend` is prefixed with the text "scott-". This URL is unique to the `scott` space, and signifies that requests sent to the "scott URL" will attempt to first route to services in the `scott` space, and will fall back to services in the `mainline` space.
 

connected-environment/includes/team-development-2.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 > [!Tip]
 > The VS Code status bar will display a clickable URL.
 

connected-environment/includes/tip-vscode-status-bar-url.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Initialize code for Docker and Kubernetes development
 So far, we have a basic web app that can run locally. We'll now containerize it by creating assets that define the app's container and how it will deploy to Kubernetes. This is easy to do with Connected Environment: 
 

connected-environment/includes/vsce-init.md

@@ -1,3 +1,6 @@
+---
+ms.topic: "include"
+---
 ## Well done!
 You've completed the getting started guide! You learned how to:
 

connected-environment/includes/well-done.md

@@ -34,7 +34,7 @@
 #### [Specify When and Where an Annotation Applies](specifying-when-and-where-an-annotation-applies.md)
 #### [Intrinsic Functions](intrinsic-functions.md)
 #### [Best Practices and Examples (SAL)](best-practices-and-examples-sal.md)
-### [Specify Additional Code Information by Using __analysis_assume](how-to-specify-additional-code-information-by-using-analysis-assume.md)
+### [Specify Additional Code Information by Using _Analysis_assume](how-to-specify-additional-code-information-by-using-analysis-assume.md)
 ## [Rule Sets](using-rule-sets-to-group-code-analysis-rules.md)
 ### [Rule Sets for Managed Code](how-to-configure-code-analysis-for-a-managed-code-project.md)
 #### [Configure Code Analysis for an ASP.NET Web Application](how-to-configure-code-analysis-for-an-aspnet-web-application.md)

docs/code-quality/TOC.md

@@ -10,6 +10,10 @@ f1_keywords:
 helpviewer_keywords:
   - "DoNotMarkEnumsWithFlags"
   - "CA2217"
+dev_langs:
+  - "VB"
+  - "CSharp"
+  - "CPP"
 ms.assetid: 1b6f626c-66bf-45b0-a3e2-7c41ee9ceda7
 author: gewarren
 ms.author: gewarren
@@ -18,6 +22,7 @@ ms.workload:
   - "multiple"
 ---
 # CA2217: Do not mark enums with FlagsAttribute
+
 |||
 |-|-|
 |TypeName|DoNotMarkEnumsWithFlags|
@@ -26,33 +31,41 @@ ms.workload:
 |Breaking Change|Non Breaking|
 
 ## Cause
- An externally visible enumeration is marked with <xref:System.FlagsAttribute> and it has one or more values that are not powers of two or a combination of the other defined values on the enumeration.
 
-## Rule Description
- An enumeration should have <xref:System.FlagsAttribute> present only if each value defined in the enumeration is a power of two, or a combination of defined values.
+An externally visible enumeration is marked with <xref:System.FlagsAttribute>, and it has one or more values that are not powers of two or a combination of the other defined values on the enumeration.
+
+## Rule description
+
+An enumeration should have <xref:System.FlagsAttribute> present only if each value defined in the enumeration is a power of two or a combination of defined values.
+
+## How to fix violations
+
+To fix a violation of this rule, remove <xref:System.FlagsAttribute> from the enumeration.
+
+## When to suppress warnings
+
+Do not suppress a warning from this rule.
+
+## Example that should not have the attribute
+
+The following example shows an enumeration, `Color`, that contains the value 3. 3 is not a power of two, or a combination of any of the defined values. The `Color` enumeration shouldn't be marked with <xref:System.FlagsAttribute>.
 
-## How to Fix Violations
- To fix a violation of this rule, remove <xref:System.FlagsAttribute> from the enumeration.
+[!code-cpp[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/CPP/ca2217-do-not-mark-enums-with-flagsattribute_1.cpp)]
+[!code-csharp[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/CSharp/ca2217-do-not-mark-enums-with-flagsattribute_1.cs)]
+[!code-vb[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/VisualBasic/ca2217-do-not-mark-enums-with-flagsattribute_1.vb)]
 
-## When to Suppress Warnings
- Do not suppress a warning from this rule.
+## Example that should have the attribute
 
-## Example
- The following example shows an enumeration, Color, that contains the value 3, which is neither a power of two, nor a combination of any of the defined values. The Color enumeration should not be marked with the <xref:System.FlagsAttribute>.
+The following example shows an enumeration, `Days`, that meets the requirements for being marked with <xref:System.FlagsAttribute>.
 
- [!code-cpp[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/CPP/ca2217-do-not-mark-enums-with-flagsattribute_1.cpp)]
- [!code-csharp[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/CSharp/ca2217-do-not-mark-enums-with-flagsattribute_1.cs)]
- [!code-vb[FxCop.Usage.EnumNoFlags#1](../code-quality/codesnippet/VisualBasic/ca2217-do-not-mark-enums-with-flagsattribute_1.vb)]
+[!code-cpp[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/CPP/ca2217-do-not-mark-enums-with-flagsattribute_2.cpp)]
+[!code-csharp[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/CSharp/ca2217-do-not-mark-enums-with-flagsattribute_2.cs)]
+[!code-vb[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/VisualBasic/ca2217-do-not-mark-enums-with-flagsattribute_2.vb)]
 
-## Example
- The following example shows an enumeration, Days, that meets the requirements for being marked with the System.FlagsAttribute.
+## Related rules
 
- [!code-cpp[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/CPP/ca2217-do-not-mark-enums-with-flagsattribute_2.cpp)]
- [!code-csharp[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/CSharp/ca2217-do-not-mark-enums-with-flagsattribute_2.cs)]
- [!code-vb[FxCop.Usage.EnumNoFlags2#1](../code-quality/codesnippet/VisualBasic/ca2217-do-not-mark-enums-with-flagsattribute_2.vb)]
+[CA1027: Mark enums with FlagsAttribute](../code-quality/ca1027-mark-enums-with-flagsattribute.md)
 
-## Related Rules
- [CA1027: Mark enums with FlagsAttribute](../code-quality/ca1027-mark-enums-with-flagsattribute.md)
+## See also
 
-## See Also
- <xref:System.FlagsAttribute?displayProperty=fullName>
+- <xref:System.FlagsAttribute?displayProperty=fullName>

docs/code-quality/ca2217-do-not-mark-enums-with-flagsattribute.md

@@ -1,6 +1,6 @@
 ---
 title: Code Analysis for C/C++ Overview
-ms.date: 11/04/2016
+ms.date: 04/28/2018
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-code-analysis
 ms.topic: conceptual
@@ -26,29 +26,47 @@ ms.workload:
 ---
 # Code analysis for C/C++ overview
 
-The C/C++ Code Analysis tool provides information to developers about possible defects in their C/C++ source code. Common coding errors reported by the tool include buffer overruns, un-initialized memory, null pointer dereferences, and memory and resource leaks.
+The C/C++ Code Analysis tool provides information about possible defects in your C/C++ source code. Common coding errors reported by the tool include buffer overruns, uninitialized memory, null pointer dereferences, and memory and resource leaks. The tool can also run checks against the [C++ Core Guidelines](http://github.com/isocpp/CppCoreGuidelines/blob/master/CppCoreGuidelines.md).
 
-## IDE (integrated development environment) Integration
- To make it natural for developers to use the analysis tool, it is fully integrated within the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] IDE. During the build process, any warnings generated for the source code appear in the Error List. You can navigate to source code that caused the warning, and you can view additional information about the cause and possible solutions of the issue.
+## IDE (integrated development environment) integration
 
-## #pragma Support
- Developers can use the `#pragma` directive to treat warnings as errors; enable or disable warnings, and suppress warnings for individual lines of code. For more information, see [How to: Set Code Analysis Properties for C/C++ Projects    ](how-to-set-code-analysis-properties-for-c-cpp-projects.md).
+The code analysis tool is fully integrated within the Visual Studio IDE.
 
-## Annotation Support
- Annotations improve the accuracy of the code analysis. Annotations provide additional information about pre- and post- conditions on function parameters and return types. For more information, see [How to: Specify Additional Code Information by Using __analysis_assume](../code-quality/how-to-specify-additional-code-information-by-using-analysis-assume.md)
+During the build process, any warnings generated for the source code appear in the Error List. You can navigate to source code that caused the warning, and you can view additional information about the cause and possible solutions of the issue.
+
+## Command line support
+
+You can also use the analysis tool from the command line, as shown in the following example:
+
+```cmd
+C:\>cl /analyze Sample.cpp
+```
+
+**Visual Studio 2017 version 15.7 and later** You can run the tool from the command line with any build system including CMake.
+
+## #pragma support
+
+You can use the `#pragma` directive to treat warnings as errors; enable or disable warnings, and suppress warnings for individual lines of code. For more information, see [How to: Set Code Analysis Properties for C/C++ Projects](how-to-set-code-analysis-properties-for-c-cpp-projects.md).
+
+## Annotation support
+
+Annotations improve the accuracy of the code analysis. Annotations provide additional information about pre- and post- conditions on function parameters and return types. For more information, see [How to: Specify Additional Code Information by Using __analysis_assume](../code-quality/how-to-specify-additional-code-information-by-using-analysis-assume.md)
 
 ## Run analysis tool as part of check-in policy
- You might want to require that all source code check-ins satisfy certain policies. In particular, you want to make sure that analysis was run as a step of the most recent local build. For more information about enabling a code analysis check-in policy, see [Creating and Using Code Analysis Check-In Policies](../code-quality/creating-and-using-code-analysis-check-in-policies.md)
 
-## Team Build Integration
- You can use the integrated features of the build system to run code analysis tool as a step of the [!INCLUDE[esprtfs](../code-quality/includes/esprtfs_md.md)] build process. For more information, see [Build and release](/vsts/build-release/index).
+You might want to require that all source code check-ins satisfy certain policies. In particular, you want to make sure that analysis was run as a step of the most recent local build. For more information about enabling a code analysis check-in policy, see [Creating and Using Code Analysis Check-In Policies](../code-quality/creating-and-using-code-analysis-check-in-policies.md)
 
-## Command-line support
- In addition to the full integration within the development environment, developers can also use the analysis tool from the command line, as shown in the following example:
+## Team Build integration
 
- `C:\>cl /analyze Sample.cpp`
+You can use the integrated features of the build system to run code analysis tool as a step of the [!INCLUDE[esprtfs](../code-quality/includes/esprtfs_md.md)] build process. For more information, see [Build and release](/vsts/build-release/index).
 
 ## See also
 
-[Analyzing Driver Quality by Using Code Analysis Tools](/windows-hardware/drivers/develop/analyzing-driver-quality-by-using-code-analysis-tools)
-[Code Analysis for Drivers Warnings](/windows-hardware/drivers/devtest/prefast-for-drivers-warnings)
+- [Quickstart: Code analysis for C/C++](quick-start-code-analysis-for-c-cpp.md)
+- [Walkthrough: Analyze C/C++ Code for Defects](walkthrough-analyzing-c-cpp-code-for-defects.md)
+- [Code Analysis for C/C++ Warnings](code-analysis-for-c-cpp-warnings.md)
+- [Use the C++ Core Guidelines checkers](using-the-cpp-core-guidelines-checkers.md)
+- [C++ Core Guidelines Checker Reference](code-analysis-for-cpp-corecheck.md)
+- [Use Rule Sets to Specify the C++ Rules to Run](using-rule-sets-to-specify-the-cpp-rules-to-run.md)
+- [Analyze Driver Quality by Using Code Analysis Tools](/windows-hardware/drivers/develop/analyzing-driver-quality-by-using-code-analysis-tools)
+- [Code Analysis for Drivers Warnings](/windows-hardware/drivers/devtest/prefast-for-drivers-warnings)

docs/code-quality/code-analysis-for-c-cpp-overview.md

@@ -25,7 +25,7 @@ Code analysis check-in policies are set in the team project settings and apply t
 
 - For managed code, you set the check-in policy by specifying a *rule set* that contains a subset of the code analysis rules.
 
-- For C/C++ code, the check-in policy requires that all code analysis rules are run. You can add pre-processor directives to disable specific rules for the individual code projects in your team project.
+- For C/C++ code, in Visual Studio 2017 version 15.6 and earlier, the check-in policy requires that all code analysis rules are run. You can add pre-processor directives to disable specific rules for the individual code projects in your team project. In 15.7 and later, you can use **/analyze:ruleset** to specify which rules to run. For more information, see [Using Rule Sets to Specify the C++ Rules to Run](using-rule-sets-to-specify-the-cpp-rules-to-run.md).
 
 After you specify a check-in policy for managed code, team members can synchronize their code analysis settings for code projects to the team project policy settings.
 

docs/code-quality/how-to-create-or-update-standard-code-analysis-check-in-policies.md

@@ -1,34 +1,34 @@
 ---
-title: "How to: Specify Additional Code Information by Using __analysis_assume"
+title: "How to: Specify Additional Code Information by Using _Analysis_assume"
 ms.date: 11/04/2016
 ms.prod: visual-studio-dev15
 ms.technology: vs-ide-code-analysis
 ms.topic: "conceptual"
 f1_keywords:
-  - "__analysis_assume"
+  - "_Analysis_assume"
 helpviewer_keywords:
-  - "__analysis_assume"
+  - "_Analysis_assume"
 ms.assetid: 51205d97-4084-4cf4-a5ed-3eeaf67deb1b
 author: mikeblome
 ms.author: mblome
 manager: wpickett
 ms.workload:
   - "multiple"
 ---
-# How to: Specify Additional Code Information by Using __analysis_assume
+# How to: Specify Additional Code Information by Using _Analysis_assume
 You can provide hints to the code analysis tool for C/C++ code that will help the analysis process and reduce warnings. To provide additional information, use the following function:
 
- `__analysis_assume(`  `expr`  `)`
+ `_Analysis_assume(`  `expr`  `)`
 
  `expr` - any expression that is assumed to evaluate to true.
 
  The code analysis tool assumes that the condition represented by the expression is true at the point where the function appears and remains true until expression is altered, for example, by assignment to a variable.
 
 > [!NOTE]
->  `__analysis_assume` does not impact code optimization. Outside the code analysis tool, `__analysis_assume` is defined as a no-op.
+>  `_Analysis_assume` does not impact code optimization. Outside the code analysis tool, `_Analysis_assume` is defined as a no-op.
 
 ## Example
- The following code uses `__analysis_assume` to correct the code analysis warning [C6388](../code-quality/c6388.md):
+ The following code uses `_Analysis_assume` to correct the code analysis warning [C6388](../code-quality/c6388.md):
 
 ```
 #include<windows.h>
@@ -46,7 +46,7 @@ void test( )
 {
   char *pc = (char*)malloc(5);
   FreeAndNull(pc);
-  __analysis_assume(pc == NULL);
+  _Analysis_assume(pc == NULL);
   f(pc);
 }
 ```