Close #315

Hosch250 · Hosch250 · commit 13ee471743b5 · 2016-03-18T10:22:36.000-05:00
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Async/AsyncMethodWithoutAsyncSuffix/AsyncMethodWithoutAsyncSuffixCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Async/AsyncMethodWithoutAsyncSuffix/AsyncMethodWithoutAsyncSuffixCodeFix.cs
@@ -11,7 +11,7 @@
 
 namespace VSDiagnostics.Diagnostics.Async.AsyncMethodWithoutAsyncSuffix
 {
-    [ExportCodeFixProvider(nameof(AsyncMethodWithoutAsyncSuffixCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.AsyncMethodWithoutAsyncSuffix + "CF", LanguageNames.CSharp), Shared]
     public class AsyncMethodWithoutAsyncSuffixCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Async/SyncMethodWithAsyncSuffix/SyncMethodWithAsyncSuffixCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Async/SyncMethodWithAsyncSuffix/SyncMethodWithAsyncSuffixCodeFix.cs
@@ -11,7 +11,7 @@
 
 namespace VSDiagnostics.Diagnostics.Async.SyncMethodWithSyncSuffix
 {
-    [ExportCodeFixProvider(nameof(SyncMethodWithAsyncSuffixCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.SyncMethodWithAsyncSuffix + "CF", LanguageNames.CSharp), Shared]
     public class SyncMethodWithAsyncSuffixCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/AttributeWithEmptyArgumentList/AttributeWithEmptyArgumentListCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/AttributeWithEmptyArgumentList/AttributeWithEmptyArgumentListCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Attributes.AttributeWithEmptyArgumentList
 {
-    [ExportCodeFixProvider(nameof(AttributeWithEmptyArgumentListCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.AttributeWithEmptyArgumentList + "CF", LanguageNames.CSharp), Shared]
     public class AttributeWithEmptyArgumentListCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/EnumCanHaveFlagsAttribute/EnumCanHaveFlagsAttributeCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/EnumCanHaveFlagsAttribute/EnumCanHaveFlagsAttributeCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Attributes.EnumCanHaveFlagsAttribute
 {
-    [ExportCodeFixProvider(nameof(EnumCanHaveFlagsAttributeCodeFix), LanguageNames.CSharp),
+    [ExportCodeFixProvider(DiagnosticId.EnumCanHaveFlagsAttribute, LanguageNames.CSharp),
      Shared]
     public class EnumCanHaveFlagsAttributeCodeFix : CodeFixProvider
     {
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/FlagsEnumValuesAreNotPowersOfTwo/FlagsEnumValuesAreNotPowersOfTwoCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/FlagsEnumValuesAreNotPowersOfTwo/FlagsEnumValuesAreNotPowersOfTwoCodeFix.cs
@@ -9,10 +9,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Attributes.FlagsEnumValuesAreNotPowersOfTwo
 {
-    [ExportCodeFixProvider(nameof(FlagsEnumValuesAreNotPowersOfTwoCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.FlagsEnumValuesAreNotPowersOfTwo + "CF", LanguageNames.CSharp), Shared]
     public class FlagsEnumValuesAreNotPowersOfTwoCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/OnPropertyChangedWithoutCallerMemberName/OnPropertyChangedWithoutCallerMemberNameCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Attributes/OnPropertyChangedWithoutCallerMemberName/OnPropertyChangedWithoutCallerMemberNameCodeFix.cs
@@ -9,10 +9,11 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Attributes.OnPropertyChangedWithoutCallerMemberName
 {
-    [ExportCodeFixProvider(nameof(OnPropertyChangedWithoutCallerMemberNameCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.OnPropertyChangedWithoutCallerMemberName + "CF", LanguageNames.CSharp), Shared]
     public class OnPropertyChangedWithoutCallerMemberNameCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Exceptions/ArgumentExceptionWithoutNameofOperator/ArgumentExceptionWithoutNameofOperatorCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Exceptions/ArgumentExceptionWithoutNameofOperator/ArgumentExceptionWithoutNameofOperatorCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Exceptions.ArgumentExceptionWithoutNameofOperator
 {
-    [ExportCodeFixProvider(nameof(ArgumentExceptionWithoutNameofOperatorCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.ArgumentExceptionWithoutNameofOperator + "CF", LanguageNames.CSharp), Shared]
     public class ArgumentExceptionWithoutNameofOperatorCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Exceptions/RethrowExceptionWithoutLosingStacktrace/RethrowExceptionWithoutLosingStacktraceCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Exceptions/RethrowExceptionWithoutLosingStacktrace/RethrowExceptionWithoutLosingStacktraceCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Exceptions.RethrowExceptionWithoutLosingStacktrace
 {
-    [ExportCodeFixProvider(nameof(RethrowExceptionWithoutLosingStacktraceCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.RethrowExceptionWithoutLosingStacktrace + "CF", LanguageNames.CSharp), Shared]
     public class RethrowExceptionWithoutLosingStacktraceCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/AsToCast/AsToCastCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/AsToCast/AsToCastCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.AsToCast
 {
-    [ExportCodeFixProvider(nameof(AsToCastCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.AsToCast + "CF", LanguageNames.CSharp), Shared]
     public class AsToCastCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(AsToCastAnalyzer.Rule.Id);
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CastToAs/CastToAsCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CastToAs/CastToAsCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.CastToAs
 {
-    [ExportCodeFixProvider(nameof(CastToAsCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.CastToAs + "CF", LanguageNames.CSharp), Shared]
     public class CastToAsCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(CastToAsAnalyzer.Rule.Id);
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CompareBooleanToFalseLiteral/CompareBooleanToFalseLiteralCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CompareBooleanToFalseLiteral/CompareBooleanToFalseLiteralCodeFix.cs
@@ -9,10 +9,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.CompareBooleanToFalseLiteral
 {
-    [ExportCodeFixProvider(nameof(CompareBooleanToFalseLiteralCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.CompareBooleanToFalseLiteral + "CF", LanguageNames.CSharp), Shared]
     public class CompareBooleanToFalseLiteralCodeFix : CodeFixProvider
     {
         private static readonly Dictionary<SyntaxKind, SyntaxKind> MapOperatorToReverseOperator =
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CompareBooleanToTrueLiteral/CompareBooleanToTrueLiteralCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/CompareBooleanToTrueLiteral/CompareBooleanToTrueLiteralCodeFix.cs
@@ -9,10 +9,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.CompareBooleanToTrueLiteral
 {
-    [ExportCodeFixProvider(nameof(CompareBooleanToTrueLiteralCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.CompareBooleanToTrueLiteral + "CF", LanguageNames.CSharp), Shared]
     public class CompareBooleanToTrueLiteralCodeFix : CodeFixProvider
     {
         private static readonly Dictionary<SyntaxKind, SyntaxKind> MapOperatorToReverseOperator =
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionIsConstant/ConditionIsConstantCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionIsConstant/ConditionIsConstantCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.ConditionIsConstant
 {
-    [ExportCodeFixProvider(nameof(ConditionIsConstantCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.ConditionIsConstant, LanguageNames.CSharp), Shared]
     public class ConditionIsConstantCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionalOperatorReturnsDefaultOptions/ConditionalOperatorReturnsDefaultOptionsCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionalOperatorReturnsDefaultOptions/ConditionalOperatorReturnsDefaultOptionsCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.ConditionalOperatorReturnsDefaultOptions
 {
-    [ExportCodeFixProvider(nameof(ConditionalOperatorReturnsDefaultOptionsCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.ConditionalOperatorReturnsDefaultOptions + "CF", LanguageNames.CSharp), Shared]
     public class ConditionalOperatorReturnsDefaultOptionsCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionalOperatorReturnsInvertedDefaultOptions/ConditionalOperatorReturnsInvertedDefaultOptionsCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ConditionalOperatorReturnsInvertedDefaultOptions/ConditionalOperatorReturnsInvertedDefaultOptionsCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.ConditionalOperatorReturnsInvertedDefaultOptions
 {
-    [ExportCodeFixProvider(nameof(ConditionalOperatorReturnsInvertedDefaultOptionsCodeFix), LanguageNames.CSharp),
+    [ExportCodeFixProvider(DiagnosticId.ConditionalOperatorReturnsInvertedDefaultOptions, LanguageNames.CSharp),
      Shared]
     public class ConditionalOperatorReturnsInvertedDefaultOptionsCodeFix : CodeFixProvider
     {
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ExplicitAccessModifiers/ExplicitAccessModifiersCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/ExplicitAccessModifiers/ExplicitAccessModifiersCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Editing;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.ExplicitAccessModifiers
 {
-    [ExportCodeFixProvider(nameof(ExplicitAccessModifiersCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.ExplicitAccessModifiers + "CF", LanguageNames.CSharp), Shared]
     public class ExplicitAccessModifiersCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/IfStatementWithoutBraces/IfStatementWithoutBracesCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/IfStatementWithoutBraces/IfStatementWithoutBracesCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.IfStatementWithoutBraces
 {
-    [ExportCodeFixProvider(nameof(IfStatementWithoutBracesCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.IfStatementWithoutBraces + "CF", LanguageNames.CSharp), Shared]
     public class IfStatementWithoutBracesCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/LoopStatementWithoutBraces/LoopStatementWithoutBracesCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/LoopStatementWithoutBraces/LoopStatementWithoutBracesCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.LoopStatementWithoutBraces
 {
-    [ExportCodeFixProvider("LoopWithoutBraces", LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.LoopStatementWithoutBraces + "CF", LanguageNames.CSharp), Shared]
     public class LoopStatementWithoutBracesCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NamingConventions/NamingConventionsCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NamingConventions/NamingConventionsCodeFix.cs
@@ -11,7 +11,7 @@
 
 namespace VSDiagnostics.Diagnostics.General.NamingConventions
 {
-    [ExportCodeFixProvider(nameof(NamingConventionsCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.NamingConventions + "CF", LanguageNames.CSharp), Shared]
     public class NamingConventionsCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NonEncapsulatedOrMutableField/NonEncapsulatedOrMutableFieldCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NonEncapsulatedOrMutableField/NonEncapsulatedOrMutableFieldCodeFix.cs
@@ -9,10 +9,11 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.NonEncapsulatedOrMutableField
 {
-    [ExportCodeFixProvider(nameof(NonEncapsulatedOrMutableFieldCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.NonEncapsulatedOrMutableField + "CF", LanguageNames.CSharp), Shared]
     public class NonEncapsulatedOrMutableFieldCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NullableToShorthand/NullableToShorthandCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/NullableToShorthand/NullableToShorthandCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.NullableToShorthand
 {
-    [ExportCodeFixProvider(nameof(NullableToShorthandCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.NullableToShorthand + "CF", LanguageNames.CSharp), Shared]
     public class NullableToShorthandCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/OnPropertyChangedWithoutNameOfOperator/OnPropertyChangedWithoutNameOfOperatorCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/OnPropertyChangedWithoutNameOfOperator/OnPropertyChangedWithoutNameOfOperatorCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.OnPropertyChangedWithoutNameOfOperator
 {
-    [ExportCodeFixProvider(nameof(OnPropertyChangedWithoutNameOfOperatorCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.OnPropertyChangedWithoutNameofOperator + "CF", LanguageNames.CSharp), Shared]
     public class OnPropertyChangedWithoutNameOfOperatorCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SimplifyExpressionBodiedMember/SimplifyExpressionBodiedMemberCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SimplifyExpressionBodiedMember/SimplifyExpressionBodiedMemberCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.SimplifyExpressionBodiedMember
 {
-    [ExportCodeFixProvider(nameof(SimplifyExpressionBodiedMemberCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.SimplifyExpressionBodiedMember + "CF", LanguageNames.CSharp), Shared]
     public class SimplifyExpressionBodiedMemberCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SingleEmptyConstructor/SingleEmptyConstructorCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SingleEmptyConstructor/SingleEmptyConstructorCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.SingleEmptyConstructor
 {
-    [ExportCodeFixProvider(nameof(SingleEmptyConstructorCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.SingleEmptyConstructor + "CF", LanguageNames.CSharp), Shared]
     internal class SingleEmptyConstructorCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SwitchDoesNotHandleAllEnumOptions/SwitchDoesNotHandleAllEnumOptionsCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/SwitchDoesNotHandleAllEnumOptions/SwitchDoesNotHandleAllEnumOptionsCodeFix.cs
@@ -11,10 +11,11 @@
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
 using Microsoft.CodeAnalysis.Simplification;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.SwitchDoesNotHandleAllEnumOptions
 {
-    [ExportCodeFixProvider(nameof(SwitchDoesNotHandleAllEnumOptionsCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.SwitchDoesNotHandleAllEnumOptions + "CF", LanguageNames.CSharp), Shared]
     internal class SwitchDoesNotHandleAllEnumOptionsCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/TryCastWithoutUsingAsNotNull/TryCastWithoutUsingAsNotNullCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/TryCastWithoutUsingAsNotNull/TryCastWithoutUsingAsNotNullCodeFix.cs
@@ -16,7 +16,7 @@
 
 namespace VSDiagnostics.Diagnostics.General.TryCastWithoutUsingAsNotNull
 {
-    [ExportCodeFixProvider(nameof(TryCastWithoutUsingAsNotNullCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.TryCastWithoutUsingAsNotNull + "CF", LanguageNames.CSharp), Shared]
     public class TryCastWithoutUsingAsNotNullCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/TypeToVar/TypeToVarCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/TypeToVar/TypeToVarCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.TypeToVar
 {
-    [ExportCodeFixProvider(nameof(TypeToVarCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.TypeToVar + "CF", LanguageNames.CSharp), Shared]
     public class TypeToVarCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds => ImmutableArray.Create(TypeToVarAnalyzer.Rule.Id);
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/UseAliasesInsteadOfConcreteType/UseAliasesInsteadOfConcreteTypeCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/General/UseAliasesInsteadOfConcreteType/UseAliasesInsteadOfConcreteTypeCodeFix.cs
@@ -6,10 +6,11 @@
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.Simplification;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.General.UseAliasesInsteadOfConcreteType
 {
-    [ExportCodeFixProvider(nameof(UseAliasesInsteadOfConcreteTypeCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.UseAliasesInsteadOfConcreteType + "CF", LanguageNames.CSharp), Shared]
     public class UseAliasesInsteadOfConcreteTypeCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Strings/ReplaceEmptyStringWithStringDotEmpty/ReplaceEmptyStringWithStringDotEmptyCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Strings/ReplaceEmptyStringWithStringDotEmpty/ReplaceEmptyStringWithStringDotEmptyCodeFix.cs
@@ -8,10 +8,11 @@
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Formatting;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Strings.ReplaceEmptyStringWithStringDotEmpty
 {
-    [ExportCodeFixProvider(nameof(ReplaceEmptyStringWithStringDotEmptyCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.ReplaceEmptyStringWithStringDotEmpty + "CF", LanguageNames.CSharp), Shared]
     public class ReplaceEmptyStringWithStringDotEmptyCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Strings/StringPlaceholdersInWrongOrder/StringPlaceholdersInWrongOrderCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Strings/StringPlaceholdersInWrongOrder/StringPlaceholdersInWrongOrderCodeFix.cs
@@ -10,10 +10,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Strings.StringPlaceholdersInWrongOrder
 {
-    [ExportCodeFixProvider(nameof(StringPlaceHoldersInWrongOrderCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.StringPlaceholdersInWrongOrder + "CF", LanguageNames.CSharp), Shared]
     public class StringPlaceHoldersInWrongOrderCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Tests/RemoveTestSuffix/RemoveTestSuffixCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Tests/RemoveTestSuffix/RemoveTestSuffixCodeFix.cs
@@ -11,7 +11,7 @@
 
 namespace VSDiagnostics.Diagnostics.Tests.RemoveTestSuffix
 {
-    [ExportCodeFixProvider(nameof(RemoveTestSuffixCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.RemoveTestSuffix + "CF", LanguageNames.CSharp), Shared]
     public class RemoveTestSuffixCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds
diff --git a/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Tests/TestMethodWithoutPublicModifier/TestMethodWithoutPublicModifierCodeFix.cs b/VSDiagnostics/VSDiagnostics/VSDiagnostics/Diagnostics/Tests/TestMethodWithoutPublicModifier/TestMethodWithoutPublicModifierCodeFix.cs
@@ -7,10 +7,11 @@
 using Microsoft.CodeAnalysis.CodeFixes;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
 using Microsoft.CodeAnalysis.Editing;
+using VSDiagnostics.Utilities;
 
 namespace VSDiagnostics.Diagnostics.Tests.TestMethodWithoutPublicModifier
 {
-    [ExportCodeFixProvider(nameof(TestMethodWithoutPublicModifierCodeFix), LanguageNames.CSharp), Shared]
+    [ExportCodeFixProvider(DiagnosticId.TestMethodWithoutPublicModifier + "CF", LanguageNames.CSharp), Shared]
     public class TestMethodWithoutPublicModifierCodeFix : CodeFixProvider
     {
         public override ImmutableArray<string> FixableDiagnosticIds

Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@`
`11`	`11`
`12`	`12`	`namespace VSDiagnostics.Diagnostics.Async.AsyncMethodWithoutAsyncSuffix`
`13`	`13`	`{`
`14`		`- [ExportCodeFixProvider(nameof(AsyncMethodWithoutAsyncSuffixCodeFix), LanguageNames.CSharp), Shared]`
	`14`	`+ [ExportCodeFixProvider(DiagnosticId.AsyncMethodWithoutAsyncSuffix + "CF", LanguageNames.CSharp), Shared]`
`15`	`15`	`public class AsyncMethodWithoutAsyncSuffixCodeFix : CodeFixProvider`
`16`	`16`	`{`
`17`	`17`	`public override ImmutableArray<string> FixableDiagnosticIds`
Original file line number	Diff line number	Diff line change
`@@ -6,10 +6,11 @@`
`6`	`6`	`using Microsoft.CodeAnalysis.CodeActions;`
`7`	`7`	`using Microsoft.CodeAnalysis.CodeFixes;`
`8`	`8`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
	`9`	`+using VSDiagnostics.Utilities;`
`9`	`10`
`10`	`11`	`namespace VSDiagnostics.Diagnostics.Attributes.AttributeWithEmptyArgumentList`
`11`	`12`	`{`
`12`		`- [ExportCodeFixProvider(nameof(AttributeWithEmptyArgumentListCodeFix), LanguageNames.CSharp), Shared]`
	`13`	`+ [ExportCodeFixProvider(DiagnosticId.AttributeWithEmptyArgumentList + "CF", LanguageNames.CSharp), Shared]`
`13`	`14`	`public class AttributeWithEmptyArgumentListCodeFix : CodeFixProvider`
`14`	`15`	`{`
`15`	`16`	`public override ImmutableArray<string> FixableDiagnosticIds`
Original file line number	Diff line number	Diff line change
`@@ -8,10 +8,11 @@`
`8`	`8`	`using Microsoft.CodeAnalysis.CSharp;`
`9`	`9`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`10`	`10`	`using Microsoft.CodeAnalysis.Editing;`
	`11`	`+using VSDiagnostics.Utilities;`
`11`	`12`
`12`	`13`	`namespace VSDiagnostics.Diagnostics.Attributes.EnumCanHaveFlagsAttribute`
`13`	`14`	`{`
`14`		`- [ExportCodeFixProvider(nameof(EnumCanHaveFlagsAttributeCodeFix), LanguageNames.CSharp),`
	`15`	`+ [ExportCodeFixProvider(DiagnosticId.EnumCanHaveFlagsAttribute, LanguageNames.CSharp),`
`15`	`16`	`Shared]`
`16`	`17`	`public class EnumCanHaveFlagsAttributeCodeFix : CodeFixProvider`
`17`	`18`	`{`
Original file line number	Diff line number	Diff line change
`@@ -9,10 +9,11 @@`
`9`	`9`	`using Microsoft.CodeAnalysis.CSharp;`
`10`	`10`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
`11`	`11`	`using Microsoft.CodeAnalysis.Formatting;`
	`12`	`+using VSDiagnostics.Utilities;`
`12`	`13`
`13`	`14`	`namespace VSDiagnostics.Diagnostics.Attributes.FlagsEnumValuesAreNotPowersOfTwo`
`14`	`15`	`{`
`15`		`- [ExportCodeFixProvider(nameof(FlagsEnumValuesAreNotPowersOfTwoCodeFix), LanguageNames.CSharp), Shared]`
	`16`	`+ [ExportCodeFixProvider(DiagnosticId.FlagsEnumValuesAreNotPowersOfTwo + "CF", LanguageNames.CSharp), Shared]`
`16`	`17`	`public class FlagsEnumValuesAreNotPowersOfTwoCodeFix : CodeFixProvider`
`17`	`18`	`{`
`18`	`19`	`public override ImmutableArray<string> FixableDiagnosticIds`
Original file line number	Diff line number	Diff line change
`@@ -7,10 +7,11 @@`
`7`	`7`	`using Microsoft.CodeAnalysis.CodeFixes;`
`8`	`8`	`using Microsoft.CodeAnalysis.CSharp;`
`9`	`9`	`using Microsoft.CodeAnalysis.CSharp.Syntax;`
	`10`	`+using VSDiagnostics.Utilities;`
`10`	`11`
`11`	`12`	`namespace VSDiagnostics.Diagnostics.Exceptions.RethrowExceptionWithoutLosingStacktrace`
`12`	`13`	`{`
`13`		`- [ExportCodeFixProvider(nameof(RethrowExceptionWithoutLosingStacktraceCodeFix), LanguageNames.CSharp), Shared]`
	`14`	`+ [ExportCodeFixProvider(DiagnosticId.RethrowExceptionWithoutLosingStacktrace + "CF", LanguageNames.CSharp), Shared]`
`14`	`15`	`public class RethrowExceptionWithoutLosingStacktraceCodeFix : CodeFixProvider`
`15`	`16`	`{`
`16`	`17`	`public override ImmutableArray<string> FixableDiagnosticIds`