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

…ction.CSharp
github · Nov 13, 2024 · e7844e2 · e7844e2
1 parent 67684d1
commit e7844e2
Show file tree

Hide file tree

Showing 48 changed files with 5 additions and 72 deletions.
diff --git a/csharp/CSharp.sln b/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}"

diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/BUILD.bazel b/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",
     ],
 )
diff --git a/csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/NugetExeWrapper.cs b/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 @@ internal class NugetExeWrapper : IDisposable
         /// <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;

diff --git a/...e.Extraction.CSharp.DependencyFetching/Semmle.Extraction.CSharp.DependencyFetching.csproj b/...e.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>

diff --git a/csharp/extractor/Semmle.Extraction.CSharp/BUILD.bazel b/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",

diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Semmle.Extraction.CSharp.csproj b/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>

diff --git a/...ractor/Semmle.Extraction/AssemblyScope.cs → ....Extraction.CSharp/_Base/AssemblyScope.cs b/...ractor/Semmle.Extraction/AssemblyScope.cs → ....Extraction.CSharp/_Base/AssemblyScope.cs
diff --git a/...rp/extractor/Semmle.Extraction/Context.cs → ...Semmle.Extraction.CSharp/_Base/Context.cs b/...rp/extractor/Semmle.Extraction/Context.cs → ...Semmle.Extraction.CSharp/_Base/Context.cs
diff --git a/...extractor/Semmle.Extraction/CsProjFile.cs → ...mle.Extraction.CSharp/_Base/CsProjFile.cs b/...extractor/Semmle.Extraction/CsProjFile.cs → ...mle.Extraction.CSharp/_Base/CsProjFile.cs
diff --git a/...tion/Entities/Base/CachedEntityFactory.cs → ...Base/Entities/Base/CachedEntityFactory.cs b/...tion/Entities/Base/CachedEntityFactory.cs → ...Base/Entities/Base/CachedEntityFactory.cs
diff --git a/...ies/Base/CachedEntityFactoryExtensions.cs → ...ies/Base/CachedEntityFactoryExtensions.cs b/...ies/Base/CachedEntityFactoryExtensions.cs → ...ies/Base/CachedEntityFactoryExtensions.cs
diff --git a/...xtraction/Entities/Base/CachedEntity`1.cs → ...arp/_Base/Entities/Base/CachedEntity`1.cs b/...xtraction/Entities/Base/CachedEntity`1.cs → ...arp/_Base/Entities/Base/CachedEntity`1.cs
diff --git a/...Semmle.Extraction/Entities/Base/Entity.cs → ...tion.CSharp/_Base/Entities/Base/Entity.cs b/...Semmle.Extraction/Entities/Base/Entity.cs → ...tion.CSharp/_Base/Entities/Base/Entity.cs
diff --git a/...e.Extraction/Entities/Base/FreshEntity.cs → ...CSharp/_Base/Entities/Base/FreshEntity.cs b/...e.Extraction/Entities/Base/FreshEntity.cs → ...CSharp/_Base/Entities/Base/FreshEntity.cs
diff --git a/...emmle.Extraction/Entities/Base/IEntity.cs → ...ion.CSharp/_Base/Entities/Base/IEntity.cs b/...emmle.Extraction/Entities/Base/IEntity.cs → ...ion.CSharp/_Base/Entities/Base/IEntity.cs
diff --git a/...xtraction/Entities/Base/LabelledEntity.cs → ...arp/_Base/Entities/Base/LabelledEntity.cs b/...xtraction/Entities/Base/LabelledEntity.cs → ...arp/_Base/Entities/Base/LabelledEntity.cs
diff --git a/...raction/Entities/Base/UnlabelledEntity.cs → ...p/_Base/Entities/Base/UnlabelledEntity.cs b/...raction/Entities/Base/UnlabelledEntity.cs → ...p/_Base/Entities/Base/UnlabelledEntity.cs
diff --git a/....Extraction/Entities/ExtractionMessage.cs → ...Sharp/_Base/Entities/ExtractionMessage.cs b/....Extraction/Entities/ExtractionMessage.cs → ...Sharp/_Base/Entities/ExtractionMessage.cs
diff --git a/...ractor/Semmle.Extraction/Entities/File.cs → ....Extraction.CSharp/_Base/Entities/File.cs b/...ractor/Semmle.Extraction/Entities/File.cs → ....Extraction.CSharp/_Base/Entities/File.cs
diff --git a/...ctor/Semmle.Extraction/Entities/Folder.cs → ...xtraction.CSharp/_Base/Entities/Folder.cs b/...ctor/Semmle.Extraction/Entities/Folder.cs → ...xtraction.CSharp/_Base/Entities/Folder.cs
diff --git a/...mmle.Extraction/Entities/GeneratedFile.cs → ...on.CSharp/_Base/Entities/GeneratedFile.cs b/...mmle.Extraction/Entities/GeneratedFile.cs → ...on.CSharp/_Base/Entities/GeneratedFile.cs
diff --git a/....Extraction/Entities/GeneratedLocation.cs → ...Sharp/_Base/Entities/GeneratedLocation.cs b/....Extraction/Entities/GeneratedLocation.cs → ...Sharp/_Base/Entities/GeneratedLocation.cs
diff --git a/...or/Semmle.Extraction/Entities/Location.cs → ...raction.CSharp/_Base/Entities/Location.cs b/...or/Semmle.Extraction/Entities/Location.cs → ...raction.CSharp/_Base/Entities/Location.cs
diff --git a/...mle.Extraction/Entities/SourceLocation.cs → ...n.CSharp/_Base/Entities/SourceLocation.cs b/...mle.Extraction/Entities/SourceLocation.cs → ...n.CSharp/_Base/Entities/SourceLocation.cs
diff --git a/...r/Semmle.Extraction/EscapingTextWriter.cs → ...action.CSharp/_Base/EscapingTextWriter.cs b/...r/Semmle.Extraction/EscapingTextWriter.cs → ...action.CSharp/_Base/EscapingTextWriter.cs
diff --git a/...n/Extractor/BinaryLogExtractionContext.cs → ...e/Extractor/BinaryLogExtractionContext.cs b/...n/Extractor/BinaryLogExtractionContext.cs → ...e/Extractor/BinaryLogExtractionContext.cs
diff --git a/...Extraction/Extractor/ExtractionContext.cs → ...harp/_Base/Extractor/ExtractionContext.cs b/...Extraction/Extractor/ExtractionContext.cs → ...harp/_Base/Extractor/ExtractionContext.cs
diff --git a/...mle.Extraction/Extractor/ExtractorMode.cs → ...n.CSharp/_Base/Extractor/ExtractorMode.cs b/...mle.Extraction/Extractor/ExtractorMode.cs → ...n.CSharp/_Base/Extractor/ExtractorMode.cs
diff --git a/...xtractor/Semmle.Extraction/FilePattern.cs → ...le.Extraction.CSharp/_Base/FilePattern.cs b/...xtractor/Semmle.Extraction/FilePattern.cs → ...le.Extraction.CSharp/_Base/FilePattern.cs
diff --git a/...tor/Semmle.Extraction/IExtractionScope.cs → ...traction.CSharp/_Base/IExtractionScope.cs b/...tor/Semmle.Extraction/IExtractionScope.cs → ...traction.CSharp/_Base/IExtractionScope.cs
diff --git a/csharp/extractor/Semmle.Extraction/Id.cs → ...ctor/Semmle.Extraction.CSharp/_Base/Id.cs b/csharp/extractor/Semmle.Extraction/Id.cs → ...ctor/Semmle.Extraction.CSharp/_Base/Id.cs
diff --git a/...ractor/Semmle.Extraction/InternalError.cs → ....Extraction.CSharp/_Base/InternalError.cs b/...ractor/Semmle.Extraction/InternalError.cs → ....Extraction.CSharp/_Base/InternalError.cs
diff --git a/...r/Semmle.Extraction/LocationExtensions.cs → ...action.CSharp/_Base/LocationExtensions.cs b/...r/Semmle.Extraction/LocationExtensions.cs → ...action.CSharp/_Base/LocationExtensions.cs
diff --git a/...rp/extractor/Semmle.Extraction/Message.cs → ...Semmle.Extraction.CSharp/_Base/Message.cs b/...rp/extractor/Semmle.Extraction/Message.cs → ...Semmle.Extraction.CSharp/_Base/Message.cs
diff --git a/...rp/extractor/Semmle.Extraction/Options.cs → ...Semmle.Extraction.CSharp/_Base/Options.cs b/...rp/extractor/Semmle.Extraction/Options.cs → ...Semmle.Extraction.CSharp/_Base/Options.cs
diff --git a/...ctor/Semmle.Extraction/PathTransformer.cs → ...xtraction.CSharp/_Base/PathTransformer.cs b/...ctor/Semmle.Extraction/PathTransformer.cs → ...xtraction.CSharp/_Base/PathTransformer.cs
diff --git a/...xtractor/Semmle.Extraction/SourceScope.cs → ...le.Extraction.CSharp/_Base/SourceScope.cs b/...xtractor/Semmle.Extraction/SourceScope.cs → ...le.Extraction.CSharp/_Base/SourceScope.cs
diff --git a/...actor/Semmle.Extraction/TrapExtensions.cs → ...Extraction.CSharp/_Base/TrapExtensions.cs b/...actor/Semmle.Extraction/TrapExtensions.cs → ...Extraction.CSharp/_Base/TrapExtensions.cs
diff --git a/...r/Semmle.Extraction/TrapStackBehaviour.cs → ...action.CSharp/_Base/TrapStackBehaviour.cs b/...r/Semmle.Extraction/TrapStackBehaviour.cs → ...action.CSharp/_Base/TrapStackBehaviour.cs
diff --git a/...extractor/Semmle.Extraction/TrapWriter.cs → ...mle.Extraction.CSharp/_Base/TrapWriter.cs b/...extractor/Semmle.Extraction/TrapWriter.cs → ...mle.Extraction.CSharp/_Base/TrapWriter.cs
diff --git a/csharp/extractor/Semmle.Extraction/Tuple.cs → ...r/Semmle.Extraction.CSharp/_Base/Tuple.cs b/csharp/extractor/Semmle.Extraction/Tuple.cs → ...r/Semmle.Extraction.CSharp/_Base/Tuple.cs
diff --git a/csharp/extractor/Semmle.Extraction/Tuples.cs → .../Semmle.Extraction.CSharp/_Base/Tuples.cs b/csharp/extractor/Semmle.Extraction/Tuples.cs → .../Semmle.Extraction.CSharp/_Base/Tuples.cs
diff --git a/csharp/extractor/Semmle.Extraction.Tests/BUILD.bazel b/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",

diff --git a/csharp/extractor/Semmle.Extraction.Tests/Semmle.Extraction.Tests.csproj b/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" />

diff --git a/csharp/extractor/Semmle.Extraction/BUILD.bazel b/csharp/extractor/Semmle.Extraction/BUILD.bazel
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.csproj
diff --git a/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset b/csharp/extractor/Semmle.Extraction/Semmle.Extraction.ruleset
diff --git a/csharp/extractor/Semmle.Extraction/paket.references b/csharp/extractor/Semmle.Extraction/paket.references