fix merge conflict

Author: gewarren

docs/ai/tensorflow-vm.md

@@ -16,7 +16,7 @@ ms.workload:
 
 # Train a TensorFlow model in the cloud
 
-In this tutorial, we will train a TensorFlow model using the [MNIST dataset](http://yann.lecun.com/exdb/mnist/) in an Azure [Deep Learning](https://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/deep-learning-dsvm-overview) virtual machine.
+In this tutorial, we will train a TensorFlow model using the [MNIST dataset](http://yann.lecun.com/exdb/mnist/) on an Azure [Deep Learning](https://docs.microsoft.com/azure/machine-learning/data-science-virtual-machine/deep-learning-dsvm-overview) virtual machine.
 
 The MNIST database has a training set of 60,000 examples, and a test set of 10,000 examples of handwritten digits.
 
@@ -38,7 +38,7 @@ echo -e ". /etc/profile\n$(cat ~/.bashrc)" > ~/.bashrc
 
 ### Download sample code
 
-Download this [GitHub repository](https://github.com/Microsoft/samples-for-ai) containing samples for getting started with deep learning across TensorFlow, CNTK, Theano, and more.
+Download this [GitHub repository](https://github.com/Microsoft/samples-for-ai) containing samples for getting started with deep learning on TensorFlow, CNTK, Theano, and more.
 
 ## Open project
 
@@ -80,4 +80,4 @@ Stop the VM if you plan on using it in the near future. If you are finished with
 
 ```azurecli-interactive
 az group delete --name myResourceGroup
-```
+```

docs/code-quality/TOC.md

@@ -1,5 +1,6 @@
 # Overview
 ## [Code Analysis for Managed Code](code-analysis-for-managed-code-overview.md)
+## [Roslyn Analyzers](roslyn-analyzers-overview.md)
 ## [Code Analysis for C/C++](code-analysis-for-c-cpp-overview.md)
 ## [Measure Code Maintainability with Code Metrics](code-metrics-values.md)
 # Quickstarts
@@ -11,6 +12,8 @@
 ## [Configure and Use a Custom Rule Set](walkthrough-configuring-and-using-a-custom-rule-set.md)
 # How-to guides
 ## Code Analysis for Managed Code
+### [Install Roslyn Analyzers](install-roslyn-analyzers.md)
+### [Configure and Use Roslyn Analyzers](use-roslyn-analyzers.md)
 ### [Enable Automatic Code Analysis](how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md)
 ### [Enable Full Solution Analysis](how-to-enable-and-disable-full-solution-analysis-for-managed-code.md)
 ### [Automatic feature suspension](automatic-feature-suspension.md)

docs/code-quality/code-analysis-for-managed-code-overview.md

@@ -1,24 +1,22 @@
 ---
-title: "Code Analysis for Managed Code Overview | Microsoft Docs"
-ms.custom: ""
-ms.date: "11/04/2016"
-ms.reviewer: ""
-ms.suite: ""
+title: "Code analysis for managed code in Visual Studio | Microsoft Docs"
+ms.date: 03/26/2018
 ms.technology: vs-ide-code-analysis
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-f1_keywords: 
+ms.topic: conceptual
+f1_keywords:
   - "vs.projectpropertypages.codeanalysis"
-helpviewer_keywords: 
+helpviewer_keywords:
   - "code analysis, managed code"
   - "managed code, code analysis"
 author: "gewarren"
 ms.author: "gewarren"
 manager: ghogen
-ms.workload: 
+ms.workload:
   - "dotnet"
 ---
-# Code analysis for managed code overview
+# Overview of code analysis for managed code
+
+Visual Studio 2017 analyzes managed code in two ways: with legacy *FxCop* static analysis of managed assemblies, and with .NET Compiler Platform *analyzers*. This topic covers FxCop static code analysis. To learn more about analyzing code by using .NET Compiler Platform analyzers, see [Overview of Roslyn analyzers](../code-quality/roslyn-analyzers-overview.md).
 
 Code analysis for managed code analyzes managed assemblies and reports information about the assemblies, such as violations of the programming and design rules set forth in the Microsoft .NET Framework Design Guidelines.
 
@@ -71,5 +69,6 @@ You can use the integrated features of the build system to run the analysis tool
 
 ## See also
 
-[Using Rule Sets to Group Code Analysis Rules](../code-quality/using-rule-sets-to-group-code-analysis-rules.md)   
-[How to: Enable and Disable Automatic Code Analysis](../code-quality/how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md)
+- [Overview of Roslyn analyzers](../code-quality/roslyn-analyzers-overview.md)
+- [Using Rule Sets to Group Code Analysis Rules](../code-quality/using-rule-sets-to-group-code-analysis-rules.md)
+- [How to: Enable and Disable Automatic Code Analysis](../code-quality/how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md)

docs/code-quality/in-source-suppression-overview.md

@@ -1,12 +1,9 @@
 ---
 title: "Suppress code analysis warnings in Visual Studio | Microsoft Docs"
-ms.custom: ""
 ms.date: 01/29/2018
-ms.reviewer: ""
-ms.suite: ""
 ms.technology: vs-ide-code-analysis
 ms.topic: "article"
-helpviewer_keywords: 
+helpviewer_keywords:
   - "source suppression, code analysis"
   - "code analysis, source suppression"
 author: "gewarren"
@@ -16,10 +13,10 @@ dev_langs:
  - CSharp
  - VB
  - CPP
-ms.workload: 
+ms.workload:
   - "multiple"
 ---
-# Suppressing code analysis warnings
+# Suppress code analysis warnings
 
 It is often useful to indicate that a warning is not applicable. This indicates to team members that the code was reviewed, and that the warning can be suppressed. In-source suppression (ISS) uses the <xref:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute> attribute to suppress a warning. The attribute can be placed close to the code segment that generated the warning. You can add the <xref:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute> attribute to the source file by typing it in, or you can use the shortcut menu on a warning in the **Error List** to add it automatically.
 
@@ -89,7 +86,7 @@ If there are strict performance reasons for minimizing in-source suppression met
 
 For maintainability reasons, omitting the rule name is not recommended.
 
-## Suppressing selective violations within a method body
+## Suppress selective violations within a method body
 
 Suppression attributes can be applied to a method, but cannot be embedded within a method body. This means that all violations of a particular rule are suppressed if you add the <xref:System.Diagnostics.CodeAnalysis.SuppressMessageAttribute> attribute to the method.
 
@@ -163,4 +160,5 @@ The global suppression file maintains suppressions that are either global-level
 
 ## See also
 
-<xref:System.Diagnostics.CodeAnalysis>
+- <xref:System.Diagnostics.CodeAnalysis>
+- [Use Roslyn analyzers](../code-quality/use-roslyn-analyzers.md)

docs/code-quality/install-roslyn-analyzers.md

@@ -0,0 +1,74 @@
+---
+title: "Install Roslyn analyzers in Visual Studio | Microsoft Docs"
+ms.date: 03/26/2018
+ms.technology: vs-ide-code-analysis
+ms.topic: conceptual
+helpviewer_keywords:
+  - "code analysis, managed code"
+  - "analyzers"
+  - "Roslyn analyzers"
+author: "gewarren"
+ms.author: "gewarren"
+manager: ghogen
+ms.workload:
+  - "dotnet"
+---
+# Install .NET Compiler Platform analyzers
+
+Visual Studio 2017 includes a core set of .NET Compiler Platform (*Roslyn*) analyzers. These analyzers are always on. You can install additional analyzers either as NuGet packages, or as Visual Studio extensions in *VSIX* files.
+
+## To install NuGet package analyzers
+
+1. [Determine which analyzer package version](https://github.com/dotnet/roslyn-analyzers#recommended-version-of-analyzer-packages) to install, based on your version of Visual Studio.
+
+1. Install the package in Visual Studio, using either the [Package Manager Console](/nuget/quickstart/install-and-use-a-package-in-visual-studio#package-manager-console) or the [Package Manager UI](/nuget/quickstart/install-and-use-a-package-in-visual-studio#package-manager-console).
+
+   > [!NOTE]
+   > The nuget.org page for each analyzer package shows you the command to paste into the **Package Manager Console**. There's even a handy button to copy the text to the clipboard.
+   >
+   > ![NuGet.org page showing Package Manager Console command](media/nuget-package-manager-command.png)
+
+   The analyzer assemblies are installed and appear in **Solution Explorer** under **References** > **Analyzers**.
+
+   ![Analyzers node in Solution Explorer](media/solution-explorer-analyzers-node.png)
+
+## To install VSIX analyzers
+
+1. In Visual Studio, select **Tools** > **Extensions and Updates**.
+
+   The **Extensions and Updates** dialog box opens.
+
+   > [!NOTE]
+   > Alternatively, download the extension directly from [Visual Studio Marketplace](https://marketplace.visualstudio.com/items?itemName=VisualStudioPlatformTeam.MicrosoftCodeAnalysis2017).
+
+1. Expand **Online** in the left pane, and then select **Visual Studio Marketplace**.
+
+1. In the search box, type "code analysis", and look for the **Microsoft Code Analysis 2017** extension.
+
+   ![Microsoft Code Analysis extension](media/extensions-and-updates-code-analysis.png)
+
+1. Select **Download**.
+
+   The extension is downloaded.
+
+1. Select **OK** to close the dialog box, and then close all instances of Visual Studio to launch the **VSIX Installer**.
+
+   The **VSIX Installer** dialog box opens.
+
+   ![VSIX installer for Microsoft Code Analysis](media/vsix-installer-code-analysis.png)
+
+1. Select **Modify** to start the installation.
+
+1. After a minute or two, the installation completes. Select **Close**.
+
+1. Open Visual Studio again.
+
+If you want to check whether the extension is installed, select **Tools** > **Extensions and Updates**. In the **Extensions and Updates** dialog box, select the **Installed** category on the left, and then search for the extension by name.
+
+## Next steps
+
+- [Use Roslyn analyzers in Visual Studio](../code-quality/use-roslyn-analyzers.md)
+
+## See also
+
+- [Overview of Roslyn analyzers in Visual Studio](../code-quality/roslyn-analyzers-overview.md)

docs/code-quality/media/analyzer-diagnostic-properties.png

@@ -0,0 +1,77 @@
+---
+title: "Roslyn analyzers in Visual Studio | Microsoft Docs"
+ms.date: 03/26/2018
+ms.technology: vs-ide-code-analysis
+ms.topic: conceptual
+helpviewer_keywords:
+  - "code analysis, managed code"
+  - "analyzers"
+  - "Roslyn analyzers"
+author: "gewarren"
+ms.author: "gewarren"
+manager: ghogen
+ms.workload:
+  - "dotnet"
+---
+# Overview of .NET Compiler Platform analyzers
+
+Visual Studio 2017 includes a built-in set of .NET Compiler Platform analyzers that analyze your C# or Visual Basic code as you type. You can install additional analyzers as a Visual Studio extension, or on a per-project basis as a NuGet package. Analyzers look at code style, code quality and maintainability, code design, and other issues.
+
+If rule violations are found by an analyzer, they are reported both in the code editor as a *squiggly* under the offending code, and in the **Error List**.
+
+Many analyzer rules, or *diagnostics*, have one or more associated *code fixes* that you can apply to correct the problem. The analyzer diagnostics that are built into Visual Studio each have an associated code fix. Code fixes are shown in the light bulb icon menu, along with other types of *Quick Actions*. For information about these code fixes, see [Common Quick Actions](../ide/common-quick-actions.md).
+
+![Analyzer violation and Quick Action code fix](../code-quality/media/built-in-analyzer-code-fix.png)
+
+## Roslyn analyzers vs. static code analysis
+
+.NET Compiler Platform ("Roslyn") analyzers will eventually replace [static code analysis](../code-quality/code-analysis-for-managed-code-overview.md) for managed code. Many of the static code analysis rules have already been rewritten as Roslyn analyzer diagnostics.
+
+Like static code analysis rule violations, Roslyn analyzer violations appear in the **Error List**. In addition, Roslyn analyzer violations also show up in the code editor as *squigglies* under the offending code. The color of the squiggly depends on the [severity setting](../code-quality/use-roslyn-analyzers.md#rule-severity) of the rule. The following screenshot shows three violations—one red, one green, and one gray:
+
+![Squigglies in the code editor](media/diagnostics-severity-colors.png)
+
+Roslyn analyzers analyze code at build time, like static code analysis if it's enabled, but also live as you type! Roslyn analyzers can also provide design-time analysis of code files that aren't open in the editor if you enable [full solution analysis](../code-quality/how-to-enable-and-disable-full-solution-analysis-for-managed-code.md#to-toggle-full-solution-analysis).
+
+> [!NOTE]
+> Build-time errors and warnings from Roslyn analyzers are shown only if the analyzers are installed as a NuGet package.
+
+Not only do Roslyn analyzers report the same types of problems that static code analysis does, but they make it easy for you to fix one, or all, occurrences of the violation in your file or project. These actions are called *code fixes*. Code fixes are IDE-specific; in Visual Studio, they are implemented as [Quick Actions](../ide/quick-actions.md). Not all analyzer diagnostics have an associated code fix.
+
+> [!NOTE]
+> The menu option **Analyze** > **Run Code Analysis** applies only to static code analysis. Additionally, on a project's **Code Analysis** property page, the **Enable Code Analysis on Build** and **Suppress results from generated code** checkboxes apply only to static code analysis. They have no effect on Roslyn analyzers.
+
+To differentiate between violations from Roslyn analyzers and static code analysis in the **Error List**, look at the **Tool** column. If the Tool value matches one of the analyzer assemblies in **Solution Explorer**, for example **Microsoft.CodeQuality.Analyzers**, the violation comes from a Roslyn analyzer. Otherwise, the violation originates from static code analysis.
+
+![Tool column in Error List](media/code-analysis-tool-in-error-list.png)
+
+## NuGet package vs. extension
+
+.NET Compiler Platform analyzers can be installed per-project via a NuGet package, or Visual Studio-wide as a Visual Studio extension. There are some key behavior differences between these two methods of [installing analyzers](../code-quality/install-roslyn-analyzers.md).
+
+### Scope
+
+If you install analyzers as a Visual Studio extension, they apply at the solution level, to all instances of Visual Studio. If you install the analyzers as a NuGet package, which is the preferred method, they apply only to the project where the NuGet package was installed. In team environments, analyzers installed as NuGet packages are in scope for *all developers* that work on that project.
+
+### Build errors
+
+To have rules enforced at build time, including through the command line or as part of a continuous integration (CI) build, install the analyzers as a NuGet package. Analyzer warnings and errors don't show up in the build report if you install the analyzers as an extension.
+
+The following screenshot shows the command-line build output from building a project that contains an analyzer rule violation:
+
+![MSBuild output with rule violation](media/command-line-build-analyzers.png)
+
+### Rule severity
+
+You cannot set the severity of rules from analyzers that were installed as a Visual Studio extension. To configure [rule severity](../code-quality/use-roslyn-analyzers.md#rule-severity), install the analyzers as a NuGet package.
+
+## Next steps
+
+- [Install Roslyn analyzers in Visual Studio](../code-quality/install-roslyn-analyzers.md)
+- [Use Roslyn analyzers in Visual Studio](../code-quality/use-roslyn-analyzers.md)
+
+## See also
+
+- [Quick Actions in Visual Studio](../ide/quick-actions.md)
+- [Write your own Roslyn analyzer](../extensibility/getting-started-with-roslyn-analyzers.md)
+- [.NET Compiler Platform SDK](/dotnet/csharp/roslyn-sdk/)