Merge branch 'master' of https://github.com/MicrosoftDocs/visualstudio-docs-pr

Author: Kraig Brockschmidt

.openpublishing.redirection.json

@@ -97,6 +97,11 @@
             "redirect_url": "/visualstudio/code-quality/code-analysis-for-c-cpp-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/code-quality/code-analysis-rule-set-reference.md",
+            "redirect_url": "/visualstudio/code-quality/managed-minimun-rules-rule-set-for-managed-code",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/code-quality/creating-and-using-code-analysis-check-in-policies.md",
             "redirect_url": "/visualstudio/code-quality/how-to-create-or-update-standard-code-analysis-check-in-policies",

connected-environment/TOC.md

@@ -30,6 +30,7 @@
 
 # How to
 ##[Share a development environment](how-to/share-dev-environment.md)
+##[Use a custom NuGet feed](how-to/use-a-custom-nuget-feed.md)
 ##[Use kubectl with Visual Studio Connected Environment](how-to/use-kubectl-with-vsce.md)
 
 # [Troubleshoot](troubleshooting.md)

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

@@ -0,0 +1,58 @@
+---
+title: "How to use a custom NuGet feed in a connected environment| Microsoft Docs"
+author: "johnsta"
+ms.author: "johnsta"
+ms.date: "03/27/2018"
+ms.topic: "article"
+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: "ghogen"
+---
+#  Use a custom NuGet feed in a connected environment
+
+A NuGet feed provides a convenient way to include package sources in a project. Connected Environment will need to be able to access this feed in order for dependencies to be properly installed in the Docker container.
+
+To set up a NuGet feed:
+1. Add a [package reference](https://docs.microsoft.com/en-us/nuget/consume-packages/package-references-in-project-files) in the `*.csproj` file under the `PackageReference` node.
+
+   ```xml
+   <ItemGroup>
+       <!-- ... -->
+       <PackageReference Include="Contoso.Utility.UsefulStuff" Version="3.6.0" />
+       <!-- ... -->
+   </ItemGroup>
+   ```
+
+2. Create a [NuGet.Config](https://docs.microsoft.com/en-us/nuget/reference/nuget-config-file) file in the project folder.
+     * Use the `packageSources` section to reference your NuGet feed location. Important: The NuGet feed must be publicly accessible.
+     * Use the `packageSourceCredentials` section to configure username and password credentials. 
+
+   ```xml
+   <packageSources>
+       <add key="Contoso" value="https://contoso.com/packages/" />
+   </packageSources>
+
+   <packageSourceCredentials>
+       <Contoso>
+           <add key="Username" value="[email protected]" />
+           <add key="ClearTextPassword" value="33f!!lloppa" />
+       </Contoso>
+   </packageSourceCredentials>
+   ```
+
+3. If you're using source code control:
+    - Reference `NuGet.Config` in your `.gitignore` file so you don't accidentally commit credentials to your source repository.
+    - Open the `vsce.yaml` file in your project, and locate the `build` section, and insert the following snippet to ensure that the `NuGet.Config` file will be synced to Azure so that it used during the container image build process. (By default, Connected Environment does not synchronize files that match `.gitignore` and `.dockerignore` rules.)
+
+        ```yaml
+        build:
+        useGitIgnore: true
+        ignore:
+        - “!NuGet.Config”
+        ```
+
+
+## Next steps
+
+Once you have completed the above steps, the next time you run `vsce up` (or hit `F5` in VSCode or Visual Studio), Connected Environment will synchronize the `NuGet.Config` file to Azure, which is then utilized by `dotnet restore` to install package dependencies in the container.
+

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,20 +12,21 @@
 ## [Configure and Use a Custom Rule Set](walkthrough-configuring-and-using-a-custom-rule-set.md)
 # How-to guides
 ## Code Analysis for Managed Code
-### [Enable and Disable Automatic Code Analysis for Managed Code](how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md)
-### [Enable and Disable Full Solution Analysis for Managed Code](how-to-enable-and-disable-full-solution-analysis-for-managed-code.md)
+### [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)
-### [Run Code Analysis Manually for Managed Code](how-to-run-code-analysis-manually-for-managed-code.md)
+### [Run Code Analysis Manually](how-to-run-code-analysis-manually-for-managed-code.md)
 ### [Suppress Warnings](in-source-suppression-overview.md)
 #### [Suppress Code Analysis Warnings for Generated Code](how-to-suppress-code-analysis-warnings-for-generated-code.md)
 ### [Customize the Code Analysis Dictionary](how-to-customize-the-code-analysis-dictionary.md)
 ### [Anonymous Methods and Code Analysis](anonymous-methods-and-code-analysis.md)
 ### [Create a Work Item for a Managed Code Defect](how-to-create-a-work-item-for-a-managed-code-defect.md)
 ## Code Analysis for C/C++
-### [Use Rule Sets to Specify the C++ Rules to Run](using-rule-sets-to-specify-the-cpp-rules-to-run.md)
 ### [Use the C++ Core Guidelines checkers](using-the-cpp-core-guidelines-checkers.md)
-### [Set Code Analysis Properties for C/C++ Projects](how-to-set-code-analysis-properties-for-c-cpp-projects.md)
-### [Use SAL Annotations to Reduce C/C++ Code Defects](using-sal-annotations-to-reduce-c-cpp-code-defects.md)
+### [Set Code Analysis Properties](how-to-set-code-analysis-properties-for-c-cpp-projects.md)
+### [Use SAL Annotations to Reduce Code Defects](using-sal-annotations-to-reduce-c-cpp-code-defects.md)
 #### [Understand SAL](understanding-sal.md)
 #### [Annotate Function Parameters and Return Values](annotating-function-parameters-and-return-values.md)
 #### [Annotate Function Behavior](annotating-function-behavior.md)
@@ -35,27 +37,14 @@
 #### [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)
 ## [Use Rule Sets to Group Code Analysis Rules](using-rule-sets-to-group-code-analysis-rules.md)
-### [Configure Code Analysis for a Managed Code Project](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)
-### [Synchronize Code Project Rule Sets with Team Project Check-in Policy](how-to-synchronize-code-project-rule-sets-with-team-project-check-in-policy.md)
-### [Specify Managed Code Rule Sets for Multiple Projects in a Solution](how-to-specify-managed-code-rule-sets-for-multiple-projects-in-a-solution.md)
-### [Create Custom Code Analysis Rule Sets](creating-custom-code-analysis-rule-sets.md)
+### [Use 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)
+#### [Specify Rule Sets for Multiple Projects](how-to-specify-managed-code-rule-sets-for-multiple-projects-in-a-solution.md)
+### [Use Rule Sets for C++ Code](using-rule-sets-to-specify-the-cpp-rules-to-run.md)
+### [Synchronize Project Rule Sets with Team Project Check-in Policy](how-to-synchronize-code-project-rule-sets-with-team-project-check-in-policy.md)
+### [Create Custom Rule Sets](creating-custom-code-analysis-rule-sets.md)
 #### [Create a Custom Rule Set](how-to-create-a-custom-rule-set.md)
-#### [Use the Code Analysis Rule Set Editor](working-in-the-code-analysis-rule-set-editor.md)
-### [Code analysis rule set reference](code-analysis-rule-set-reference.md)
-#### [All Rules rule set](all-rules-rule-set.md)
-#### [Basic Correctness Rules rule set for managed code](basic-correctness-rules-rule-set-for-managed-code.md)
-#### [Basic Design Guideline Rules rule set for managed code](basic-design-guideline-rules-rule-set-for-managed-code.md)
-#### [Extended Correctness Rules rule set for managed code](extended-correctness-rules-rule-set-for-managed-code.md)
-#### [Extended Design Guidelines Rules rule set for managed code](extended-design-guidelines-rules-rule-set-for-managed-code.md)
-#### [Globalization Rules rule set for managed code](globalization-rules-rule-set-for-managed-code.md)
-#### [Managed Minimun Rules rule set for managed code](managed-minimun-rules-rule-set-for-managed-code.md)
-#### [Managed Recommended Rules rule set for managed code](managed-recommended-rules-rule-set-for-managed-code.md)
-#### [Mixed Minimum Rules rule set](mixed-minimum-rules-rule-set.md)
-#### [Mixed Recommended Rules rule set](mixed-recommended-rules-rule-set.md)
-#### [Native Minimum Rules rule set](native-minimum-rules-rule-set.md)
-#### [Native Recommended Rules rule set](native-recommended-rules-rule-set.md)
-#### [Security Rules rule set for managed code](security-rules-rule-set-for-managed-code.md)
+#### [Use the Rule Set Editor](working-in-the-code-analysis-rule-set-editor.md)
 ## [Create Code Analysis Check-in Policies](how-to-create-or-update-standard-code-analysis-check-in-policies.md)
 ### [Implement Custom Code Analysis Check-in Policies for Managed Code](implementing-custom-code-analysis-check-in-policies-for-managed-code.md)
 ### [Enforce Maintainable Code](how-to-enforce-maintainable-code-with-a-code-analysis-check-in-policy.md)
@@ -64,6 +53,20 @@
 ### [Generate Code Metrics Data](how-to-generate-code-metrics-data.md)
 ### [Work with Code Metrics Data](working-with-code-metrics-data.md)
 # Reference
+## Rule sets
+### [All Rules rule set](all-rules-rule-set.md)
+### [Basic Correctness Rules rule set for managed code](basic-correctness-rules-rule-set-for-managed-code.md)
+### [Basic Design Guideline Rules rule set for managed code](basic-design-guideline-rules-rule-set-for-managed-code.md)
+### [Extended Correctness Rules rule set for managed code](extended-correctness-rules-rule-set-for-managed-code.md)
+### [Extended Design Guidelines Rules rule set for managed code](extended-design-guidelines-rules-rule-set-for-managed-code.md)
+### [Globalization Rules rule set for managed code](globalization-rules-rule-set-for-managed-code.md)
+### [Managed Minimun Rules rule set for managed code](managed-minimun-rules-rule-set-for-managed-code.md)
+### [Managed Recommended Rules rule set for managed code](managed-recommended-rules-rule-set-for-managed-code.md)
+### [Mixed Minimum Rules rule set](mixed-minimum-rules-rule-set.md)
+### [Mixed Recommended Rules rule set](mixed-recommended-rules-rule-set.md)
+### [Native Minimum Rules rule set](native-minimum-rules-rule-set.md)
+### [Native Recommended Rules rule set](native-recommended-rules-rule-set.md)
+### [Security Rules rule set for managed code](security-rules-rule-set-for-managed-code.md)
 ## [Code Analysis for Managed Code Warnings](code-analysis-for-managed-code-warnings.md)
 ### [Code Analysis Warnings for Managed Code by CheckId](code-analysis-warnings-for-managed-code-by-checkid.md)
 ### [Cryptography Warnings](cryptography-warnings.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)