diff --git a/.editorconfig b/.editorconfig
index 2007532919..2e3045fb17 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -422,9 +422,6 @@ dotnet_naming_rule.parameters_rule.symbols              = parameters_group
 dotnet_naming_rule.parameters_rule.style                = camel_case_style
 dotnet_naming_rule.parameters_rule.severity             = warning
 
-
-dotnet_diagnostics.CA1857.severity = none
-dotnet_diagnostics.CA1859.severity = none
 ##########################################
 # License
 ##########################################
diff --git a/src/ImageSharp.ruleset b/src/ImageSharp.ruleset
index e88c43f838..11f5041589 100644
--- a/src/ImageSharp.ruleset
+++ b/src/ImageSharp.ruleset
@@ -1,7 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RuleSet Name="ImageSharp" ToolsVersion="17.0">
   <Include Path="..\shared-infrastructure\sixlabors.ruleset" Action="Default" />
+   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.NetAnalyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.NetAnalyzers">
+    <Rule Id="CA1857" Action="None" />
+    <Rule Id="CA1859" Action="None" />
+  </Rules>
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
     <Rule Id="SA1011" Action="None" />
   </Rules>
-</RuleSet>
\ No newline at end of file
+</RuleSet>