C#: Remove Semmle.Extraction project and move content to Semmle.Extraction.CSharp

csharp/CSharp.sln

@@ -4,8 +4,6 @@ VisualStudioVersion = 15.0.27130.2036
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Util", "extractor\Semmle.Util\Semmle.Util.csproj", "{CDD7AD69-0FD8-40F0-A9DA-F1077A2A85D6}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Semmle.Extraction", "extractor\Semmle.Extraction\Semmle.Extraction.csproj", "{81EAAD75-4BE1-44E4-91DF-20778216DB64}"
-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.CSharp.DependencyFetching", "extractor\Semmle.Extraction.CSharp.DependencyFetching\Semmle.Extraction.CSharp.DependencyFetching.csproj", "{541D1AC5-E42C-4AB2-A1A4-C2355CE2A2EF}"

csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel

@@ -14,7 +14,7 @@ codeql_csharp_library(
     nowarn = ["CA1822"],
     visibility = ["//csharp:__subpackages__"],
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
+        "//csharp/extractor/Semmle.Extraction.CSharp",
         "//csharp/extractor/Semmle.Util",
     ],
 )

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

@@ -15,7 +15,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
     internal class NugetExeWrapper : IDisposable
     {
         private readonly string? nugetExe;
-        private readonly Util.Logging.ILogger logger;
+        private readonly Semmle.Util.Logging.ILogger logger;
 
         public int PackageCount => fileProvider.PackagesConfigs.Count;
 
@@ -33,7 +33,7 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
         /// <summary>
         /// Create the package manager for a specified source tree.
         /// </summary>
-        public NugetExeWrapper(FileProvider fileProvider, TemporaryDirectory packageDirectory, Util.Logging.ILogger logger)
+        public NugetExeWrapper(FileProvider fileProvider, TemporaryDirectory packageDirectory, Semmle.Util.Logging.ILogger logger)
         {
             this.fileProvider = fileProvider;
             this.packageDirectory = packageDirectory;

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

@@ -5,7 +5,7 @@
   </PropertyGroup>
   <ItemGroup>
     <ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
-    <ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
+    <ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
 
     <InternalsVisibleTo Include="Semmle.Extraction.Tests" />
   </ItemGroup>

csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel

@@ -6,6 +6,7 @@ load(
 codeql_csharp_library(
     name = "Semmle.Extraction.CSharp",
     srcs = glob([
+        "_Base/**/*.cs",
         "Comments/**/*.cs",
         "Entities/**/*.cs",
         "Extractor/**/*.cs",
@@ -16,7 +17,6 @@ codeql_csharp_library(
     allow_unsafe_blocks = True,
     visibility = ["//csharp:__subpackages__"],
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
         "//csharp/extractor/Semmle.Extraction.CSharp.Util",
         "//csharp/extractor/Semmle.Util",
         "@paket.main//basic.compilerlog.util",

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

@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
 	<ItemGroup>
-		<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" />
 	</ItemGroup>

csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel

@@ -9,7 +9,6 @@ codeql_xunit_test(
         "*.cs",
     ]),
     deps = [
-        "//csharp/extractor/Semmle.Extraction",
         "//csharp/extractor/Semmle.Extraction.CSharp",
         "//csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching",
         "//csharp/extractor/Semmle.Extraction.CSharp.Standalone:bin/Semmle.Extraction.CSharp.Standalone",

csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj

@@ -4,7 +4,6 @@
     <ProjectReference Include="..\Semmle.Extraction.CSharp.StubGenerator\Semmle.Extraction.CSharp.StubGenerator.csproj" />
     <ProjectReference Include="..\Semmle.Extraction.CSharp.Standalone\Semmle.Extraction.CSharp.Standalone.csproj" />
     <ProjectReference Include="..\Semmle.Extraction.CSharp\Semmle.Extraction.CSharp.csproj" />
-    <ProjectReference Include="..\Semmle.Extraction\Semmle.Extraction.csproj" />
     <ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

csharp/extractor/Semmle.Extraction/BUILD.bazel

@@ -1,36 +0,0 @@
-load(
-    "//misc/bazel:csharp.bzl",
-    "codeql_csharp_library",
-)
-
-config_setting(
-    name = "debug_build",
-    values = {
-        "compilation_mode": "dbg",
-    },
-)
-
-codeql_csharp_library(
-    name = "Semmle.Extraction",
-    srcs = glob([
-        "Entities/**/*.cs",
-        "Extractor/**/*.cs",
-        "*.cs",
-    ]),
-    # enable via -c dbg on the bazel command line/in .bazelrc.local
-    defines = select({
-        ":debug_build": [
-            "TRACE",
-            "DEBUG",
-            "DEBUG_LABELS",
-        ],
-        "//conditions:default": [],
-    }),
-    internals_visible_to = ["Semmle.Extraction.CSharp"],
-    visibility = ["//csharp:__subpackages__"],
-    deps = [
-        "//csharp/extractor/Semmle.Util",
-        "@paket.main//microsoft.build",
-        "@paket.main//microsoft.codeanalysis",
-    ],
-)

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

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="Microsoft.NET.Sdk">
-	<PropertyGroup>
-    	<CodeAnalysisRuleSet>Semmle.Extraction.ruleset</CodeAnalysisRuleSet>
-	</PropertyGroup>
-	<ItemGroup>
-		<ProjectReference Include="..\Semmle.Util\Semmle.Util.csproj" />
-
-		<InternalsVisibleTo Include="Semmle.Extraction.CSharp" />
-	</ItemGroup>
-  <Import Project="..\..\.paket\Paket.Restore.targets" />
-</Project>

csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RuleSet Name="Microsoft Managed Recommended Rules" Description="These rules focus on the most critical problems in your code, including potential security holes, application crashes, and other important logic and design errors. It is recommended to include this rule set in any custom rule set you create for your projects." ToolsVersion="10.0">
-  <Localization ResourceAssembly="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.dll" ResourceBaseName="Microsoft.VisualStudio.CodeAnalysis.RuleSets.Strings.Localized">
-    <Name Resource="MinimumRecommendedRules_Name" />
-    <Description Resource="MinimumRecommendedRules_Description" />
-  </Localization>
-
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.CSharp.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.CSharp.Analyzers">
-    <Rule Id="RS1022" Action="None" />
-  </Rules>
-  <Rules AnalyzerId="Microsoft.CodeAnalysis.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.Analyzers" />
-</RuleSet>

csharp/extractor/Semmle.Extraction/paket.references

@@ -1,2 +0,0 @@
-Microsoft.Build
-Microsoft.CodeAnalysis