MicrosoftDocs · ghogen · Aug 20, 2020 · Jul 29, 2020 · Aug 6, 2020 · Aug 6, 2020
diff --git a/docs/code-quality/analyzers-faq.md b/docs/code-quality/analyzers-faq.md
@@ -18,7 +18,7 @@ This page contains answers to some frequently asked questions about .NET Compile
 
 **Q**: Should I use code analysis or EditorConfig for checking code style?
 
-**A**: Code analysis and EditorConfig files work hand-in-hand. When you define code styles [in an EditorConfig file](../ide/editorconfig-code-style-settings-reference.md) or on the [text editor Options](../ide/code-styles-and-code-cleanup.md) page, you're actually configuring the code analyzers that are built into Visual Studio. EditorConfig files can be used to enable or disable analyzer rules, and also to configure some NuGet analyzer packages, such as [FxCop analyzers](configure-fxcop-analyzers.md).
+**A**: Code analysis and EditorConfig files work hand-in-hand. When you define code styles [in an EditorConfig file](../ide/editorconfig-code-style-settings-reference.md) or on the [text editor Options](../ide/code-styles-and-code-cleanup.md) page, you're actually configuring the code analyzers that are built into Visual Studio. EditorConfig files can be used to enable or disable analyzer rules, and also to configure NuGet analyzer packages.
 
 ## EditorConfig versus rule sets
 
@@ -28,8 +28,8 @@ This page contains answers to some frequently asked questions about .NET Compile
 
 However, EditorConfig files offer additional ways to configure rules too:
 
