C#: Do not include the mscorlib assembly and remove the option.

Author: michaelnebel

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyManager.cs

@@ -85,11 +85,6 @@ public DependencyManager(string srcDir, IDependencyOptions options, ILogger logg
                 }
             }
 
-            if (options.UseMscorlib)
-            {
-                UseReference(typeof(object).Assembly.Location);
-            }
-
             if (options.UseNuGet)
             {
                 dllDirNames.Add(packageDirectory.DirInfo.FullName);

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DependencyOptions.cs

@@ -40,11 +40,6 @@ public interface IDependencyOptions
         /// </summary>
         bool ScanNetFrameworkDlls { get; }
 
-        /// <summary>
-        /// Whether to use mscorlib as a reference.
-        /// </summary>
-        bool UseMscorlib { get; }
-
         /// <summary>
         /// Determine whether the given path should be excluded.
         /// </summary>
@@ -74,8 +69,6 @@ public class DependencyOptions : IDependencyOptions
 
         public bool ScanNetFrameworkDlls { get; set; } = true;
 
-        public bool UseMscorlib { get; set; } = true;
-
         public bool ExcludesFile(string path) =>
             Excludes.Any(path.Contains);
 

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

@@ -29,9 +29,6 @@ public override bool HandleFlag(string key, bool value)
                 case "all-references":
                     AnalyseCsProjFiles = !value;
                     return true;
-                case "stdlib":
-                    dependencies.UseMscorlib = value;
-                    return true;
                 case "skip-dotnet":
                     dependencies.ScanNetFrameworkDlls = !value;
                     return true;
@@ -110,7 +107,7 @@ public override void InvalidArgument(string argument)
         /// <summary>
         /// Outputs the command line options to the console.
         /// </summary>
-        public static void ShowHelp(System.IO.TextWriter output)
+        public static void ShowHelp(TextWriter output)
         {
             output.WriteLine("C# standalone extractor\n\nExtracts a C# project in the current directory without performing a build.\n");
             output.WriteLine("Additional options:\n");
@@ -121,7 +118,6 @@ public static void ShowHelp(System.IO.TextWriter output)
             output.WriteLine("    --dry-run        Stop before extraction");
             output.WriteLine("    --skip-nuget     Do not download nuget packages");
             output.WriteLine("    --all-references Use all references (default is to only use references in .csproj files)");
-            output.WriteLine("    --nostdlib       Do not link mscorlib.dll (use only for extracting mscorlib itself)");
             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");

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

@@ -135,9 +135,8 @@ public void Framework()
         public void StandaloneDefaults()
         {
             standaloneOptions = CSharp.Standalone.Options.Create(Array.Empty<string>());
-            Assert.Equal(0, standaloneOptions.Dependencies.DllDirs.Count);
+            Assert.Empty(standaloneOptions.Dependencies.DllDirs);
             Assert.True(standaloneOptions.Dependencies.UseNuGet);
-            Assert.True(standaloneOptions.Dependencies.UseMscorlib);
             Assert.False(standaloneOptions.SkipExtraction);
             Assert.Null(standaloneOptions.Dependencies.SolutionFile);
             Assert.True(standaloneOptions.Dependencies.ScanNetFrameworkDlls);
@@ -147,12 +146,11 @@ public void StandaloneDefaults()
         [Fact]
         public void StandaloneOptions()
         {
-            standaloneOptions = CSharp.Standalone.Options.Create(new string[] { "--references:foo", "--silent", "--skip-nuget", "--skip-dotnet", "--exclude", "bar", "--nostdlib" });
+            standaloneOptions = CSharp.Standalone.Options.Create(new string[] { "--references:foo", "--silent", "--skip-nuget", "--skip-dotnet", "--exclude", "bar" });
             Assert.Equal("foo", standaloneOptions.Dependencies.DllDirs[0]);
             Assert.Equal("bar", standaloneOptions.Dependencies.Excludes[0]);
             Assert.Equal(Verbosity.Off, standaloneOptions.Verbosity);
             Assert.False(standaloneOptions.Dependencies.UseNuGet);
-            Assert.False(standaloneOptions.Dependencies.UseMscorlib);
             Assert.False(standaloneOptions.Dependencies.ScanNetFrameworkDlls);
             Assert.False(standaloneOptions.Errors);
             Assert.False(standaloneOptions.Help);