diff --git a/codeanalysis.ruleset b/codeanalysis.ruleset
index ee66e99d..4b278ba8 100644
--- a/codeanalysis.ruleset
+++ b/codeanalysis.ruleset
@@ -1,74 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Rules for StyleCop.Analyzers" Description="Code analysis rules for StyleCop.Analyzers.csproj." ToolsVersion="14.0">
+<RuleSet Name="Rules for StyleCop.Analyzers" Description="Code analysis rules for StyleCop.Analyzers.csproj." ToolsVersion="15.0">
   <Rules AnalyzerId="AsyncUsageAnalyzers" RuleNamespace="AsyncUsageAnalyzers">
     <Rule Id="AvoidAsyncSuffix" Action="None" />
-    <Rule Id="AvoidAsyncVoid" Action="None" />
+    <Rule Id="AvoidAsyncVoid" Action="Error" />
     <Rule Id="UseAsyncSuffix" Action="None" />
-    <Rule Id="UseConfigureAwait" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.Analyzers.ManagedCodeAnalysis" RuleNamespace="Microsoft.Rules.Managed">
-    <Rule Id="CA1001" Action="None" />
-    <Rule Id="CA1009" Action="None" />
-    <Rule Id="CA1016" Action="None" />
-    <Rule Id="CA1033" Action="None" />
-    <Rule Id="CA1049" Action="None" />
-    <Rule Id="CA1060" Action="None" />
-    <Rule Id="CA1061" Action="None" />
-    <Rule Id="CA1063" Action="None" />
-    <Rule Id="CA1065" Action="None" />
-    <Rule Id="CA1301" Action="None" />
-    <Rule Id="CA1400" Action="None" />
-    <Rule Id="CA1401" Action="None" />
-    <Rule Id="CA1403" Action="None" />
-    <Rule Id="CA1404" Action="None" />
-    <Rule Id="CA1405" Action="None" />
-    <Rule Id="CA1410" Action="None" />
-    <Rule Id="CA1415" Action="None" />
-    <Rule Id="CA1821" Action="None" />
-    <Rule Id="CA1900" Action="None" />
-    <Rule Id="CA1901" Action="None" />
-    <Rule Id="CA2002" Action="None" />
-    <Rule Id="CA2100" Action="None" />
-    <Rule Id="CA2101" Action="None" />
-    <Rule Id="CA2108" Action="None" />
-    <Rule Id="CA2111" Action="None" />
-    <Rule Id="CA2112" Action="None" />
-    <Rule Id="CA2114" Action="None" />
-    <Rule Id="CA2116" Action="None" />
-    <Rule Id="CA2117" Action="None" />
-    <Rule Id="CA2122" Action="None" />
-    <Rule Id="CA2123" Action="None" />
-    <Rule Id="CA2124" Action="None" />
-    <Rule Id="CA2126" Action="None" />
-    <Rule Id="CA2131" Action="None" />
-    <Rule Id="CA2132" Action="None" />
-    <Rule Id="CA2133" Action="None" />
-    <Rule Id="CA2134" Action="None" />
-    <Rule Id="CA2137" Action="None" />
-    <Rule Id="CA2138" Action="None" />
-    <Rule Id="CA2140" Action="None" />
-    <Rule Id="CA2141" Action="None" />
-    <Rule Id="CA2146" Action="None" />
-    <Rule Id="CA2147" Action="None" />
-    <Rule Id="CA2149" Action="None" />
-    <Rule Id="CA2200" Action="None" />
-    <Rule Id="CA2202" Action="None" />
-    <Rule Id="CA2207" Action="None" />
-    <Rule Id="CA2212" Action="None" />
-    <Rule Id="CA2213" Action="None" />
-    <Rule Id="CA2214" Action="None" />
-    <Rule Id="CA2216" Action="None" />
-    <Rule Id="CA2220" Action="None" />
-    <Rule Id="CA2229" Action="None" />
-    <Rule Id="CA2231" Action="None" />
-    <Rule Id="CA2232" Action="None" />
-    <Rule Id="CA2235" Action="None" />
-    <Rule Id="CA2236" Action="None" />
-    <Rule Id="CA2237" Action="None" />
-    <Rule Id="CA2238" Action="None" />
-    <Rule Id="CA2240" Action="None" />
-    <Rule Id="CA2241" Action="None" />
-    <Rule Id="CA2242" Action="None" />
+    <Rule Id="UseConfigureAwait" Action="Error" />
   </Rules>
   <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Features" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Features">
     <Rule Id="IDE0003" Action="None" />
@@ -77,76 +13,76 @@
     <Rule Id="SA0000" Action="Hidden" />
     <Rule Id="SA1000" Action="None" />
     <Rule Id="SA1001" Action="None" />
-    <Rule Id="SA1002" Action="None" />	
+    <Rule Id="SA1002" Action="None" />
     <Rule Id="SA1003" Action="None" />
-	<Rule Id="SA1005" Action="None" />
-    <Rule Id="SA1008" Action="None" />	
+    <Rule Id="SA1005" Action="None" />
+    <Rule Id="SA1008" Action="None" />
     <Rule Id="SA1009" Action="None" />
     <Rule Id="SA1011" Action="None" />
     <Rule Id="SA1012" Action="None" />
     <Rule Id="SA1013" Action="None" />
-    <Rule Id="SA1015" Action="None" />	
+    <Rule Id="SA1015" Action="None" />
     <Rule Id="SA1016" Action="None" />
