Merge remote-tracking branch 'MicrosoftDocs/master'

Author: timeyoutakeit

.openpublishing.redirection.json

@@ -11,7 +11,6 @@
             "redirect_document_id": false
         },
         {
-
             "source_path": "docs/extensibility/shell/walkthrough-creating-a-basic-isolated-shell-application.md",
             "redirect_url": "https://vspartner.com/pages/vsshells",
             "redirect_document_id": false
@@ -22,7 +21,6 @@
             "redirect_document_id": false
         },
         {
-
             "source_path": "docs/extensibility/shell/extending-the-isolated-shell.md",
             "redirect_url": "https://vspartner.com/pages/vsshells",
             "redirect_document_id": false
@@ -99,19 +97,29 @@
         },
         {
             "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_url": "/visualstudio/code-quality/rule-set-reference",
             "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",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/code-quality/creating-custom-code-analysis-rule-sets.md",
+            "redirect_url": "/visualstudio/code-quality/how-to-create-a-custom-rule-set",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/code-quality/enhancing-code-quality-with-team-project-check-in-policies.md",
             "redirect_url": "/visualstudio/code-quality/how-to-create-or-update-standard-code-analysis-check-in-policies",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/code-quality/how-to-specify-managed-code-rule-sets-for-multiple-projects-in-a-solution.md",
+            "redirect_url": "/visualstudio/code-quality/how-to-configure-code-analysis-for-a-managed-code-project",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/code-quality/how-to-suppress-warnings-by-using-the-menu-item.md",
             "redirect_url": "/visualstudio/code-quality/in-source-suppression-overview",
@@ -137,6 +145,11 @@
             "redirect_url": "/visualstudio/code-quality/in-source-suppression-overview",
             "redirect_document_id": false
         },
+        {
+            "source_path": "docs/code-quality/walkthrough-configuring-and-using-a-custom-rule-set.md",
+            "redirect_url": "/visualstudio/code-quality/how-to-create-a-custom-rule-set",
+            "redirect_document_id": false
+        },
         {
             "source_path": "docs/cross-platform/visual-studio-tools-for-apache-cordova.md",
             "redirect_url": "/visualstudio/cross-platform/tools-for-cordova/",
@@ -2212,6 +2225,32 @@
           "source_path": "subscriptions/vscloud-cancel.md",
           "redirect_url": "/visualstudio/subscriptions/vscloud-overview",
           "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/renew-msstore-subscriptions.md",
+            "redirect_url": "http://www.visualstudio.com/vs/pricing/",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/find-subscription-id.md",
+            "redirect_url": "/visualstudio/subscriptions/find-pcn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/multiple-pcns.md",
+            "redirect_url": "/visualstudio/subscriptions/find-pcn",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/managing-admins.md",
+            "redirect_url": "/visualstudio/subscriptions/subscription-management-info",
+            "redirect_document_id": false
+        },
+        {
+            "source_path": "subscriptions/access-admin-portal.md",
+            "redirect_url": "/visualstudio/subscriptions/subscription-management-info",
+            "redirect_document_id": false
         }
+        
     ]
 }

connected-environment/get-started-netcore-01.md

@@ -2,7 +2,7 @@
 title: "Create a .NET Core development environment with containers using Kubernetes in the cloud - Step 1 - Install tools | Microsoft Docs"
 author: "johnsta"
 ms.author: "johnsta"
-ms.date: "02/20/2018"
+ms.date: "04/05/2018"
 ms.topic: "get-started-article"
 ms.technology: "vsce-kubernetes"
 description: "Rapid Kubernetes development with containers and microservices on Azure"

connected-environment/get-started-netcore-visualstudio-01.md

@@ -2,7 +2,7 @@
 title: "Create a .NET Core development environment with containers using Kubernetes in the cloud with Visual Studio - Step 1 - Install tools | Microsoft Docs"
 author: "johnsta"
 ms.author: "johnsta"
-ms.date: "02/20/2018"
+ms.date: "04/05/2018"
 ms.topic: "get-started-article"
 ms.technology: "vsce-kubernetes"
 description: "Rapid Kubernetes development with containers and microservices on Azure"
@@ -23,8 +23,6 @@ In this guide, you will learn how to:
 ## 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.
 