-- For FxCop analyzers, EditorConfig files let you [define which types of code to analyze](fxcop-analyzer-options.md).
-- For the code-style analyzers that are built into Visual Studio, EditorConfig files let you [define the preferred code styles](../ide/editorconfig-code-style-settings-reference.md) for a codebase.
+- For the .NET code-quality analyzers, EditorConfig files let you [define which types of code to analyze](fxcop-analyzer-options.md).
+- For the .NET code-style analyzers that are built into Visual Studio, EditorConfig files let you [define the preferred code styles](../ide/editorconfig-code-style-settings-reference.md) for a codebase.
 
 In addition to rule sets and EditorConfig files, some analyzers are configured through the use of text files marked as [additional files](../ide/build-actions.md#build-action-values) for the C# and VB compilers.
 

diff --git a/docs/code-quality/ca1000.md b/docs/code-quality/ca1000.md
@@ -64,13 +64,13 @@ Do not suppress a warning from this rule. Providing generics in a syntax that is
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1000.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Related rules
 

diff --git a/docs/code-quality/ca1001.md b/docs/code-quality/ca1001.md
@@ -32,7 +32,7 @@ A class declares and implements an instance field that is a <xref:System.IDispos
 ## Rule description
 A class implements the <xref:System.IDisposable> interface to dispose of unmanaged resources that it owns. An instance field that is an <xref:System.IDisposable> type indicates that the field owns an unmanaged resource. A class that declares an <xref:System.IDisposable> field indirectly owns an unmanaged resource and should implement the <xref:System.IDisposable> interface. If the class does not directly own any unmanaged resources, it should not implement a finalizer.
 
-Starting with FxCop analyzers 3.x, this rule respects types implementing <xref:System.IAsyncDisposable?displayProperty=fullName> as disposable types. 
+This rule respects types implementing <xref:System.IAsyncDisposable?displayProperty=fullName> as disposable types. 
 
 ## How to fix violations
 To fix a violation of this rule, implement <xref:System.IDisposable> and from the <xref:System.IDisposable.Dispose%2A?displayProperty=fullName> method call the <xref:System.IDisposable.Dispose%2A> method of the field.

diff --git a/docs/code-quality/ca1003.md b/docs/code-quality/ca1003.md
@@ -48,13 +48,13 @@ Do not suppress a warning from this rule.
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1003.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Example
 

diff --git a/docs/code-quality/ca1008.md b/docs/code-quality/ca1008.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -49,19 +48,18 @@ Do not suppress a warning from this rule except for flags-attributed enumeration
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1008.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Example
 
 The following example shows two enumerations that satisfy the rule and an enumeration, `BadTraceOptions`, that violates the rule.
 
-[!code-cpp[FxCop.Design.EnumsZeroValue#1](../code-quality/codesnippet/CPP/ca1008-enums-should-have-zero-value_1.cpp)]
 [!code-csharp[FxCop.Design.EnumsZeroValue#1](../code-quality/codesnippet/CSharp/ca1008-enums-should-have-zero-value_1.cs)]
 [!code-vb[FxCop.Design.EnumsZeroValue#1](../code-quality/codesnippet/VisualBasic/ca1008-enums-should-have-zero-value_1.vb)]
 

diff --git a/docs/code-quality/ca1009.md b/docs/code-quality/ca1009.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -31,7 +30,7 @@ ms.workload:
 A delegate that handles a public or protected event does not have the correct signature, return type, or parameter names.
 
 > [!NOTE]
-> This legacy rule is not available in FxCop Analyzers. For more information, see [Deprecated rules](fxcop-rule-port-status.md#deprecated-rules).
+> This rule has been deprecated. For more information, see [Deprecated rules](fxcop-rule-port-status.md#deprecated-rules).
 
 ## Rule description
 Event handler methods take two parameters. The first is of type <xref:System.Object?displayProperty=fullName> and is named 'sender'. This is the object that raised the event. The second parameter is of type <xref:System.EventArgs?displayProperty=fullName> and is named 'e'. This is the data that is associated with the event. For example, if the event is raised whenever a file is opened, the event data typically contains the name of the file.
@@ -47,7 +46,6 @@ Do not suppress a warning from this rule.
 ## Example
 The following example shows a delegate that is suited to handling events. The methods that can be invoked by this event handler comply with the signature that is specified in the Design Guidelines. `AlarmEventHandler` is the type name of the delegate. `AlarmEventArgs` derives from the base class for event data, <xref:System.EventArgs>, and holds alarm event data.
 
-[!code-cpp[FxCop.Design.EventsTwoParams#1](../code-quality/codesnippet/CPP/ca1009-declare-event-handlers-correctly_1.cpp)]
 [!code-csharp[FxCop.Design.EventsTwoParams#1](../code-quality/codesnippet/CSharp/ca1009-declare-event-handlers-correctly_1.cs)]
 [!code-vb[FxCop.Design.EventsTwoParams#1](../code-quality/codesnippet/VisualBasic/ca1009-declare-event-handlers-correctly_1.vb)]
 

diff --git a/docs/code-quality/ca1010.md b/docs/code-quality/ca1010.md
@@ -51,13 +51,13 @@ It is safe to suppress a warning from this rule; however, the use of the collect
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1010.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ### Additional required generic interfaces
 

diff --git a/docs/code-quality/ca1011.md b/docs/code-quality/ca1011.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -56,7 +55,6 @@ In these cases, the code will be more robust because of the strong type checking
 The following example shows a method, `ManipulateFileStream`, that can be used only with a <xref:System.IO.FileStream> object, which violates this rule. A second method, `ManipulateAnyStream`, satisfies the rule by replacing the <xref:System.IO.FileStream> parameter by using a <xref:System.IO.Stream>.
 
 [!code-csharp[FxCop.Design.ConsiderPassingBaseTypes#1](../code-quality/codesnippet/CSharp/ca1011-consider-passing-base-types-as-parameters_1.cs)]
-[!code-cpp[FxCop.Design.ConsiderPassingBaseTypes#1](../code-quality/codesnippet/CPP/ca1011-consider-passing-base-types-as-parameters_1.cpp)]
 [!code-vb[FxCop.Design.ConsiderPassingBaseTypes#1](../code-quality/codesnippet/VisualBasic/ca1011-consider-passing-base-types-as-parameters_1.vb)]
 
 ## Related rules

diff --git a/docs/code-quality/ca1012.md b/docs/code-quality/ca1012.md
@@ -45,13 +45,13 @@ Do not suppress a warning from this rule. The abstract type has a public constru
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1012.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Example
 

diff --git a/docs/code-quality/ca1014.md b/docs/code-quality/ca1014.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -45,7 +44,6 @@ Do not suppress a warning from this rule. If you do not want the assembly to be
 The following example shows an assembly that has the <xref:System.CLSCompliantAttribute?displayProperty=fullName> attribute applied that declares it CLS-compliant.
 
 [!code-csharp[FxCop.Design.AssembliesCls#1](../code-quality/codesnippet/CSharp/ca1014-mark-assemblies-with-clscompliantattribute_1.cs)]
-[!code-cpp[FxCop.Design.AssembliesCls#1](../code-quality/codesnippet/CPP/ca1014-mark-assemblies-with-clscompliantattribute_1.cpp)]
 [!code-vb[FxCop.Design.AssembliesCls#1](../code-quality/codesnippet/VisualBasic/ca1014-mark-assemblies-with-clscompliantattribute_1.vb)]
 
 ## See also

diff --git a/docs/code-quality/ca1016.md b/docs/code-quality/ca1016.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -59,7 +58,6 @@ The following example shows an assembly that has the <xref:System.Reflection.Ass
 
 [!code-csharp[FxCop.Design.AssembliesVersion#1](../code-quality/codesnippet/CSharp/ca1016-mark-assemblies-with-assemblyversionattribute_1.cs)]
 [!code-vb[FxCop.Design.AssembliesVersion#1](../code-quality/codesnippet/VisualBasic/ca1016-mark-assemblies-with-assemblyversionattribute_1.vb)]
-[!code-cpp[FxCop.Design.AssembliesVersion#1](../code-quality/codesnippet/CPP/ca1016-mark-assemblies-with-assemblyversionattribute_1.cpp)]
 
 ## See also
 

diff --git a/docs/code-quality/ca1017.md b/docs/code-quality/ca1017.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -42,7 +41,6 @@ Do not suppress a warning from this rule. If you want the assembly to be visible
 ## Example
 The following example shows an assembly that has the <xref:System.Runtime.InteropServices.ComVisibleAttribute> attribute applied to prevent it from being visible to COM clients.
 
-[!code-cpp[FxCop.Design.AssembliesCom#1](../code-quality/codesnippet/CPP/ca1017-mark-assemblies-with-comvisibleattribute_1.cpp)]
 [!code-vb[FxCop.Design.AssembliesCom#1](../code-quality/codesnippet/VisualBasic/ca1017-mark-assemblies-with-comvisibleattribute_1.vb)]
 [!code-csharp[FxCop.Design.AssembliesCom#1](../code-quality/codesnippet/CSharp/ca1017-mark-assemblies-with-comvisibleattribute_1.cs)]
 

diff --git a/docs/code-quality/ca1020.md b/docs/code-quality/ca1020.md
@@ -28,7 +28,7 @@ ms.workload:
 A namespace other than the global namespace contains fewer than five types.
 
 > [!NOTE]
-> This legacy rule is not available in FxCop Analyzers. For more information, see [Deprecated rules](fxcop-rule-port-status.md#deprecated-rules).
+> This rule has been deprecated. For more information, see [Deprecated rules](fxcop-rule-port-status.md#deprecated-rules).
 
 ## Rule description
 

diff --git a/docs/code-quality/ca1021.md b/docs/code-quality/ca1021.md
@@ -47,13 +47,13 @@ It is safe to suppress a warning from this rule. However, this design could caus
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1021.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Example
 The following library shows two implementations of a class that generates responses to the feedback of a user. The first implementation (`BadRefAndOut`) forces the library user to manage three return values. The second implementation (`RedesignedRefAndOut`) simplifies the user experience by returning an instance of a container class (`ReplyData`) that manages the data as a single unit.

diff --git a/docs/code-quality/ca1023.md b/docs/code-quality/ca1023.md
@@ -13,7 +13,6 @@ author: mikejo5000
 ms.author: mikejo
 manager: jillfra
 dev_langs:
-- CPP
 - CSharp
 - VB
 ms.workload:
@@ -43,7 +42,6 @@ Suppress a warning from this rule only after carefully considering the need for
 The following example shows a type, `DayOfWeek03`, with a multi-dimensional indexer that violates the rule. The indexer can be seen as a type of conversion and therefore is more appropriately exposed as a method. The type is redesigned in `RedesignedDayOfWeek03` to satisfy the rule.
 
 [!code-vb[FxCop.Design.OneDimensionForIndexer#1](../code-quality/codesnippet/VisualBasic/ca1023-indexers-should-not-be-multidimensional_1.vb)]
-[!code-cpp[FxCop.Design.OneDimensionForIndexer#1](../code-quality/codesnippet/CPP/ca1023-indexers-should-not-be-multidimensional_1.cpp)]
 [!code-csharp[FxCop.Design.OneDimensionForIndexer#1](../code-quality/codesnippet/CSharp/ca1023-indexers-should-not-be-multidimensional_1.cs)]
 
 ## Related rules

diff --git a/docs/code-quality/ca1024.md b/docs/code-quality/ca1024.md
@@ -66,13 +66,13 @@ Suppress a warning from this rule if the method meets at least one of the previo
 
 ## Configurability
 
-If you're running this rule from [FxCop analyzers](install-fxcop-analyzers.md) (and not with legacy analysis), you can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
+You can configure which parts of your codebase to run this rule on, based on their accessibility. For example, to specify that the rule should run only against the non-public API surface, add the following key-value pair to an .editorconfig file in your project:
 
 ```ini
 dotnet_code_quality.ca1024.api_surface = private, internal
 ```
 
-You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure FxCop analyzers](configure-fxcop-analyzers.md).
+You can configure this option for just this rule, for all rules, or for all rules in this category (Design). For more information, see [Configure .NET code-quality analyzers](configure-fxcop-analyzers.md).
 
 ## Control property expansion in the debugger