diff --git a/.editorconfig b/.editorconfig index 54698466925f7..3a08978605e93 100644 --- a/.editorconfig +++ b/.editorconfig @@ -245,10 +245,6 @@ csharp_preserve_single_line_statements = true # https://github.com/dotnet/roslyn/pull/54259 has been published. dotnet_style_allow_statement_immediately_after_block_experimental = false -[src/CodeStyle/**.{cs,vb}] -# warning RS0005: Do not use generic CodeAction.Create to create CodeAction -dotnet_diagnostic.RS0005.severity = none - [src/{Analyzers,CodeStyle,Features,Workspaces,EditorFeatures,VisualStudio}/**/*.{cs,vb}] # IDE0011: Add braces diff --git a/eng/Versions.props b/eng/Versions.props index 943f5688f65af..3342c7e8206f8 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -19,7 +19,7 @@ - 3.3.4-beta1.22160.2 + 3.3.4-beta1.22204.1 6.0.0-rc1.21366.2 1.1.2-beta1.22122.4 0.1.132-beta diff --git a/eng/config/globalconfigs/NonShipping.globalconfig b/eng/config/globalconfigs/NonShipping.globalconfig index 7523f70490077..b606135bcebad 100644 --- a/eng/config/globalconfigs/NonShipping.globalconfig +++ b/eng/config/globalconfigs/NonShipping.globalconfig @@ -20,8 +20,6 @@ dotnet_diagnostic.RS1026.severity = none dotnet_diagnostic.RS1032.severity = none # Define diagnostic description correctly dotnet_diagnostic.RS1033.severity = none -# Do not use generic CodeAction.Create to create CodeAction - not useful for tests -dotnet_diagnostic.RS0005.severity = none # Do not call 'GetTestAccessor()' from production code: does not apply to tests dotnet_diagnostic.RS0043.severity = none diff --git a/eng/config/globalconfigs/Shipping.globalconfig b/eng/config/globalconfigs/Shipping.globalconfig index f5d5ed9e48545..f474ff296597b 100644 --- a/eng/config/globalconfigs/Shipping.globalconfig +++ b/eng/config/globalconfigs/Shipping.globalconfig @@ -3,7 +3,5 @@ is_global = true dotnet_diagnostic.CA1802.severity = warning dotnet_diagnostic.CA2007.severity = warning -dotnet_diagnostic.RS0005.severity = warning - # CA2016: Forward the 'CancellationToken' parameter to methods dotnet_diagnostic.CA2016.severity = warning diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaBatchFixHelpers.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaBatchFixHelpers.cs index f996ab9889318..3fc63d39a17a9 100644 --- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaBatchFixHelpers.cs +++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.PragmaBatchFixHelpers.cs @@ -31,14 +31,11 @@ public static CodeAction CreateBatchPragmaFix( FixAllState fixAllState, CancellationToken cancellationToken) { - // This is a temporary generated code action, which doesn't need telemetry, hence suppressing RS0005. -#pragma warning disable RS0005 // Do not use generic CodeAction.Create to create CodeAction return CodeAction.Create( ((CodeAction)pragmaActions[0]).Title, createChangedDocument: ct => BatchPragmaFixesAsync(suppressionFixProvider, document, pragmaActions, pragmaDiagnostics, cancellationToken), equivalenceKey: fixAllState.CodeActionEquivalenceKey); -#pragma warning restore RS0005 // Do not use generic CodeAction.Create to create CodeAction } private static async Task BatchPragmaFixesAsync( diff --git a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.RemoveSuppressionCodeAction.BatchFixer.cs b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.RemoveSuppressionCodeAction.BatchFixer.cs index 9c310dbe6a5a1..0df4f432e0d33 100644 --- a/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.RemoveSuppressionCodeAction.BatchFixer.cs +++ b/src/Features/Core/Portable/CodeFixes/Suppression/AbstractSuppressionCodeFixProvider.RemoveSuppressionCodeAction.BatchFixer.cs @@ -145,13 +145,10 @@ public override async Task TryGetMergedFixAsync( currentSolution = currentSolution.WithDocumentSyntaxRoot(document.Id, newRoot); } - // This is a temporary generated code action, which doesn't need telemetry, hence suppressing RS0005. -#pragma warning disable RS0005 // Do not use generic CodeAction.Create to create CodeAction var batchAttributeRemoveFix = CodeAction.Create( attributeRemoveFixes.First().Title, createChangedSolution: ct => Task.FromResult(currentSolution), equivalenceKey: fixAllState.CodeActionEquivalenceKey); -#pragma warning restore RS0005 // Do not use generic CodeAction.Create to create CodeAction newBatchOfFixes.Insert(0, (diagnostic: null, batchAttributeRemoveFix)); } diff --git a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/DefaultFixAllProviderHelpers.cs b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/DefaultFixAllProviderHelpers.cs index 04d8e28ab02bd..243b569b7fa7f 100644 --- a/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/DefaultFixAllProviderHelpers.cs +++ b/src/Workspaces/Core/Portable/CodeFixes/FixAllOccurrences/DefaultFixAllProviderHelpers.cs @@ -36,12 +36,8 @@ internal static class DefaultFixAllProviderHelpers if (solution == null) return null; -#pragma warning disable RS0005 // Do not use generic 'CodeAction.Create' to create 'CodeAction' - return CodeAction.Create( title, c => Task.FromResult(solution)); - -#pragma warning disable RS0005 // Do not use generic 'CodeAction.Create' to create 'CodeAction' } private static Task GetDocumentFixesAsync(FixAllContext fixAllContext, FixAllContexts fixAllContextsAsync)