-1. Install [Git for Windows](https://git-scm.com/downloads), select the default install options. 
-1. Download **kubectl.exe** from [this link](https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/windows/amd64/kubectl.exe) and **save** it to a location on your PATH.
 1. Download and run the [Connected Environment CLI Installer](https://aka.ms/get-vsce-windows). 
 
 ## Get Kubernetes Debugging Tools
@@ -39,4 +37,4 @@ While you can use the Connected Environment CLI as a standalone tool, rich featu
 We're now ready to Create an ASP.NET web app with Visual Studio.
 
 > [!div class="nextstepaction"]
-> [Create an ASP.NET web app](get-started-netcore-visualstudio-02.md)
+> [Create an ASP.NET web app](get-started-netcore-visualstudio-02.md)

connected-environment/get-started-netcore-visualstudio-06.md

@@ -2,7 +2,7 @@
 title: "Create a .NET Core development environment with containers using Kubernetes in the cloud with Visual Studio - Step 6 - Learn about team development | Microsoft Docs"
 author: "johnsta"
 ms.author: "johnsta"
-ms.date: "02/20/2018"
+ms.date: "04/05/2018"
 ms.topic: "get-started-article"
 ms.technology: "vsce-kubernetes"
 description: "Rapid Kubernetes development with containers and microservices on Azure"

connected-environment/get-started-netcore-visualstudio-07.md

@@ -2,7 +2,7 @@
 title: "Create a .NET Core development environment with containers using Kubernetes in the cloud with Visual Studio - Step 7 - Summary | Microsoft Docs"
 author: "johnsta"
 ms.author: "johnsta"
-ms.date: "02/20/2018"
+ms.date: "04/05/2018"
 ms.topic: "get-started-article"
 ms.technology: "vsce-kubernetes"
 description: "Rapid Kubernetes development with containers and microservices on Azure"

connected-environment/get-started-nodejs-01.md

@@ -2,7 +2,7 @@
 title: "Create a Node.js development environment with containers using Kubernetes in the cloud - Step 1 - Install tools | Microsoft Docs"
 author: "johnsta"
 ms.author: "johnsta"
-ms.date: "02/20/2018"
+ms.date: "04/05/2018"
 ms.topic: "get-started-article"
 ms.technology: "vsce-kubernetes"
 description: "Rapid Kubernetes development with containers and microservices on Azure"

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

@@ -8,8 +8,6 @@ curl -L https://aka.ms/get-vsce-mac | bash
 ```
 
 ### Install on Windows
-1. Install [Git for Windows](https://git-scm.com/downloads), select the default install options. 
-1. Download **kubectl.exe** from [this link](https://storage.googleapis.com/kubernetes-release/release/v1.9.0/bin/windows/amd64/kubectl.exe) and **save** it to a location on your PATH.
 1. Download and run the [Connected Environment CLI Installer](https://aka.ms/get-vsce-windows). 
 
 ### Install on Linux
@@ -23,5 +21,5 @@ While you can use the Connected Environment CLI as a standalone tool, rich featu
 1. Install the extension: 
 
 ```cmd
-code --install-extension path-to-downloaded-extension/vsce-0.1.0.vsix
+code --install-extension path-to-downloaded-extension/vsce-0.1.1.vsix
 ```

docs/TOC.md

@@ -53,6 +53,7 @@
 ## [Python: Create a Web App](ide/quickstart-python.md)
 ## [Node.js: Create a Web App](ide/quickstart-nodejs.md)
 ## [C#: Create a Web App](ide/quickstart-aspnet-core.md)
+## [C#: Create a UWP App](ide/quickstart-uwp-csharp.md)
 ## [Visual Basic: Create a Console App](ide/quickstart-visual-basic-console.md)
 # Tutorials
 ## [C++ in Visual Studio...](/cpp/build/vscpp-step-0-installation)

docs/ai/index.yml

@@ -4,7 +4,7 @@ title: Visual Studio Tools for AI
 metadata:
   document_id: 83ceabb5-fb4f-a709-3fd2-37d024409f31
   title: Visual Studio Tools for AI | Microsoft Docs
-  meta.description: 
+  meta.description:
   services: ai-tools-visual-studio
   author: lisawong19
   manager: routlaw
@@ -14,6 +14,7 @@ metadata:
   ms.topic: landing-page
   ms.date: 10-25-2017
   ms.author: liwong
+  ms.technology: vs-ai-tools
 abstract:
   description: Visual Studio Tools for AI is an integrated development environment to build, test, and deploy deep learning solutions. Learn how to use AI Tools with our quickstarts, tutorials, and samples.
 sections:
@@ -23,10 +24,10 @@ sections:
     text: 'Learn how to run deep learning solution with:'
   - type: list
     style: icon48
-    items: 
-    - image: 
+    items:
+    - image:
         src: media/Tensorflow_logo.png
-      text: TensorFlow and Python 
+      text: TensorFlow and Python
       href: tensorflow-local.md
 - title: Step-by-Step Tutorials
   items:

docs/code-quality/TOC.md

@@ -9,7 +9,6 @@
 ## [Analyze Managed Code for Code Defects](walkthrough-analyzing-managed-code-for-code-defects.md)
 ## [Analyze C/C++ Code for Defects](walkthrough-analyzing-c-cpp-code-for-defects.md)
 ### [Demo Sample](demo-sample.md)
-## [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)
@@ -36,24 +35,22 @@
 #### [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)
-## [Use Rule Sets to Group Code Analysis Rules](using-rule-sets-to-group-code-analysis-rules.md)
-### [Use Rule Sets for Managed Code](how-to-configure-code-analysis-for-a-managed-code-project.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)
-#### [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 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)
+### [Rule Sets for C++ Code](using-rule-sets-to-specify-the-cpp-rules-to-run.md)
+### [Create a Custom Rule Set](how-to-create-a-custom-rule-set.md)
+### [Use the Rule Set Editor](working-in-the-code-analysis-rule-set-editor.md)
+## [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)
+### [Synchronize Project Rule Sets with Team Check-in Policy](how-to-synchronize-code-project-rule-sets-with-team-project-check-in-policy.md)
 ### [Version Compatibility](version-compatibility-for-code-analysis-check-in-policies.md)
 ## Code Metrics
 ### [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
+## [Rule sets](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)

docs/code-quality/ca0062.md

@@ -1,31 +1,27 @@
 ---
 title: "CA0062 | Microsoft Docs"
-ms.custom: ""
 ms.date: "10/20/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "vs-ide-code-analysis"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-f1_keywords: 
+ms.technology: vs-ide-code-analysis
+ms.topic: reference
+f1_keywords:
   - "CA0062"
 ms.assetid: 6031bfc3-82e0-4d91-b8e8-cd325a099001
-caps.latest.revision: 9
 author: "gewarren"
 ms.author: "gewarren"
 manager: ghogen
-ms.workload: 
+ms.workload:
   - "multiple"
 ---
 # CA0062
-The rule '*RuleId*' referenced in rule set '*RuleSetName*' could not be found.  
-  
- This error indicates that the specified rule could not be found.  
-  
- This error usually occurs because a ruleset file was edited by hand. To avoid this error, use the [!INCLUDE[vsprvs](../code-quality/includes/vsprvs_md.md)] rule set editor to specify rules. For more information, see [Creating Custom Rule Sets](../code-quality/creating-custom-code-analysis-rule-sets.md).  
-  
- To resolve this issue, make sure that all the check ids that are specified in your ruleset file are valid. if you are using nonstandard rule files, make and that the appropriate rule hint paths are specified in your ruleset file.  
-  
-## See Also  
- [Code Analysis Application Errors](../code-quality/code-analysis-application-errors.md)   
+
+The rule '*RuleId*' referenced in rule set '*RuleSetName*' could not be found.
+
+This error indicates that the specified rule couldn't be found.
+
+This error usually occurs because a rule set file was edited by hand. To avoid this error, you can use the Visual Studio [rule set editor](../code-quality/working-in-the-code-analysis-rule-set-editor.md) to configure code analysis rules.
+
+To resolve this issue, make sure that all the check IDs that are specified in your *.ruleset* file are valid. if you are using a non-standard rule set file, make sure that the appropriate rule hint paths are specified in the file.
+
+## See also
+
+- [Code Analysis Application Errors](../code-quality/code-analysis-application-errors.md)

docs/code-quality/ca0064.md

@@ -1,33 +1,29 @@
 ---
 title: "CA0064 | Microsoft Docs"
-ms.custom: ""
 ms.date: "10/19/2016"
-ms.reviewer: ""
-ms.suite: ""
-ms.technology: 
-  - "vs-ide-code-analysis"
-ms.tgt_pltfrm: ""
-ms.topic: "article"
-f1_keywords: 
+ms.technology: vs-ide-code-analysis
+ms.topic: reference
+f1_keywords:
   - "CA0064"
 ms.assetid: 6f41ed9d-a690-47dc-8922-631e8530297b
-caps.latest.revision: 9
 author: "gewarren"
 ms.author: "gewarren"
 manager: ghogen
-ms.workload: 
+ms.workload:
   - "multiple"
 ---
 # CA0064
-No analysis was performed because the specified rule set did not contain any FxCop rules.  
-  
- This warning can occur in one of the following situations:  
-  
--   If you encounter this warning in conjunction with CA0063 warnings, there was an a problem loading your ruleset file. For more information, see the [CA0063](ca0063.md) documentation.  
-  
--   If you encountered this error in conjunction with CA0062 warnings, it most likely that Code Analysis was unable to find the assembly or assemblies that contain the rules specified by the ruleset. For more information, see the [CA0062](ca0062.md) documentation.  
-  
--   Otherwise, this warning usually occurs when your ruleset is empty or all of the rule enabled in child ruleset have been disabled. Use the [!INCLUDE[vs_current_short](../code-quality/includes/vs_current_short_md.md)] ruleset editor to enable some rules in your ruleset. For more information, see [Creating Custom Rule Sets](../code-quality/creating-custom-code-analysis-rule-sets.md).  
-  
-## See Also  
- [Code Analysis Application Errors](../code-quality/code-analysis-application-errors.md)   
+
+No analysis was performed because the specified rule set did not contain any FxCop rules.
+
+This warning can occur in one of the following situations:
+
+- If you encounter this warning in conjunction with CA0063 warnings, there was an a problem loading your ruleset file. For more information, see the [CA0063](ca0063.md) documentation.
+
+- If you encounter this error in conjunction with CA0062 warnings, it most likely that Code Analysis was unable to find the assembly or assemblies that contain the rules specified by the ruleset. For more information, see the [CA0062](ca0062.md) documentation.
+
+- Otherwise, this warning usually occurs when your ruleset is empty or all of the rules enabled in a child rule set have been disabled. Use the Visual Studio [rule set editor](../code-quality/working-in-the-code-analysis-rule-set-editor.md) to enable some rules in your ruleset.
+
+## See also
+
+- [Code Analysis Application Errors](../code-quality/code-analysis-application-errors.md)

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

@@ -28,11 +28,11 @@ You can run code analysis on your project manually or automatically.
 
 To run code analysis each time that you build a project, select **Enable Code Analysis on Build** on the project's Property Page. For more information, see [How to: Enable and Disable Automatic Code Analysis](../code-quality/how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md).
 
-To run code analysis manually on a project, from the menu bar choose **Analyze** > **Run Code Analysis** > **Run Code Analysis on <project>**. For more information, see [How to: Enable and Disable Automatic Code Analysis](../code-quality/how-to-enable-and-disable-automatic-code-analysis-for-managed-code.md).
+To run code analysis manually on a project, from the menu bar choose **Analyze** > **Run Code Analysis** > **Run Code Analysis on \<project>**.
 
 ## Rule sets
 
-Code analysis rules for managed code are grouped into *rule sets*. You can use one of the Microsoft standard rule sets, or you can create a custom rule set to fulfill a specific need. For more information, see [Using Rule Sets to Group Code Analysis Rules](../code-quality/using-rule-sets-to-group-code-analysis-rules.md).
+Code analysis rules for managed code are grouped into [rule sets](../code-quality/using-rule-sets-to-group-code-analysis-rules.md). You can use one of the Microsoft standard rule sets, or you can [create a custom rule set](../code-quality/how-to-create-a-custom-rule-set.md) to fulfill a specific need.
 
 ## Suppress warnings
 
@@ -51,7 +51,7 @@ Public class MyClass
 For more information, see [Suppress warnings](../code-quality/in-source-suppression-overview.md).
 
 > [!NOTE]
-> If you migrate a project to Visual Studio 2017, you might suddenly be faced with an overwhelming number of code analysis warnings. If you aren't ready to fix the warnings and want to temporarily turn code analysis off, open the project's property pages (**Project** > ***project* Properties...**) and go to the **Code Analysis** tab. Deselect **Enable Code Analysis on Build**, and then rebuild your project. Alternatively, you can select a different, smaller rule set to run against the code. Remember to turn code analysis back on when you are ready to fix the warnings.
+> If you migrate a project to Visual Studio 2017, you might suddenly be faced with a large number of code analysis warnings. If you aren't ready to fix the warnings and want to become productive right away, you can *baseline* the analysis state of your project. From the **Analyze** menu, select **Run Code Analysis and Suppress Active Issues**.
 
 ## Run code analysis as part of check-in policy