diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs b/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs
index e4abf06c1..59f84a47d 100644
--- a/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs
+++ b/runtime/CSharp/Antlr4.Runtime/Atn/ATNConfigSet.cs
@@ -430,15 +430,11 @@ namespace Antlr4.Runtime.Atn
             throw new NotSupportedException("Not supported yet.");
         }
 
-        public virtual bool ContainsAll<_T0>(ICollection<_T0> c)
+        public virtual bool ContainsAll(IEnumerable<ATNConfig> c)
         {
-            foreach (object o in c)
+            foreach (ATNConfig o in c)
             {
-                if (!(o is ATNConfig))
-                {
-                    return false;
-                }
-                if (!Contains((ATNConfig)o))
+                if (!Contains(o))
                 {
                     return false;
                 }
diff --git a/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs b/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs
index 1d89a955a..f618fb168 100644
--- a/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs
+++ b/runtime/CSharp/Antlr4.Runtime/Atn/ATNSimulator.cs
@@ -49,17 +49,15 @@ namespace Antlr4.Runtime.Atn
 
         /// <summary>Must distinguish between missing edge and edge we know leads nowhere</summary>
         [NotNull]
-        public static readonly DFAState Error;
+        public static readonly DFAState Error =
+            new DFAState(new ATNConfigSet(), 0, 0)
+            {
+                stateNumber = int.MaxValue
+            };
 
         [NotNull]
         public readonly ATN atn;
 
-        static ATNSimulator()
-        {
-            Error = new DFAState(new ATNConfigSet(), 0, 0);
-            Error.stateNumber = int.MaxValue;
-        }
-
         public ATNSimulator(ATN atn)
         {
             this.atn = atn;
diff --git a/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs b/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs
index 77f4a8c5e..fbb5b8229 100644
--- a/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs
+++ b/runtime/CSharp/Antlr4.Runtime/Dfa/AbstractEdgeMap`1.cs
@@ -42,7 +42,7 @@ namespace Antlr4.Runtime.Dfa
 
         protected internal readonly int maxIndex;
 
-        public AbstractEdgeMap(int minIndex, int maxIndex)
+        protected AbstractEdgeMap(int minIndex, int maxIndex)
         {
             // the allowed range (with minIndex and maxIndex inclusive) should be less than 2^32
             System.Diagnostics.Debug.Assert(maxIndex - minIndex + 1 >= 0);
diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.csproj b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.csproj
index 4f504439b..883892bb8 100644
--- a/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.csproj
+++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4BuildTasks.csproj
@@ -51,6 +51,7 @@
     <Compile Include="Antlr4ClassGenerationTask.cs" />
     <Compile Include="Antlr4ClassGenerationTaskInternal.cs" />
     <Compile Include="BuildMessage.cs" />
+    <Compile Include="GlobalSuppressions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -62,6 +63,11 @@
       <Link>Key.snk</Link>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <CodeAnalysisDictionary Include="..\build\CustomDictionary.xml">
+      <Link>CustomDictionary.xml</Link>
+    </CodeAnalysisDictionary>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTask.cs b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTask.cs
index 7dfaf9433..7bf2723a4 100644
--- a/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTask.cs
+++ b/runtime/CSharp/Antlr4BuildTasks/Antlr4ClassGenerationTask.cs
@@ -31,6 +31,7 @@ namespace Antlr4.Build.Tasks
     using System;
     using System.Collections.Generic;
     using System.Diagnostics;
+    using System.Diagnostics.CodeAnalysis;
     using System.Linq;
     using System.Reflection;
     using System.Security;
@@ -175,6 +176,7 @@ namespace Antlr4.Build.Tasks
             }
         }
 
+        [SuppressMessage("Microsoft.Design", "CA1024:UsePropertiesWhereAppropriate")]
         public AppDomain GetAntlrTaskAppDomain()
         {
             if (_sharedAppDomain != null)
diff --git a/runtime/CSharp/Antlr4BuildTasks/GlobalSuppressions.cs b/runtime/CSharp/Antlr4BuildTasks/GlobalSuppressions.cs
new file mode 100644
index 000000000..6df546848
Binary files /dev/null and b/runtime/CSharp/Antlr4BuildTasks/GlobalSuppressions.cs differ
diff --git a/runtime/CSharp/build/CodeAnalysisDictionary.xsd b/runtime/CSharp/build/CodeAnalysisDictionary.xsd
new file mode 100644
index 000000000..aaf062ea5
--- /dev/null
+++ b/runtime/CSharp/build/CodeAnalysisDictionary.xsd
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <xs:element name="Dictionary">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="Words" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="Unrecognized" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element maxOccurs="unbounded" name="Word" type="xs:string" />
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="Recognized" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element maxOccurs="unbounded" name="Word" type="xs:string" />
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="Deprecated" minOccurs="0">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="Term" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:simpleContent>
+                          <xs:extension base="xs:string">
+                            <xs:attribute name="PreferredAlternate" type="xs:string" use="required" />
+                          </xs:extension>
+                        </xs:simpleContent>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <xs:element name="Acronyms" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="CasingExceptions">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="Acronym" type="xs:string" maxOccurs="unbounded" />
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
\ No newline at end of file
diff --git a/runtime/CSharp/build/CustomDictionary.xml b/runtime/CSharp/build/CustomDictionary.xml
new file mode 100644
index 000000000..e7ee58453
--- /dev/null
+++ b/runtime/CSharp/build/CustomDictionary.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<Dictionary>
+  <Words>
+    <Recognized>
+      <Word>Antlr</Word>
+      <Word>Atn</Word>
+    </Recognized>
+  </Words>
+</Dictionary>