Merge pull request #5792 from MicrosoftDocs/master637342547511294217

For protected CLA branch, push strategy should use PR and merge to target branch method to work around git push error

Author: ghogen

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

@@ -1,18 +1,17 @@
 ---
 title: Code analysis for managed code
-ms.date: 06/12/2019
+ms.date: 08/27/2020
 ms.topic: conceptual
 helpviewer_keywords:
 - code analysis, managed code
 - managed code, code analysis
-author: mikejo5000
-ms.author: mikejo
+author: mikadumont
+ms.author: midumont
 manager: jillfra
 ms.workload:
 - dotnet
 ---
-# Overview of code analysis for managed code in Visual Studio
 
-Visual Studio can perform code analysis of managed code in two ways:
-- With [legacy analysis](../code-quality/walkthrough-analyzing-managed-code-for-code-defects.md), also known as FxCop static analysis of managed assemblies.
-- With the more modern [.NET Compiler Platform-based code analyzers](../code-quality/roslyn-analyzers-overview.md). .NET Compiler Platform-based code analyzers, which analyze your code live as you type, replace legacy FxCop static code analysis, which only analyzes compiled code.
+# Overview of code analysis for .NET in Visual Studio
+
+Visual Studio can perform code analysis of managed code in two ways: with [legacy analysis](../code-quality/walkthrough-analyzing-managed-code-for-code-defects.md), also known as FxCop static analysis of managed assemblies, and with the more modern [.NET Compiler Platform-based code analyzers](../code-quality/roslyn-analyzers-overview.md). .NET Compiler Platform-based code analyzers, which analyze your code live as you type, replace legacy FxCop static code analysis, which only analyzes compiled code.

docs/code-quality/code-analysis-warnings-for-managed-code-by-checkid.md

@@ -1,6 +1,6 @@
 ---
-title: Code Analysis Warnings for Managed Code by CheckId
-ms.date: 04/18/2019
+title: Code quality rules overview
+ms.date: 08/27/2020
 ms.topic: reference
 f1_keywords:
 - CA1000
@@ -290,8 +290,8 @@ f1_keywords:
 - IL3000
 - IL3001
 ms.assetid: 5cb221f6-dc59-4abf-9bfa-adbd6f907f96
-author: mikejo5000
-ms.author: mikejo
+author: mikadumont
+ms.author: midumont
 manager: jillfra
 ms.workload:
 - dotnet

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

@@ -1,12 +1,12 @@
 ---
-title: Suppress code analysis warnings
-ms.date: 12/01/2018
+title: Suppress code analysis violations
+ms.date: 08/27/2020
 ms.topic: conceptual
 helpviewer_keywords:
 - source suppression, code analysis
 - code analysis, source suppression
-author: mikejo5000
-ms.author: mikejo
+author: mikadumont
+ms.author: midumont
 manager: jillfra
 dev_langs:
 - CSharp
@@ -15,7 +15,7 @@ dev_langs:
 ms.workload:
 - multiple
 ---
-# Suppress code analysis warnings
+# Suppress code analysis violations
 
 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.
 

docs/code-quality/index.yml

@@ -33,7 +33,7 @@ landingContent:
             url: code-analysis-for-c-cpp-warnings.md
 
   # Card
-  - title: Analyze managed code quality
+  - title: .NET code quality analysis
     linkLists:
       - linkListType: overview
         links:
@@ -47,19 +47,19 @@ landingContent:
             url: analyzers-faq.md
       - linkListType: how-to-guide
         links:
-          - text: Install FxCop analyzers
+          - text: Configure code quality analysis
             url: install-fxcop-analyzers.md
       - linkListType: reference
         links:
-          - text: Managed code analysis warnings
+          - text: .NET code quality rules
             url: code-analysis-for-managed-code-warnings.md
 
   # Card
-  - title: Analyze managed code style
+  - title: .NET code style analysis
     linkLists:
       - linkListType: how-to-guide
         links:
-          - text: Analyze code style
+          - text: Configure code style analysis
             url: ../ide/create-portable-custom-editor-options.md
 
   # Card

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

