C#: Cleanup implementation.

Author: michaelnebel

csharp/.editorconfig

@@ -268,6 +268,5 @@ csharp_style_var_elsewhere = true:suggestion
 #
 
 [extractor/Semmle.Extraction/Tuples.cs,
- extractor/Semmle.Extraction.CSharp/Tuples.cs,
- extractor/Semmle.Extraction.CIL/Tuples.cs]
-dotnet_naming_rule.members_should_be_pascal_case.severity = none
+ extractor/Semmle.Extraction.CSharp/Tuples.cs]
+dotnet_naming_rule.members_should_be_pascal_case.severity = none

csharp/CSharp.sln

@@ -8,8 +8,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction", "extrac
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp", "extractor\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj", "{C4D62DA0-B64B-440B-86DC-AB52318CB8BF}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CIL", "extractor\Semmle.Extraction.CIL\Semmle.Extraction.CIL.csproj", "{399A1579-68F0-40F4-9A23-F241BA697F9C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.DependencyFetching", "extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj", "{541D1AC5-E42C-4AB2-A1A4-C2355CE2A2EF}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.Standalone", "extractor\Semmle.Extraction.CSharp.Standalone\Semmle.Extraction.CSharp.Standalone.csproj", "{D00E7D25-0FA0-48EC-B048-CD60CE1B30D8}"
@@ -18,8 +16,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.St
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.Util", "extractor\Semmle.Extraction.CSharp.Util\Semmle.Extraction.CSharp.Util.csproj", "{998A0D4C-8BFC-4513-A28D-4816AFB89882}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CIL.Driver", "extractor\Semmle.Extraction.CIL.Driver\Semmle.Extraction.CIL.Driver.csproj", "{EFA400B3-C1CE-446F-A4E2-8B44E61EF47C}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.CSharp.Driver", "extractor\Semmle.Extraction.CSharp.Driver\Semmle.Extraction.CSharp.Driver.csproj", "{C36453BF-0C82-448A-B15D-26947503A2D3}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction.Tests", "extractor\Semmle.Extraction.Tests\Semmle.Extraction.Tests.csproj", "{CD8D3F90-AD2E-4BB5-8E82-B94AA293864A}"

csharp/codeql-extractor.yml

@@ -47,13 +47,6 @@ options:
       the code (for example if it uses inaccessible dependencies).
     type: string
     pattern: "^(false|true)$"
-  cil:
-    title: Whether to enable CIL extraction.
-    description: >
-      A value indicating, whether CIL extraction should be enabled.
-      The default is 'true'.
-    type: string
-    pattern: "^(false|true)$"
   logging:
     title: Options pertaining to logging.
     type: object

csharp/extractor/Semmle.Extraction.CSharp.Standalone/Options.cs

@@ -58,7 +58,6 @@ public static void ShowHelp(TextWriter output)
             output.WriteLine("Additional options:\n");
             output.WriteLine("    --threads:nnn    Specify number of threads (default=CPU cores)");
             output.WriteLine("    --verbose        Produce more output");
-            output.WriteLine("    --pdb            Cross-reference information from PDBs where available");
         }
 
         private Options()

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Analyser.cs

@@ -66,9 +66,6 @@ public void AnalyseReferences()
         {
             foreach (var assembly in compilation.References.OfType<PortableExecutableReference>())
             {
-                // CIL first - it takes longer.
-                if (options.CIL)
-                    extractionTasks.Add(() => DoExtractCIL(assembly));
                 extractionTasks.Add(() => DoAnalyseReferenceAssembly(assembly));
             }
         }
@@ -177,17 +174,6 @@ private void DoAnalyseReferenceAssembly(PortableExecutableReference r)
             }
         }
 
