diff --git a/linting/codeanalysis.ruleset b/linting/codeanalysis.ruleset
index b94fa22670..4fde2bef8d 100644
--- a/linting/codeanalysis.ruleset
+++ b/linting/codeanalysis.ruleset
@@ -1,38 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="CodeAnalysis" ToolsVersion="15.0">
+<RuleSet Name="CodeAnalysis" ToolsVersion="16.0">
   <Rules AnalyzerId="Roslynator.CSharp.Analyzers" RuleNamespace="Roslynator.CSharp">
-
-    <!--Call 'ConfigureAwait(false)'-->
     <Rule Id="RCS1090" Action="None" />
   </Rules>
-
   <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-
-    <!--Prefix local calls with this-->
     <Rule Id="SA1101" Action="None" />
-
-    <!--Using directive should appear within a namespace declaration-->
     <Rule Id="SA1200" Action="None" />
-
-    <!--Variable names must not be prefixed-->
     <Rule Id="SA1308" Action="None" />
-
-    <!--Field names must not begin with underscore-->
     <Rule Id="SA1309" Action="None" />
-
-    <!--Static readonly fields must begin with upper case letter-->
     <Rule Id="SA1311" Action="None" />
-
-    <!--A C# code file contains more than one unique type.-->
     <Rule Id="SA1402" Action="None" />
-
-    <!--The last statement in a multi-line C# initializer or list is missing a trailing comma.-->
     <Rule Id="SA1413" Action="None" />
-
-    <!--Comments should end with a period.-->
     <Rule Id="SA1629" Action="None" />
-
-    <!--A C# code file is missing a standard file header.-->
-    <Rule Id="SA1633" Action="Warning" />
   </Rules>
-</RuleSet>
+</RuleSet>
\ No newline at end of file
diff --git a/linting/codeanalysis.tests.ruleset b/linting/codeanalysis.tests.ruleset
index 7fa60db024..0ac055b328 100644
--- a/linting/codeanalysis.tests.ruleset
+++ b/linting/codeanalysis.tests.ruleset
@@ -1,63 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="CodeAnalysis.Tests" ToolsVersion="15.0">
-  <!--Inherit basic rules-->
+<RuleSet Name="CodeAnalysis.Tests" ToolsVersion="16.0">
   <Include Path="codeanalysis.ruleset" Action="Default" />
-
-  <!--Additional rules-->
-  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
-
-    <!--XML comment analysis is disabled due to project configuration-->
-    <Rule Id="SA0001" Action="None" />
-
-    <!--Parameter must follow comma.-->
-    <Rule Id="SA1115" Action="None" />
-
-    <!--A field should not follow a method-->
-    <Rule Id="SA1201" Action="None" />
-
-    <!--Elements must be ordered by access-->
-    <Rule Id="SA1202" Action="None" />
-
-    <!--Constants must appear before fields-->
-    <Rule Id="SA1203" Action="None" />
-
-    <!--Static members should appear before non-static members-->
-    <Rule Id="SA1204" Action="None" />
-
-    <!--Field names must not contain underscore-->
-    <Rule Id="SA1310" Action="None" />
-
-    <!--Field should be private-->
-    <Rule Id="SA1401" Action="None" />
-
-    <!--Elements should be documented.-->
-    <Rule Id="SA1600" Action="None" />
-
-    <!--Partial elements should be documented.-->
-    <Rule Id="SA1601" Action="None" />
-
-    <!--Enumeration items should be documented.-->
-    <Rule Id="SA1602" Action="None" />
-
-    <!--Constructor is missing documentation for one or more of its parameters.-->
-    <Rule Id="SA1611" Action="None" />
-
-    <!--A generic C# element is missing documentation for one or more of its generic type parameters..-->
-    <Rule Id="SA1618" Action="None" />
-
-    <!--The XML documentation header for a C# constructor does not contain the appropriate summary text.-->
-    <Rule Id="SA1642" Action="None" />
-  </Rules>
-
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp" RuleNamespace="Microsoft.CodeAnalysis.CSharp">
-
-      <!--Missing XML comment for publicly visible type or member-->
     <Rule Id="CS1591" Action="None" />
   </Rules>
-
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharpFeatures" RuleNamespace="Microsoft.CodeAnalysis.CSharpFeatures">
-
-    <!--Expression value is never used-->
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
     <Rule Id="IDE0058" Action="None" />
   </Rules>
-</RuleSet>
+  <Rules AnalyzerId="StyleCop.Analyzers" RuleNamespace="StyleCop.Analyzers">
+    <Rule Id="SA0001" Action="None" />
+    <Rule Id="SA1115" Action="None" />
+    <Rule Id="SA1201" Action="None" />
+    <Rule Id="SA1202" Action="None" />
+    <Rule Id="SA1203" Action="None" />
+    <Rule Id="SA1204" Action="None" />
+    <Rule Id="SA1310" Action="None" />
+    <Rule Id="SA1401" Action="None" />
+    <Rule Id="SA1600" Action="None" />
+    <Rule Id="SA1601" Action="None" />
+    <Rule Id="SA1602" Action="None" />
+    <Rule Id="SA1611" Action="None" />
+    <Rule Id="SA1618" Action="None" />
+    <Rule Id="SA1642" Action="None" />
+  </Rules>
+</RuleSet>
\ No newline at end of file