-    <Rule Id="SA1021" Action="None" />
-    <Rule Id="SA1022" Action="None" />
-    <Rule Id="SA1024" Action="None" />	
-    <Rule Id="SA1026" Action="None" />	
-    <Rule Id="SA1028" Action="None" />	
-    <Rule Id="SA1100" Action="None" />
+    <Rule Id="SA1021" Action="Error" />
+    <Rule Id="SA1022" Action="Error" />
+    <Rule Id="SA1024" Action="None" />
+    <Rule Id="SA1026" Action="None" />
+    <Rule Id="SA1028" Action="None" />
+    <Rule Id="SA1100" Action="Error" />
     <Rule Id="SA1101" Action="None" />
     <Rule Id="SA1106" Action="None" />
     <Rule Id="SA1111" Action="None" />
     <Rule Id="SA1112" Action="None" />
-    <Rule Id="SA1116" Action="None" />	
-    <Rule Id="SA1117" Action="None" />	
+    <Rule Id="SA1116" Action="None" />
+    <Rule Id="SA1117" Action="None" />
     <Rule Id="SA1118" Action="None" />
-    <Rule Id="SA1119" Action="None" />
-    <Rule Id="SA1121" Action="None" />
+    <Rule Id="SA1119" Action="Error" />
+    <Rule Id="SA1121" Action="Error" />
     <Rule Id="SA1122" Action="None" />
-    <Rule Id="SA1128" Action="None" />	
-    <Rule Id="SA1133" Action="None" />
+    <Rule Id="SA1128" Action="None" />
+    <Rule Id="SA1133" Action="Error" />
     <Rule Id="SA1200" Action="None" />
-    <Rule Id="SA1201" Action="None" />	
-    <Rule Id="SA1202" Action="None" />	
+    <Rule Id="SA1201" Action="None" />
+    <Rule Id="SA1202" Action="None" />
     <Rule Id="SA1203" Action="None" />
-    <Rule Id="SA1204" Action="None" />	
-    <Rule Id="SA1208" Action="None" />	
-    <Rule Id="SA1209" Action="None" />	
-    <Rule Id="SA1210" Action="None" />	
-    <Rule Id="SA1214" Action="None" />	
+    <Rule Id="SA1204" Action="None" />
+    <Rule Id="SA1208" Action="None" />
+    <Rule Id="SA1209" Action="None" />
+    <Rule Id="SA1210" Action="None" />
+    <Rule Id="SA1214" Action="None" />
     <Rule Id="SA1216" Action="None" />	
     <Rule Id="SA1300" Action="None" />
-    <Rule Id="SA1302" Action="None" />
+    <Rule Id="SA1302" Action="Error" />
     <Rule Id="SA1303" Action="None" />
-    <Rule Id="SA1304" Action="None" />
+    <Rule Id="SA1304" Action="Error" />
     <Rule Id="SA1305" Action="None" />
     <Rule Id="SA1309" Action="None" />
     <Rule Id="SA1310" Action="None" />
-    <Rule Id="SA1311" Action="None" />
+    <Rule Id="SA1311" Action="Error" />
     <Rule Id="SA1400" Action="None" />
     <Rule Id="SA1401" Action="None" />
     <Rule Id="SA1402" Action="None" />
-    <Rule Id="SA1403" Action="None" />
-    <Rule Id="SA1404" Action="None" />
-    <Rule Id="SA1405" Action="None" />
-    <Rule Id="SA1406" Action="None" />
-    <Rule Id="SA1407" Action="None" />
+    <Rule Id="SA1403" Action="Error" />
+    <Rule Id="SA1404" Action="Error" />
+    <Rule Id="SA1405" Action="Error" />
+    <Rule Id="SA1406" Action="Error" />
+    <Rule Id="SA1407" Action="Error" />
     <Rule Id="SA1408" Action="None" />
-    <Rule Id="SA1410" Action="None" />
-    <Rule Id="SA1411" Action="None" />
+    <Rule Id="SA1410" Action="Error" />
+    <Rule Id="SA1411" Action="Error" />
     <Rule Id="SA1412" Action="None" />
-    <Rule Id="SA1500" Action="None" />	
-    <Rule Id="SA1502" Action="None" />		
-    <Rule Id="SA1516" Action="None" />	
+    <Rule Id="SA1500" Action="None" />
+    <Rule Id="SA1502" Action="None" />
+    <Rule Id="SA1516" Action="None" />
     <Rule Id="SA1600" Action="None" />
-    <Rule Id="SA1603" Action="None" />
-    <Rule Id="SA1609" Action="None" />
-    <Rule Id="SA1623" Action="None" />	
+    <Rule Id="SA1603" Action="Error" />
+    <Rule Id="SA1609" Action="Error" />
+    <Rule Id="SA1611" Action="None" />	
+    <Rule Id="SA1623" Action="None" />
     <Rule Id="SA1633" Action="None" />
-    <Rule Id="SA1636" Action="None" />
-    <Rule Id="SA1642" Action="None" />
-    <Rule Id="SA1643" Action="None" />
+    <Rule Id="SA1636" Action="Error" />
+    <Rule Id="SA1642" Action="Error" />
+    <Rule Id="SA1643" Action="Error" />
     <Rule Id="SA1652" Action="None" />
-
   </Rules>
 </RuleSet>
\ No newline at end of file