-        private void DoExtractCIL(PortableExecutableReference r)
-        {
-            var currentTaskId = IncrementTaskCount();
-            ReportProgressTaskStarted(currentTaskId, r.FilePath);
-            var stopwatch = new Stopwatch();
-            stopwatch.Start();
-            CIL.Analyser.ExtractCIL(r.FilePath!, Logger, options, out var trapFile, out var extracted);
-            stopwatch.Stop();
-            ReportProgressTaskDone(currentTaskId, r.FilePath, trapFile, stopwatch.Elapsed, extracted ? AnalysisAction.Extracted : AnalysisAction.UpToDate);
-        }
-
         private void DoExtractTree(SyntaxTree tree)
         {
             try

csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj

@@ -9,7 +9,6 @@
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<ProjectReference Include="..\Semmle.Extraction.CIL\Semmle.Extraction.CIL.csproj" />
 		<ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
 		<ProjectReference Include="..\Semmle.Extraction.CSharp.Util\Semmle.Extraction.CSharp.Util.csproj" />
 		<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />

csharp/extractor/Semmle.Extraction.Tests/Options.cs

@@ -22,14 +22,12 @@ public void DefaultOptions()
         {
             options = CSharp.Options.CreateWithEnvironment(Array.Empty<string>());
             Assert.True(options.Cache);
-            Assert.False(options.CIL);
             Assert.Null(options.Framework);
             Assert.Null(options.CompilerName);
             Assert.Empty(options.CompilerArguments);
             Assert.True(options.Threads >= 1);
             Assert.Equal(Verbosity.Info, options.LegacyVerbosity);
             Assert.False(options.Console);
-            Assert.False(options.PDB);
             Assert.False(options.Fast);
             Assert.Equal(TrapWriter.CompressionMode.Brotli, options.TrapCompression);
         }
@@ -48,25 +46,6 @@ public void Cache()
             Assert.False(options.Cache);
         }
 
-        [Fact]
-        public void CIL()
-        {
-            options = CSharp.Options.CreateWithEnvironment(Array.Empty<string>());
-            Assert.False(options.CIL);
-
-            Environment.SetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_OPTION_CIL", "false");
-            options = CSharp.Options.CreateWithEnvironment(Array.Empty<string>());
-            Assert.False(options.CIL);
-
-            Environment.SetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_OPTION_CIL", "true");
-            options = CSharp.Options.CreateWithEnvironment(Array.Empty<string>());
-            Assert.True(options.CIL);
-
-            Environment.SetEnvironmentVariable("CODEQL_EXTRACTOR_CSHARP_OPTION_CIL", null);
-            options = CSharp.Options.CreateWithEnvironment(Array.Empty<string>());
-            Assert.False(options.CIL);
-        }
-
         [Fact]
         public void CompilerArguments()
         {
@@ -141,13 +120,6 @@ public void Console()
             Assert.True(options.Console);
         }
 
-        [Fact]
-        public void PDB()
-        {
-            options = CSharp.Options.CreateWithEnvironment(new string[] { "--pdb" });
-            Assert.True(options.PDB);
-        }
-
         [Fact]
         public void Compiler()
         {

csharp/extractor/Semmle.Extraction/Options.cs

@@ -55,21 +55,11 @@ public Verbosity Verbosity
         /// </summary>
         public bool Console { get; private set; } = false;
 
-        /// <summary>
-        /// Holds if CIL should be extracted.
-        /// </summary>
-        public bool CIL { get; private set; } = false;
-
         /// <summary>
         /// Holds if assemblies shouldn't be extracted twice.
         /// </summary>
         public bool Cache { get; private set; } = true;
 
-        /// <summary>
-        /// Whether to extract PDB information.
-        /// </summary>
-        public bool PDB { get; private set; } = false;
-
         /// <summary>
         /// Whether "fast extraction mode" has been enabled.
         /// </summary>
@@ -102,9 +92,6 @@ public virtual bool HandleOption(string key, string value)
                         return true;
                     }
                     return false;
-                case "cil":
-                    CIL = Boolean.Parse(value);
-                    return true;
                 default:
                     return false;
             }
@@ -128,12 +115,7 @@ public virtual bool HandleFlag(string flag, bool value)
                 case "cache":
                     Cache = value;
                     return true;
-                case "pdb":
-                    PDB = value;
-                    CIL = true;
-                    return true;
                 case "fast":
-                    CIL = !value;
                     Fast = value;
                     return true;
                 case "qltest":