@@ -1,26 +1,26 @@
 ---
-title: Install Roslyn analyzers
-ms.date: 08/03/2018
-ms.topic: how-to
-helpviewer_keywords: 
-  - code analysis, managed code
-  - analyzers
-  - Roslyn analyzers
-author: mikejo5000
-ms.author: mikejo
+title: Install third party analyzers
+ms.date: 08/27/2020
+ms.topic: conceptual
+helpviewer_keywords:
+- code analysis, managed code
+- analyzers
+- Roslyn analyzers
+author: mikadumont
+ms.author: midumont
 manager: jillfra
 ms.workload: 
   - dotnet
 ---
-# Install .NET Compiler Platform code analyzers
+# Install third-party analyzers
 
 Visual Studio 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 analyzer packages
 
 1. Find the analyzer package you want to install on www.nuget.org.
 
-   For example, you may want to [install the Microsoft FxCop analyzers](install-fxcop-analyzers.md#nuget-package) to check your code for security and performance issues, among others. Or, install [StyleCop.Analyzers](https://www.nuget.org/packages/stylecop.analyzers/) to look for style issues in your codebase.
+   For example, you may want to install [StyleCop.Analyzers](https://www.nuget.org/packages/stylecop.analyzers/) to look for style issues in your codebase.
 
 2. 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).
 

docs/code-quality/toc.yml

@@ -1,6 +1,6 @@
 - name: Code analysis documentation
   href: index.yml
-- name: Analyze managed code
+- name: .NET code analysis
   items:
   - name: Overview
     href: code-analysis-for-managed-code-overview.md
@@ -10,38 +10,28 @@
     - name: Overview
       displayName: roslyn analyzers, source analysis
       href: roslyn-analyzers-overview.md
-    - name: Install source code analyzers
+    - name: Install third-party analyzers
       href: install-roslyn-analyzers.md
-    - name: Configure source code analyzers
-      href: use-roslyn-analyzers.md
-    - name: Live code analysis scope
-      href: configure-live-code-analysis-scope-managed-code.md
-    - name: Run code analysis manually
-      href: how-to-run-code-analysis-manually-for-managed-code.md
-    - name: Disable code analysis
-      href: disable-code-analysis.md
+    - name: Configuration
+      items:
+      - name: Configure source code analysis
+        href: use-roslyn-analyzers.md
+      - name: Configure code quality analysis
+        href: configure-fxcop-analyzers.md
+      - name: Configure code quality analysis categories
+        href: analyzer-rule-sets.md
+      - name: Code quality analysis options
+        href: fxcop-analyzer-options.md
+      - name: Live code analysis scope
+        href: configure-live-code-analysis-scope-managed-code.md
+      - name: Run code analysis manually
+        href: how-to-run-code-analysis-manually-for-managed-code.md
+      - name: Disable code analysis
+        href: disable-code-analysis.md
+      - name: Suppress code analysis
+        href: in-source-suppression-overview.md
     - name: FAQ
       href: analyzers-faq.md
-    - name: FxCop analyzers
-      items:
-      - name: Install FxCop analyzers
-        href: install-fxcop-analyzers.md
-      - name: Migrate to FxCop analyzers
-        items:
-        - name: Migrate from legacy analysis to FxCop analyzers
-          href: migrate-from-legacy-analysis-to-fxcop-analyzers.md
-        - name: FAQ
-          href: fxcop-analyzers-faq.md
-        - name: Ported rules
-          href: fxcop-rule-port-status.md
-      - name: Configure FxCop analyzers
-        items:
-        - name: Configure rules and projects
-          href: configure-fxcop-analyzers.md
-        - name: Scope options
-          href: fxcop-analyzer-options.md
-        - name: Enable a category of rules
-          href: analyzer-rule-sets.md
   - name: Legacy analysis
     items:
     - name: Overview
@@ -137,16 +127,60 @@
         href: how-to-synchronize-code-project-rule-sets-with-team-project-check-in-policy.md
       - name: Version compatibility
         href: version-compatibility-for-code-analysis-check-in-policies.md
-  - name: Rule sets
-    items:
-    - name: Overview
-      href: using-rule-sets-to-group-code-analysis-rules.md
-    - name: Configure rule sets
-      href: how-to-configure-code-analysis-for-a-managed-code-project.md
-    - name: Create a custom rule set
-      href: how-to-create-a-custom-rule-set.md
-    - name: Use the rule set editor
-      href: working-in-the-code-analysis-rule-set-editor.md
+    - name: FxCop analyzers
+      items:
+      - name: Install FxCop analyzers
+        href: install-fxcop-analyzers.md
+      - name: Migrate to FxCop analyzers
+        items:
+        - name: Migrate from legacy analysis to FxCop analyzers
+          href: migrate-from-legacy-analysis-to-fxcop-analyzers.md
+        - name: FAQ
+          href: fxcop-analyzers-faq.md
+        - name: Ported rules
+          href: fxcop-rule-port-status.md
+      - name: Configure FxCop analyzers
+        items:
+        - name: Rule sets
+          items:
+          - name: Overview
+            href: rule-set-reference.md
+          - name: All Rules
+            href: all-rules-rule-set.md
+          - name: Basic Correctness Rules
+            href: basic-correctness-rules-rule-set-for-managed-code.md
+          - name: Basic Design Guideline Rules
+            href: basic-design-guideline-rules-rule-set-for-managed-code.md
+          - name: Extended Correctness Rules
+            href: extended-correctness-rules-rule-set-for-managed-code.md
+          - name: Extended Design Guidelines Rules
+            href: extended-design-guidelines-rules-rule-set-for-managed-code.md
+          - name: Globalization Rules
+            href: globalization-rules-rule-set-for-managed-code.md
+          - name: Managed Minimum Rules
+            href: managed-minimum-rules-rule-set-for-managed-code.md
+          - name: Managed Recommended Rules
+            href: managed-recommended-rules-rule-set-for-managed-code.md
+          - name: Mixed Minimum Rules
+            href: mixed-minimum-rules-rule-set.md
+          - name: Mixed Recommended Rules
+            href: mixed-recommended-rules-rule-set.md
+          - name: Native Minimum Rules
+            href: native-minimum-rules-rule-set.md
+          - name: Native Recommended Rules
+            href: native-recommended-rules-rule-set.md
+          - name: Security Rules
+            href: security-rules-rule-set-for-managed-code.md
+    - name: Rule sets
+      items:
+      - name: Overview
+        href: using-rule-sets-to-group-code-analysis-rules.md
+      - name: Configure rule sets
+        href: how-to-configure-code-analysis-for-a-managed-code-project.md
+      - name: Create a custom rule set
+        href: how-to-create-a-custom-rule-set.md
+      - name: Use the rule set editor
+        href: working-in-the-code-analysis-rule-set-editor.md
   - name: Code metrics
     items:
     - name: Overview
@@ -158,43 +192,11 @@
       href: working-with-code-metrics-data.md
   - name: Reference
     items:
-    - name: Rule sets
-      items:
-      - name: Overview
-        href: rule-set-reference.md
-      - name: All Rules
-        href: all-rules-rule-set.md
-      - name: Basic Correctness Rules
-        href: basic-correctness-rules-rule-set-for-managed-code.md
-      - name: Basic Design Guideline Rules
-        href: basic-design-guideline-rules-rule-set-for-managed-code.md
-      - name: Extended Correctness Rules
-        href: extended-correctness-rules-rule-set-for-managed-code.md
-      - name: Extended Design Guidelines Rules
-        href: extended-design-guidelines-rules-rule-set-for-managed-code.md
-      - name: Globalization Rules
-        href: globalization-rules-rule-set-for-managed-code.md
-      - name: Managed Minimum Rules
-        href: managed-minimum-rules-rule-set-for-managed-code.md
-      - name: Managed Recommended Rules
-        href: managed-recommended-rules-rule-set-for-managed-code.md
-      - name: Mixed Minimum Rules
-        href: mixed-minimum-rules-rule-set.md
-      - name: Mixed Recommended Rules
-        href: mixed-recommended-rules-rule-set.md
-      - name: Native Minimum Rules
-        href: native-minimum-rules-rule-set.md
-      - name: Native Recommended Rules
-        href: native-recommended-rules-rule-set.md
-      - name: Security Rules
-        href: security-rules-rule-set-for-managed-code.md
-    - name: Suppress warnings
-      href: in-source-suppression-overview.md
-    - name: Managed code warnings
+    - name: .NET code analysis rules
       items:
       - name: Overview
         href: code-analysis-for-managed-code-warnings.md
-      - name: Warnings by CheckId
+      - name: Code quality rules overview
         href: code-analysis-warnings-for-managed-code-by-checkid.md
       - name: Cryptography warnings
         items:

docs/ide/reference/how-to-display-line-numbers-in-the-editor.md

@@ -1,6 +1,6 @@
 ---
 title: Display line numbers for code
-ms.date: 03/28/2019
+ms.date: 08/28/2020
 ms.topic: how-to
 helpviewer_keywords:
 - line numbers, displaying
@@ -26,8 +26,8 @@ You can display or hide line numbering in your code.
 
    ![Option to display line numbers in the VS editor](../../ide/reference/media/line-numbers-option.png)
 
-> [!TIP]
-> Line numbers aren't added to your code; they're just for reference. If you want line numbers to print, in the **Print** dialog box, select the **Include line numbers** check box.
+> [!NOTE]
+> Line numbers aren't added to your code; they're just for reference.
 
 ## See also
 

subscriptions/solutions/admin-solutions/includes/how-do-i-change-my-sign-in-email-admin.md

@@ -6,7 +6,10 @@ ms.assetid: 9bea057f-5183-4fcc-a729-14c0c3eac621
 author: evanwindom
 ms.author: cabuschl
 ms.date: 05/12/2020
-ms.faqid: 
+user.type: subscriber
+tags: sign-in
+subscription.type: vl, cloud,
+sap.id: 
 ---
 
 ## How to change sign-in emails for admins and super admins

subscriptions/solutions/benefit-activation/includes/error-while-activating-azure-monthly-credit.md

@@ -9,6 +9,7 @@ ms.date: 8/14/2020
 user.type: subscriber
 tags: benefit, azure
 subscription.type: vl, cloud, retail, partner
+sap.id: 8dedd10e-cb1c-2eb1-bcda-fe00b07ac903
 ---
 
 ## You can only have one Azure subscription associated with the Visual Studio Subscriptions monthly Azure dev/test individual credit. If you’ve previously activated the monthly Azure credit associated with your Visual Studio subscription, you will need use that Azure subscription or delete it to spin up a new one associated with the credit. You can transfer your resources to save your work.

subscriptions/solutions/benefit-activation/includes/how-do-i-activate-azure-monthly-credit.md

@@ -0,0 +1,18 @@
+---
+title: How do I activate my Azure monthly credit?
+description: How do I activate my Azure monthly credit included with my Visual Studio subscription? 
+ms.topic: include
+ms.assetid: aa53b1d3-8e88-4d8c-8385-23f15a7b660b
+author: CaityBuschlen
+ms.author: cabuschl
+ms.date: 8/14/2020
+user.type: subscriber
+tags: benefit, azure
+subscription.type: vl, cloud, retail, partner
+sap.id: 8dedd10e-cb1c-2eb1-bcda-fe00b07ac903
+---
+
+## As a Visual Studio subscriber, you can use Microsoft Azure at no extra charge. With your monthly Azure dev/test individual credit, Azure is your personal sandbox for dev/test. You can provision virtual machines, cloud services, and other Azure resources. Credit amounts vary by subscription level. 
+1. Sign in to the [subscriber portal](https://my.visualstudio.com/benefits) and locate the Azure monthly credit tile in the Tools section.
+2. Click the Activate link at the bottom of the benefit tile.
+3. Remaining steps to be added here.